{% blocktrans %}Do you want to remove admin role {{ child }}?{% endblocktrans %}
+{% blocktrans %}Do you want to remove admin role {{ child }}?{% endblocktrans %}
{% endblock %}{% blocktrans %}Do you want to remove admin user {{ user }}?{% endblocktrans %}
+{% blocktrans %}Do you want to remove admin user {{ user }}?{% endblocktrans %}
{% endblock %}{% trans "Search" context "title" %}
- +{% trans "Search" context "title" %}
+ diff --git a/src/authentic2/manager/templates/authentic2/manager/service.html b/src/authentic2/manager/templates/authentic2/manager/service.html index 609264dc5..0a1599a9c 100644 --- a/src/authentic2/manager/templates/authentic2/manager/service.html +++ b/src/authentic2/manager/templates/authentic2/manager/service.html @@ -4,7 +4,7 @@ {% block page-title %}{% firstof manager_site_title site_title "Authentic2" %} - {{ object }}{% endblock %} {% block breadcrumb %} -{{ block.super }} + {{ block.super }} {% trans 'Services' %} {{ view.service.name }} {% endblock %} @@ -15,52 +15,52 @@ {% block appbar %} {{ block.super }} - {% if view.can_delete %} - {% trans "Delete" %} - {% endif %} - {% trans "Settings" %} + {% if view.can_delete %} + {% trans "Delete" %} + {% endif %} + {% trans "Settings" %} {% endblock %} {% block sidebar %} {% endblock %} {% block main %} -{% trans "Roles of users allowed on this service" %}
- -{% trans "Roles solely visible from this service" %}
-{% trans "Roles of users allowed on this service" %}
+{% trans "Roles solely visible from this service" %}
+{% trans "Settings" %}
- {% if view.can_change %} - {% trans "Edit" %} - {% endif %} + {% if view.can_change %} + {% trans "Edit" %} + {% endif %} {% endblock %} {% block main %} -{% trans "This user may already exist, please check the list below before creating it :" %}
--
- {% for user in duplicate_users %}
- {% include "authentic2/manager/duplicate_user_add.html" with user=user %}
- {% endfor %}
-
{% trans "This user may already exist, please check the list below before creating it :" %}
+-
+ {% for user in duplicate_users %}
+ {% include "authentic2/manager/duplicate_user_add.html" with user=user %}
+ {% endfor %}
+
- {% blocktrans %}User's email will not be changed immediately. First an email will be sent to this + {% blocktrans %}User's email will not be changed immediately. First an email will be sent to this new email address containing a link on which the user's will have to click to verify that it owns the email address, then it will be changed.{% endblocktrans %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/user_common_roles.html b/src/authentic2/manager/templates/authentic2/manager/user_common_roles.html index f1078661a..80d520700 100644 --- a/src/authentic2/manager/templates/authentic2/manager/user_common_roles.html +++ b/src/authentic2/manager/templates/authentic2/manager/user_common_roles.html @@ -7,14 +7,14 @@ {{ block.super }} {% trans 'Users' %} {% if multiple_ou and object.ou %} - {{ object.ou }} + {{ object.ou }} {% endif %} {{ object }} {% trans "Roles" %} {% endblock %} {% block page_title %} -{% trans "Edit User Roles" %} + {% trans "Edit User Roles" %} {% endblock %} {% block sidebar %} diff --git a/src/authentic2/manager/templates/authentic2/manager/user_detail.html b/src/authentic2/manager/templates/authentic2/manager/user_detail.html index 400dccb9f..99c261df0 100644 --- a/src/authentic2/manager/templates/authentic2/manager/user_detail.html +++ b/src/authentic2/manager/templates/authentic2/manager/user_detail.html @@ -5,26 +5,26 @@ {% block appbar %}{{ object }} - {% if not object.is_active %} - {% trans "disabled" %} - {% endif %} + {% if not object.is_active %} + {% trans "disabled" %} + {% endif %}
{% trans "Journal" %} - {% if view.can_change %} - {% trans "Edit" %} - {% else %} - {% trans "Edit" %} - {% endif %} + {% if view.can_change %} + {% trans "Edit" %} + {% else %} + {% trans "Edit" %} + {% endif %} @@ -51,74 +51,74 @@ {% endblock %} {% block sidebar %} - {% endblock %} diff --git a/src/authentic2/manager/templates/authentic2/manager/user_edit.html b/src/authentic2/manager/templates/authentic2/manager/user_edit.html index 2aba9dada..2daec4cf5 100644 --- a/src/authentic2/manager/templates/authentic2/manager/user_edit.html +++ b/src/authentic2/manager/templates/authentic2/manager/user_edit.html @@ -11,6 +11,6 @@ {% endblock %} {% block hidden_inputs %} - {{ block.super }} - {% if next %}{% endif %} + {{ block.super }} + {% if next %}{% endif %} {% endblock %} diff --git a/src/authentic2/manager/templates/authentic2/manager/user_export.html b/src/authentic2/manager/templates/authentic2/manager/user_export.html index 7cbf62001..f8103520d 100644 --- a/src/authentic2/manager/templates/authentic2/manager/user_export.html +++ b/src/authentic2/manager/templates/authentic2/manager/user_export.html @@ -4,7 +4,7 @@ {% block page-title %}{{ block.super }} - {% trans "User export" %}{% endblock %} {% block appbar %} -Users export
+Users export
{% endblock %} {% block breadcrumb %} @@ -14,32 +14,32 @@ {% endblock %} {% block main %} -{% trans "Preparing CSV export file..." %}
- {% trans "Progress:" %} 0% +{% trans "Preparing CSV export file..." %}
+ {% trans "Progress:" %} 0% +{% trans "Export completed." %}
+ +{% trans "Export completed." %}
- -{% trans "Exception:" %} {{ report.exception}}
+{% trans "Exception:" %} {{ report.exception}}
{% endif %} {% if report.importer %} {% with importer=report.importer %} @@ -80,7 +80,7 @@{% trans "Errors" %}
-
{% for error in importer.errors %}
-
- {% firstof error.description error.code %} +
- {% firstof error.description error.code %} {% endfor %}
| {% trans "Line" %} | - {% for header in importer.headers %} -+ | {% trans "Line" %} | + {% for header in importer.headers %} +
- {{ header.name }}
- {% if header.flags %} {% endif %} - {% for flag in header.flags %} - - {% endfor %} - |
- {% endfor %}
- {% trans "Action" %} | -{% trans "Action" %} | + {% for row in importer.rows %} diff --git a/src/authentic2/manager/templates/authentic2/manager/user_imports.html b/src/authentic2/manager/templates/authentic2/manager/user_imports.html index e2b26c70d..c464a5c89 100644 --- a/src/authentic2/manager/templates/authentic2/manager/user_imports.html +++ b/src/authentic2/manager/templates/authentic2/manager/user_imports.html @@ -56,218 +56,218 @@
|---|
| {% trans "Label" %} | -{% trans "Identifier" %} | -
|---|
| {{ column.label }} | -{{ column.name }} | +{% trans "Label" %} | +{% trans "Identifier" %} |
|---|
{% trans "Flags" %}
-{% blocktrans trimmed %}Each column can receive flags after its name, separated by spaces. Each modifier can be prefixed by no- to set its value to false.{% endblocktrans %}
-| {% trans "Flag" %} | -{% trans "Meaning" %} | -{% trans "Default value" %} | -
|---|---|---|
| key | -- {% blocktrans trimmed %} - The column is an import key, it is used to match the row with an existing user. Only one column can be an import key. + + | |
| {{ column.label }} | +{{ column.name }} | +
{% trans "Flags" %}
+{% blocktrans trimmed %}Each column can receive flags after its name, separated by spaces. Each modifier can be prefixed by no- to set its value to false.{% endblocktrans %}
+| {% trans "Flag" %} | +{% trans "Meaning" %} | +{% trans "Default value" %} | +|
|---|---|---|---|
| key | ++ {% blocktrans trimmed %} + The column is an import key, it is used to match the row with an existing user. Only one column can be an import key. + {% endblocktrans %} + | +{% trans "False" %} | +|
| create | ++ {% blocktrans trimmed %} + Values will be used when creating a new user. + {% endblocktrans %} + | +{% trans "True" %} | +|
| update | ++ {% blocktrans trimmed %} + Values will be used when updating an existing user. + {% endblocktrans %} + | +{% trans "True" %} | +|
| unique | ++ {% blocktrans trimmed %} + Values must be unique in the target organizational unit. + {% endblocktrans %} + | +{% trans "False" %} {% blocktrans trimmed %} + (default is True for the email and username columns if they are configured to be unique in the target organizational unit) {% endblocktrans %} - | -{% trans "False" %} | -
| create | -- {% blocktrans trimmed %} - Values will be used when creating a new user. - {% endblocktrans %} - | -{% trans "True" %} | -|
| update | -- {% blocktrans trimmed %} - Values will be used when updating an existing user. - {% endblocktrans %} - | -{% trans "True" %} | -|
| unique | -- {% blocktrans trimmed %} - Values must be unique in the target organizational unit. - {% endblocktrans %} - | -{% trans "False" %} {% blocktrans trimmed %} - (default is True for the email and username columns if they are configured to be unique in the target organizational unit) - {% endblocktrans %} - | -|
| globally-unique | -- {% blocktrans trimmed %} - Values must be unique among all users. - {% endblocktrans %} - | -{% trans "False" %} {% blocktrans trimmed %} - (default is True for the email and username columns if they are configured to be globally unique) + | +|
| globally-unique | ++ {% blocktrans trimmed %} + Values must be unique among all users. + {% endblocktrans %} + | +{% trans "False" %} {% blocktrans trimmed %} + (default is True for the email and username columns if they are configured to be globally unique) {% endblocktrans %} | -|
| verified | -- {% blocktrans trimmed %} - Values are verified. User's attribute will be locked. - {% endblocktrans %} - | -{% trans "False" %} {% blocktrans %}(default is True for the email column){% endblocktrans %} | -
{% trans "External identifier" %}
-- {% blocktrans trimmed %} - You can also use two special columns _source_name and - _source_id. _source_name must be the name of the - source directory from which the users are exported, it must not - change between imports. _source_id is the unique identifier - from the source directory from which the users are extracted, it must - not change between imports and should never be reused for different - users. _source_id is automatically the key column, and you - cannot use another key column. - {% endblocktrans %} -
-{% trans "Role operations" %}
-- {% blocktrans trimmed %} - Adding existing roles to users is supported. Use either - _role_name or _role_slug special columns to - specify the names or the slugs that should be added to the user. In - order to add multiple roles, simply add a new line, identical to the - first one, except for the value of the role cell. These columns also - accept special flags, as listed below. - {% endblocktrans %} -
-| {% trans "Flag" %} | -{% trans "Meaning" %} | -{% trans "Default value" %} | -
|---|---|---|
| delete | -- {% blocktrans trimmed %} - Remove role from user instead of adding it. - {% endblocktrans %} - | -{% trans "False" %} | -
| clear | -- {% blocktrans trimmed %} - Clear user roles beforehand, so that they will have no more roles - than those specified in the import file. - {% endblocktrans %} - | -{% trans "False" %} | -
{% trans "Registration options" %}
-- {% blocktrans trimmed %} - When a user is created by the import, they will have to use the "forgotten password" feature - in order to log in for the first time. An alternative is to use the special column - @registration with the value send-email. In this case, newly created - users will receive an email, inviting them to set their password. - {% endblocktrans %} -
-{% trans "Force Password Reset" %}
-- {% blocktrans trimmed %} - If you want to set a default password but make the user change it after next login, you can - add a @force-password-reset column in the CSV. A value of 'true' in this column will - ask the user to change password after the next login. - {% endblocktrans %} -
-{% trans "Examples" %}
-{% blocktrans trimmed %}Importing first and last name of users keyed by email{% endblocktrans %}
--"email key",first_name,last_name +{% trans "External identifier" %}
++ {% blocktrans trimmed %} + You can also use two special columns _source_name and + _source_id. _source_name must be the name of the + source directory from which the users are exported, it must not + change between imports. _source_id is the unique identifier + from the source directory from which the users are extracted, it must + not change between imports and should never be reused for different + users. _source_id is automatically the key column, and you + cannot use another key column. + {% endblocktrans %} +
+{% trans "Role operations" %}
++ {% blocktrans trimmed %} + Adding existing roles to users is supported. Use either + _role_name or _role_slug special columns to + specify the names or the slugs that should be added to the user. In + order to add multiple roles, simply add a new line, identical to the + first one, except for the value of the role cell. These columns also + accept special flags, as listed below. + {% endblocktrans %} +
++ +
++ + + +{% trans "Flag" %} +{% trans "Meaning" %} +{% trans "Default value" %} ++ +delete ++ {% blocktrans trimmed %} + Remove role from user instead of adding it. + {% endblocktrans %} + +{% trans "False" %} ++ + +clear ++ {% blocktrans trimmed %} + Clear user roles beforehand, so that they will have no more roles + than those specified in the import file. + {% endblocktrans %} + +{% trans "False" %} +{% trans "Registration options" %}
++ {% blocktrans trimmed %} + When a user is created by the import, they will have to use the "forgotten password" feature + in order to log in for the first time. An alternative is to use the special column + @registration with the value send-email. In this case, newly created + users will receive an email, inviting them to set their password. + {% endblocktrans %} +
+{% trans "Force Password Reset" %}
++ {% blocktrans trimmed %} + If you want to set a default password but make the user change it after next login, you can + add a @force-password-reset column in the CSV. A value of 'true' in this column will + ask the user to change password after the next login. + {% endblocktrans %} +
+{% trans "Examples" %}
+{% blocktrans trimmed %}Importing first and last name of users keyed by email{% endblocktrans %}
++-"email key",first_name,last_name john.doe@example.com,John,Doe --{% blocktrans trimmed %}Importing verified first and last name of users keyed by email{% endblocktrans %}
--+"email key","first_name verified","last_name verified" ++{% blocktrans trimmed %}Importing verified first and last name of users keyed by email{% endblocktrans %}
++-"email key","first_name verified","last_name verified" john.doe@example.com,John,Doe --{% blocktrans trimmed %}Importing email, family_reference, first and last name of users from application app1, ensuring family_reference is unique.{% endblocktrans %}
--+_source_name,_source_id,email,"family_reference unique",first_name,last_name ++{% blocktrans trimmed %}Importing email, family_reference, first and last name of users from application app1, ensuring family_reference is unique.{% endblocktrans %}
++-_source_name,_source_id,email,"family_reference unique",first_name,last_name app1,1,john.doe@example.com,1234,John,Doe --{% blocktrans trimmed %}Importing email, first and last name of users - while adding roles.{% endblocktrans %}
--+email key,first_name,last_name,_role_name ++{% blocktrans trimmed %}Importing email, first and last name of users + while adding roles.{% endblocktrans %}
++-email key,first_name,last_name,_role_name john.doe@example.com,John,Doe,Role1 john.doe@example.com,John,Doe,Role2 --{% blocktrans trimmed %}Importing email, first and last name of users - and sending a password reset email to John (only if the account is created - by the import).{% endblocktrans %}
--+email key,first_name,last_name,@registration ++{% blocktrans trimmed %}Importing email, first and last name of users + and sending a password reset email to John (only if the account is created + by the import).{% endblocktrans %}
++-email key,first_name,last_name,@registration john.doe@example.com,John,Doe,send-email jane.doe@example.com,Jane,Doe, --{% blocktrans trimmed %}Importing email, first and last name of users - and setting a password using hash in standard Django format. Forcing password change for Jane after next login.{% endblocktrans %}
--+email key,first_name,last_name,password_hash,@force-password-reset ++{% blocktrans trimmed %}Importing email, first and last name of users + and setting a password using hash in standard Django format. Forcing password change for Jane after next login.{% endblocktrans %}
++-email key,first_name,last_name,password_hash,@force-password-reset john.doe@example.com,John,Doe,pbkdf2_sha256$36000$oTHdVaoMjnCp$uTkpF7Ne6KV/L5gAerS7mngXM96DOEaLsLMZ251HJ/M=, jane.doe@example.com,Jane,Doe,pbkdf2_sha256$36000$oTHdVaoMjnCp$uTkpF7Ne6KV/L5gAerS7mngXM96DOEaLsLMZ251HJ/M=,true --
{{ title }}
- -{{ title }}
+ +{% trans "Error: page not found" %}
+{% trans "Error: page not found" %}
-{% trans "The page you requested has not been found on this server." %} +
{% trans "The page you requested has not been found on this server." %} {% endblock %} diff --git a/src/authentic2/templates/admin/base_site.html b/src/authentic2/templates/admin/base_site.html index 0b0fc60cd..6ca91f3f7 100644 --- a/src/authentic2/templates/admin/base_site.html +++ b/src/authentic2/templates/admin/base_site.html @@ -4,7 +4,7 @@ {% block title %}{{ title }} | {% trans 'Authentic site admin' %}{% endblock %} {% block branding %} -
{% trans 'Authentic administration' %}
+{% trans 'Authentic administration' %}
{% endblock %} {% block nav-global %}{% endblock %} diff --git a/src/authentic2/templates/admin/log_view.html b/src/authentic2/templates/admin/log_view.html index c7a58a058..9d7a460e4 100644 --- a/src/authentic2/templates/admin/log_view.html +++ b/src/authentic2/templates/admin/log_view.html @@ -7,39 +7,39 @@ {% block content %} -{% trans "Logs page" %}
+{% trans "Logs page" %}
-{% if not file %} -There is no log for the moment.
-{% else %} -{% for log in logs.object_list %} - {% if "CRITICAL" in log %} + {% if not file %} +There is no log for the moment.
+ {% else %} + {% for log in logs.object_list %} + {% if "CRITICAL" in log %}{{ log }}
- {% else %} + {% else %} {% if "ERROR" in log %} -{{ log }}
+{{ log }}
{% else %} -{{ log }}
+{{ log }}
{% endif %} - {% endif %} -{% endfor %} + {% endif %} + {% endfor %} -{% blocktrans %}{{ full_name }},{% endblocktrans %}
--{% blocktrans %} -Your account on {{ site }} has been deleted. -All related data will be deleted today. -You cannot log in with it anymore. -{% endblocktrans %} -
+{% blocktrans %}{{ full_name }},{% endblocktrans %}
++ {% blocktrans %} + Your account on {{ site }} has been deleted. + All related data will be deleted today. + You cannot log in with it anymore. + {% endblocktrans %} +
diff --git a/src/authentic2/templates/authentic2/account_deletion_code_body.html b/src/authentic2/templates/authentic2/account_deletion_code_body.html index d5b526d85..c2ee2a94b 100644 --- a/src/authentic2/templates/authentic2/account_deletion_code_body.html +++ b/src/authentic2/templates/authentic2/account_deletion_code_body.html @@ -1,15 +1,15 @@ {% load i18n %} -{% blocktrans %}{{ full_name }},{% endblocktrans %}
--{% blocktrans %} -Please click on {{ deletion_url }} -if you want to validate your account deletion request on -{{ site }}. -If so, all related data will be deleted in the next few hours. -You won't be able to log in with this account anymore. -{% endblocktrans %} -
+{% blocktrans %}{{ full_name }},{% endblocktrans %}
++ {% blocktrans %} + Please click on {{ deletion_url }} + if you want to validate your account deletion request on + {{ site }}. + If so, all related data will be deleted in the next few hours. + You won't be able to log in with this account anymore. + {% endblocktrans %} +
diff --git a/src/authentic2/templates/authentic2/accounts_delete_request.html b/src/authentic2/templates/authentic2/accounts_delete_request.html index 705d9855c..70f349276 100644 --- a/src/authentic2/templates/authentic2/accounts_delete_request.html +++ b/src/authentic2/templates/authentic2/accounts_delete_request.html @@ -13,24 +13,24 @@ {% block content %} - + {% endblock %} diff --git a/src/authentic2/templates/authentic2/accounts_delete_validation.html b/src/authentic2/templates/authentic2/accounts_delete_validation.html index baa898c78..cf750256c 100644 --- a/src/authentic2/templates/authentic2/accounts_delete_validation.html +++ b/src/authentic2/templates/authentic2/accounts_delete_validation.html @@ -13,15 +13,15 @@ {% block content %} - + {% endblock %} diff --git a/src/authentic2/templates/authentic2/accounts_edit.html b/src/authentic2/templates/authentic2/accounts_edit.html index ff0bfb313..29346b422 100644 --- a/src/authentic2/templates/authentic2/accounts_edit.html +++ b/src/authentic2/templates/authentic2/accounts_edit.html @@ -17,12 +17,12 @@ {% csrf_token %} {{ form|with_template }} {% endblock %} diff --git a/src/authentic2/templates/authentic2/accounts_edit_required.html b/src/authentic2/templates/authentic2/accounts_edit_required.html index 597523d8a..24784a83a 100644 --- a/src/authentic2/templates/authentic2/accounts_edit_required.html +++ b/src/authentic2/templates/authentic2/accounts_edit_required.html @@ -2,9 +2,9 @@ {% load i18n %} {% block content %} -{% block required-attributes-message %} -{% blocktrans with email=user.email %}Your current email is {{ email }}. - An email will be sent to validate the new one.{% endblocktrans %}
+ An email will be sent to validate the new one.{% endblocktrans %} {% endblock %} diff --git a/src/authentic2/templates/authentic2/consents.html b/src/authentic2/templates/authentic2/consents.html index 1f56cfb0d..c7db9ecd2 100644 --- a/src/authentic2/templates/authentic2/consents.html +++ b/src/authentic2/templates/authentic2/consents.html @@ -2,60 +2,60 @@ {% load i18n %} {% block page-title %} -{{ block.super }} - {{ view.title }} + {{ block.super }} - {{ view.title }} {% endblock %} {% block breadcrumb %} -{{ block.super }} -{% trans "Your account" %} -{{ view.title }} + {{ block.super }} + {% trans "Your account" %} + {{ view.title }} {% endblock %} {% block content %} -{% block consents-pre %}{% endblock %} - -{% block consents-post %}{% endblock %} + {% block consents-pre %}{% endblock %} + + {% block consents-post %}{% endblock %} {% endblock %} diff --git a/src/authentic2/templates/authentic2/display_message_and_continue.html b/src/authentic2/templates/authentic2/display_message_and_continue.html index 958e719f0..2a94e14d3 100644 --- a/src/authentic2/templates/authentic2/display_message_and_continue.html +++ b/src/authentic2/templates/authentic2/display_message_and_continue.html @@ -7,21 +7,21 @@ {% if only_info %} {% endif %} {% endblock %} diff --git a/src/authentic2/templates/authentic2/homepage.html b/src/authentic2/templates/authentic2/homepage.html index e4c89a447..3eeaf2d88 100644 --- a/src/authentic2/templates/authentic2/homepage.html +++ b/src/authentic2/templates/authentic2/homepage.html @@ -14,32 +14,32 @@ {% block content %} {% if authorized_services %}{% trans "Services" %}
--
- {% for service in authorized_services %}
- {% if service.actions %}
-
- {% if service.url %}{% endif %}{{ service.name }}{% if service.url %}{% endif %}
- - {% for action in service.actions %} - {% if action.0 == "template" %} - {% include action.1 %} - {% else %} - - {% endif %} - {% endfor %} --
- {% endif %}
- {% endfor %}
-
{{ authenticator.button_description }}
-{% endif %} + {% block form %} + {% if authenticator.button_description %} +{{ authenticator.button_description }}
+ {% endif %} --
-{% if can_reset_password %}
-
→ {% trans "Forgot password?" %} {% trans "Reset it!" %}
-{% endif %}
-{% if registration_authorized and not hide_login_registration_link %}
-→ {% trans "Not a member?" %} {% trans "Register!" %}
-{% endif %}
-
-
+ {% if can_reset_password %}
+
→ {% trans "Forgot password?" %} {% trans "Reset it!" %}
+ {% endif %}
+ {% if registration_authorized and not hide_login_registration_link %}
+ → {% trans "Not a member?" %} {% trans "Register!" %}
+ {% endif %}
+
{% trans "Password" %}
+{% trans "Password" %}
- + {% endif %} diff --git a/src/authentic2/templates/authentic2/login_password_registration_form.html b/src/authentic2/templates/authentic2/login_password_registration_form.html index 003b87d11..108df7f49 100644 --- a/src/authentic2/templates/authentic2/login_password_registration_form.html +++ b/src/authentic2/templates/authentic2/login_password_registration_form.html @@ -1,11 +1,11 @@ {% load i18n gadjo %} {% block registration %} - + {% endblock %} diff --git a/src/authentic2/templates/authentic2/logout.html b/src/authentic2/templates/authentic2/logout.html index 2ca5dae48..88b0e6124 100644 --- a/src/authentic2/templates/authentic2/logout.html +++ b/src/authentic2/templates/authentic2/logout.html @@ -24,9 +24,9 @@ {% block content %}{% trans message %}
-
- {% for fragment in logout_list %}
- {{ fragment|safe }}
- {% endfor %}
+ {% for fragment in logout_list %}
+ {{ fragment|safe }}
+ {% endfor %}
{% trans "Hi," %}
+{% trans "Hi," %}
-{% blocktrans trimmed with hostname=request.get_host %} -You requested reset of your password on {{ hostname }}. Unfortunately, it cannot be done from this website, because your account is synchronised from a LDAP server. Hence password reset should be handled in the directory. -{% endblocktrans %}
+{% blocktrans trimmed with hostname=request.get_host %} + You requested reset of your password on {{ hostname }}. Unfortunately, it cannot be done from this website, because your account is synchronised from a LDAP server. Hence password reset should be handled in the directory. + {% endblocktrans %}
-{% trans "In the meantine, you can access your account using the button below." %}
+{% trans "In the meantine, you can access your account using the button below." %}
-{% with _("Access account") as button_label %} -{% include "emails/button-link.html" with url=login_url label=button_label %} -{% endwith %} + {% with _("Access account") as button_label %} + {% include "emails/button-link.html" with url=login_url label=button_label %} + {% endwith %} {% endblock %} diff --git a/src/authentic2/templates/authentic2/password_reset_no_account_body.html b/src/authentic2/templates/authentic2/password_reset_no_account_body.html index b9eeee8cd..20db460d6 100644 --- a/src/authentic2/templates/authentic2/password_reset_no_account_body.html +++ b/src/authentic2/templates/authentic2/password_reset_no_account_body.html @@ -2,14 +2,14 @@ {% load i18n %} {% block content %} -{% trans "Hi," %}
+{% trans "Hi," %}
-{% blocktrans trimmed with hostname=request.get_host %} -You requested reset of your password on {{ hostname }}, but no account was found associated with this address. -{% endblocktrans %}
-{% if registration_url %} -{% with _("Create an account") as button_label %} -{% include "emails/button-link.html" with url=registration_url label=button_label %} -{% endwith %} -{% endif %} +{% blocktrans trimmed with hostname=request.get_host %} + You requested reset of your password on {{ hostname }}, but no account was found associated with this address. + {% endblocktrans %}
+ {% if registration_url %} + {% with _("Create an account") as button_label %} + {% include "emails/button-link.html" with url=registration_url label=button_label %} + {% endwith %} + {% endif %} {% endblock %} diff --git a/src/authentic2/templates/authentic2/password_reset_refused_body.html b/src/authentic2/templates/authentic2/password_reset_refused_body.html index 375090274..6902ce4cf 100644 --- a/src/authentic2/templates/authentic2/password_reset_refused_body.html +++ b/src/authentic2/templates/authentic2/password_reset_refused_body.html @@ -2,9 +2,9 @@ {% load i18n %} {% block content %} -{% trans "Hi," %}
+{% trans "Hi," %}
-{% blocktrans trimmed with hostname=request.get_host %} -You requested reset of your password on {{ hostname }}. Unfortunately, your account has been disabled on this server, thus your request can't succeed. -{% endblocktrans %}
+{% blocktrans trimmed with hostname=request.get_host %} + You requested reset of your password on {{ hostname }}. Unfortunately, your account has been disabled on this server, thus your request can't succeed. + {% endblocktrans %}
{% endblock %} diff --git a/src/authentic2/templates/authentic2/profile_image_input.html b/src/authentic2/templates/authentic2/profile_image_input.html index 186e7167a..c7d6b1212 100644 --- a/src/authentic2/templates/authentic2/profile_image_input.html +++ b/src/authentic2/templates/authentic2/profile_image_input.html @@ -1,5 +1,5 @@ {% if widget.is_initial %}{{ widget.initial_text }}:-{{ widget.input_text }}:{% endif %} + + {% endif %}
+ {{ widget.input_text }}:{% endif %} diff --git a/src/authentic2/templates/authentic2/registration_success_body.html b/src/authentic2/templates/authentic2/registration_success_body.html index 0651820af..533169c1f 100644 --- a/src/authentic2/templates/authentic2/registration_success_body.html +++ b/src/authentic2/templates/authentic2/registration_success_body.html @@ -2,22 +2,22 @@ {% blocktrans %} -
Hi {{ user }}!
-Your registration on {{ site }} was successful!
+Hi {{ user }}!
+Your registration on {{ site }} was successful!
- + {% endblocktrans %}-
- {% if user.username %}
-
- {% trans "Username:" %} {{ user.username }} - {% endif %} -
- {% trans "Email:" %} {{ user.email }} - {% if user.first_name %} -
- {% trans "First name:" %} {{ user.first_name }} - {% endif %} - {% if user.last_name %} -
- {% trans "Last name:" %} {{ user.last_name }} - {% endif %} + {% if user.username %} +
- {% trans "Username:" %} {{ user.username }} + {% endif %} +
- {% trans "Email:" %} {{ user.email }} + {% if user.first_name %} +
- {% trans "First name:" %} {{ user.first_name }} + {% endif %} + {% if user.last_name %} +
- {% trans "Last name:" %} {{ user.last_name }} + {% endif %}
{% trans "Password strength :" %} -
{{ title }}
-{{ msg }} - +{{ title }}
+ {{ msg }} + {% endblock %} diff --git a/src/authentic2/templates/error_ssl.html b/src/authentic2/templates/error_ssl.html index f6f097108..b576a9d9d 100644 --- a/src/authentic2/templates/error_ssl.html +++ b/src/authentic2/templates/error_ssl.html @@ -5,9 +5,9 @@ {% block content %} -{% trans "Authentication failure" %}
+{% trans "Authentication failure" %}
-{% trans "The SSL authentication has failed" %}
-Back +{% trans "The SSL authentication has failed" %}
+ Back {% endblock %} diff --git a/src/authentic2/templates/interaction/consent_attributes.html b/src/authentic2/templates/interaction/consent_attributes.html index 69056704d..205215b60 100644 --- a/src/authentic2/templates/interaction/consent_attributes.html +++ b/src/authentic2/templates/interaction/consent_attributes.html @@ -6,34 +6,34 @@ {% block content %} -{% load i18n %} --{% if provider_id %} -{% blocktrans with provider_id=provider_id %} -Do you accept to federate your account with {{ provider_id }}? -{% endblocktrans %} -{% else %} -{% trans "Do you accept to federate your account?" %} -{% endif %} -{{ provider_id2 }} -
- -+ {% if provider_id %} + {% blocktrans with provider_id=provider_id %} + Do you accept to federate your account with {{ provider_id }}? + {% endblocktrans %} + {% else %} + {% trans "Do you accept to federate your account?" %} + {% endif %} + {{ provider_id2 }} +
+ +{% trans "Account successfully activated" %}
+{% trans "Account successfully activated" %}
- + -{% else %} + {% else %} -{% trans "Account activation failed" %}
+{% trans "Account activation failed" %}
-{% endif %} + {% endif %} {% endblock %} diff --git a/src/authentic2/templates/registration/activation_complete.html b/src/authentic2/templates/registration/activation_complete.html index 2123fdb2d..6cf7d795a 100644 --- a/src/authentic2/templates/registration/activation_complete.html +++ b/src/authentic2/templates/registration/activation_complete.html @@ -2,5 +2,5 @@ {% load i18n %} {% block content %} -{% trans "Your account is now activated" %} + {% trans "Your account is now activated" %} {% endblock %} diff --git a/src/authentic2/templates/registration/activation_email.html b/src/authentic2/templates/registration/activation_email.html index 2eef213c4..b5a4dc0a1 100644 --- a/src/authentic2/templates/registration/activation_email.html +++ b/src/authentic2/templates/registration/activation_email.html @@ -12,9 +12,9 @@ {% endif %} {% if expiration_days > 1 %} -{% blocktrans %}This link is valid for {{ expiration_days }} days.{% endblocktrans %} +
{% blocktrans %}This link is valid for {{ expiration_days }} days.{% endblocktrans %} {% else %} -
{% blocktrans %}This link is valid for 24 hours.{% endblocktrans %} +
{% blocktrans %}This link is valid for 24 hours.{% endblocktrans %} {% endif %}
{% blocktrans %}If you did not register on {{ site }}, ignore this email.{% endblocktrans %}
diff --git a/src/authentic2/templates/registration/logout.html b/src/authentic2/templates/registration/logout.html index eacb4dcd5..0f048e218 100644 --- a/src/authentic2/templates/registration/logout.html +++ b/src/authentic2/templates/registration/logout.html @@ -2,10 +2,10 @@ {% load i18n %} {% block title %} -{% trans "Logging out" %} + {% trans "Logging out" %} {% endblock %} {% block content %} -{% trans "Logged out" %}
- +{% trans "Logged out" %}
+ {% endblock %} diff --git a/src/authentic2/templates/registration/password_change_done.html b/src/authentic2/templates/registration/password_change_done.html index f211a8ae4..ba57753d2 100644 --- a/src/authentic2/templates/registration/password_change_done.html +++ b/src/authentic2/templates/registration/password_change_done.html @@ -2,9 +2,9 @@ {% load i18n %} {% block title %} -{{ view.title }} + {{ view.title }} {% endblock %} {% block content %} -{% trans "Password changed" %}
+{% trans "Password changed" %}
{% endblock %} diff --git a/src/authentic2/templates/registration/password_change_form.html b/src/authentic2/templates/registration/password_change_form.html index a57467ed2..add6f93a3 100644 --- a/src/authentic2/templates/registration/password_change_form.html +++ b/src/authentic2/templates/registration/password_change_form.html @@ -14,17 +14,17 @@ {% block content %} {% endblock %} diff --git a/src/authentic2/templates/registration/password_reset_confirm.html b/src/authentic2/templates/registration/password_reset_confirm.html index b62dd5492..1ffcfa813 100644 --- a/src/authentic2/templates/registration/password_reset_confirm.html +++ b/src/authentic2/templates/registration/password_reset_confirm.html @@ -2,26 +2,26 @@ {% load i18n gadjo %} {% block title %} -{{ view.title }} + {{ view.title }} {% endblock %} {% block content %} -{% if validlink %} + {% if validlink %} - + + -{% else %} + {% else %} -{% trans "Password reset failed" %}
+{% trans "Password reset failed" %}
-{% endif %} + {% endif %} {% endblock %} diff --git a/src/authentic2/templates/registration/password_reset_email.html b/src/authentic2/templates/registration/password_reset_email.html index 93cdc688f..b33ae9965 100644 --- a/src/authentic2/templates/registration/password_reset_email.html +++ b/src/authentic2/templates/registration/password_reset_email.html @@ -1,6 +1,6 @@ {% load i18n %} {% blocktrans with hostname=request.get_host %}You requested reset of your password on {{ hostname }}, to proceed please -click on the following link{% endblocktrans %}: + click on the following link{% endblocktrans %}: {% block reset_link %} - {{ reset_url }} + {{ reset_url }} {% endblock %} diff --git a/src/authentic2/templates/registration/password_reset_form.html b/src/authentic2/templates/registration/password_reset_form.html index 060937503..2ed16e298 100644 --- a/src/authentic2/templates/registration/password_reset_form.html +++ b/src/authentic2/templates/registration/password_reset_form.html @@ -2,19 +2,19 @@ {% load i18n gadjo %} {% block title %} -{% trans "Resetting password" %} + {% trans "Resetting password" %} {% endblock %} {% block content %} -{% trans "Resetting password" %}
+{% trans "Resetting password" %}
- + + {% endblock %} diff --git a/src/authentic2/templates/registration/password_reset_instructions.html b/src/authentic2/templates/registration/password_reset_instructions.html index dc17f0993..19a3c1494 100644 --- a/src/authentic2/templates/registration/password_reset_instructions.html +++ b/src/authentic2/templates/registration/password_reset_instructions.html @@ -7,36 +7,36 @@ {% block content %} {% if 'robot' in request.GET %} -{% trans "Your password reset request has been refused." %}{% trans "Indeed your browser checked a hidden anti-robot checkbox on the registration form. A browser extension may produce this behaviour, in this case disable such extensions and try again." %}
+{% trans "Your password reset request has been refused." %}{% trans "Indeed your browser checked a hidden anti-robot checkbox on the registration form. A browser extension may produce this behaviour, in this case disable such extensions and try again." %}
{% else %} -- - {% blocktrans with email=request.session.reset_email %} - An email has been sent to {{ email }}. - {% endblocktrans %} -
-- {% blocktrans %} - Follow the instructions in this email in order to choose a new password. - {% endblocktrans %} -
- {% block advice %}- {% blocktrans %} - The email may take several minutes to be received. It can also be - considered as spam: please look in your "junk mail" folder. - {% endblocktrans %} -
-- {% blocktrans %} - If you still have not received the instructions, add "{{from_email_address}}" - to your address book or authorized sender list, and then repeat the - password reset process. - {% endblocktrans %} - {% endblock %} -
- {% endif %} - {% block back %} - + + {% blocktrans with email=request.session.reset_email %} + An email has been sent to {{ email }}. + {% endblocktrans %} + ++ {% blocktrans %} + Follow the instructions in this email in order to choose a new password. + {% endblocktrans %} +
+ {% block advice %} ++ {% blocktrans %} + The email may take several minutes to be received. It can also be + considered as spam: please look in your "junk mail" folder. + {% endblocktrans %} +
++ {% blocktrans %} + If you still have not received the instructions, add "{{from_email_address}}" + to your address book or authorized sender list, and then repeat the + password reset process. + {% endblocktrans %} {% endblock %} +
+ {% endif %} + {% block back %} + + {% endblock %} {% endblock %} diff --git a/src/authentic2/templates/registration/registration_closed.html b/src/authentic2/templates/registration/registration_closed.html index 1be94521f..4ebc5f425 100644 --- a/src/authentic2/templates/registration/registration_closed.html +++ b/src/authentic2/templates/registration/registration_closed.html @@ -2,9 +2,9 @@ {% load i18n %} {% block title %} -{% trans "Registration closed" %} + {% trans "Registration closed" %} {% endblock %} {% block content %} -{% trans "Registration closed" %}
+{% trans "Registration closed" %}
{% endblock %} diff --git a/src/authentic2/templates/registration/registration_complete.html b/src/authentic2/templates/registration/registration_complete.html index 9bbe17ce3..0e25f4183 100644 --- a/src/authentic2/templates/registration/registration_complete.html +++ b/src/authentic2/templates/registration/registration_complete.html @@ -2,42 +2,42 @@ {% load i18n %} {% block title %} -{% trans "Registration in progress" %} + {% trans "Registration in progress" %} {% endblock %} {% block content %} {% if 'robot' in request.GET %} -{% trans "Your registration request has been refused." %}{% trans "Indeed your browser checked a hidden anti-robot checkbox on the registration form. A browser extension may produce this behaviour, in this case disable such extensions and try again." %}
+{% trans "Your registration request has been refused." %}{% trans "Indeed your browser checked a hidden anti-robot checkbox on the registration form. A browser extension may produce this behaviour, in this case disable such extensions and try again." %}
{% else %} - {% block instructions %} -- {% blocktrans with email=request.session.registered_email %} - An email was sent to {{ email }}. - {% endblocktrans %} -
-- {% blocktrans %} - Follow the instructions in that email to continue your registration. - {% endblocktrans %} -
- {% endblock %} - {% block advice %} -- {% blocktrans %} - The email may take several minutes to be received. It can also be - considered as spam: please look in your "junk mail" folder. - {% endblocktrans %} -
-- {% blocktrans with from_email=from_email %} - If you still have not received the instructions, add "{{from_email_address}}" - to your address book or authorized sender list, and then repeat the - registration process. - {% endblocktrans %} -
- {% endblock %} + {% block instructions %} ++ {% blocktrans with email=request.session.registered_email %} + An email was sent to {{ email }}. + {% endblocktrans %} +
++ {% blocktrans %} + Follow the instructions in that email to continue your registration. + {% endblocktrans %} +
+ {% endblock %} + {% block advice %} ++ {% blocktrans %} + The email may take several minutes to be received. It can also be + considered as spam: please look in your "junk mail" folder. + {% endblocktrans %} +
++ {% blocktrans with from_email=from_email %} + If you still have not received the instructions, add "{{from_email_address}}" + to your address book or authorized sender list, and then repeat the + registration process. + {% endblocktrans %} +
+ {% endblock %} {% endif %} {% block back %} - + {% endblock %} {% endblock %} diff --git a/src/authentic2/templates/registration/registration_completion_choose.html b/src/authentic2/templates/registration/registration_completion_choose.html index f83ec6650..16923b46a 100644 --- a/src/authentic2/templates/registration/registration_completion_choose.html +++ b/src/authentic2/templates/registration/registration_completion_choose.html @@ -2,41 +2,41 @@ {% load i18n %} {% block title %} - {% trans "Registration" %} + {% trans "Registration" %} {% endblock %} {% block content %} -{% trans "Login" %}
-- {% blocktrans count accounts_number=accounts|length %}An account already exists for this email. Please click on the account name to log in with.{% plural %}More accounts are associated to this email. Please choose the account you want to log in with:{% endblocktrans %} -
+{% trans "Login" %}
++ {% blocktrans count accounts_number=accounts|length %}An account already exists for this email. Please click on the account name to log in with.{% plural %}More accounts are associated to this email. Please choose the account you want to log in with:{% endblocktrans %} +
--
- {% for user in users %}
-
- - - - {% endfor %} -
- {% trans "or" %} - - {% trans "create a new account" %} - -
- {% endif %} +-
+ {% for user in users %}
+
- + + + {% endfor %} +
+ {% trans "or" %} + + {% trans "create a new account" %} + +
+ {% endif %} {% endblock %} diff --git a/src/authentic2/templates/registration/registration_completion_form.html b/src/authentic2/templates/registration/registration_completion_form.html index e0b74ea98..6be857bef 100644 --- a/src/authentic2/templates/registration/registration_completion_form.html +++ b/src/authentic2/templates/registration/registration_completion_form.html @@ -2,24 +2,24 @@ {% load i18n gadjo %} {% block title %} - {% trans "Registration" %} + {% trans "Registration" %} {% endblock %} {% block content %} - {% block registration-completion-form-pre %} -{% trans "Registration" %}
-{% trans "Please fill the form to complete your registration" %}
- {% endblock %} - - {% block registration-completion-form-post %}{% endblock %} + {% block registration-completion-form-pre %} +{% trans "Registration" %}
+{% trans "Please fill the form to complete your registration" %}
+ {% endblock %} + + {% block registration-completion-form-post %}{% endblock %} {% endblock %} diff --git a/src/authentic2/templates/registration/registration_form.html b/src/authentic2/templates/registration/registration_form.html index 29b0151a6..35d4d0bda 100644 --- a/src/authentic2/templates/registration/registration_form.html +++ b/src/authentic2/templates/registration/registration_form.html @@ -2,22 +2,22 @@ {% load i18n %} {% block title %} -{{ view.title }} + {{ view.title }} {% endblock %} {% block content %} -{{ view.title }}
+{{ view.title }}
-{% include "authentic2/service_info_fragment.html" %} + {% include "authentic2/service_info_fragment.html" %} -{% for id, block in frontends.items %} -{{ block.name }}
-- {{ block.content|safe }} -
-{{ block.name }}
++ {{ block.content|safe }} +
+- {% trans "What is FranceConnect?" %} + {% trans "What is FranceConnect?" %}
{% blocktrans %} - FranceConnect is the solution proposed by the French state to secure and - streamline logging in to online services. + FranceConnect is the solution proposed by the French state to secure and + streamline logging in to online services. {% endblocktrans %}
--
-
{{ user.fc_accounts.all.0 }}{% if unlink %} {% trans 'Delete link'%}{% endif %}
+ {{ user.fc_accounts.all.0 }}{% if unlink %} {% trans 'Delete link'%}{% endif %}
{% endif %} diff --git a/src/authentic2_auth_fc/templates/authentic2_auth_fc/login.html b/src/authentic2_auth_fc/templates/authentic2_auth_fc/login.html index 55ecd927c..c5843da25 100644 --- a/src/authentic2_auth_fc/templates/authentic2_auth_fc/login.html +++ b/src/authentic2_auth_fc/templates/authentic2_auth_fc/login.html @@ -3,12 +3,12 @@ {% include "authentic2_auth_fc/explanation.html" %} {% block login %} -