diff --git a/changes/1513.changes b/changes/1513.changes new file mode 100644 index 000000000..248a85183 --- /dev/null +++ b/changes/1513.changes @@ -0,0 +1 @@ +Add an alert on login page for users to change password in order to comply with the new password requirements. \ No newline at end of file diff --git a/ckanext/canada/i18n/ckanext-canada.pot b/ckanext/canada/i18n/ckanext-canada.pot index 2b7491335..2fef3fc59 100644 --- a/ckanext/canada/i18n/ckanext-canada.pot +++ b/ckanext/canada/i18n/ckanext-canada.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ckanext-canada 0.4.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-09-09 14:43-0400\n" +"POT-Creation-Date: 2024-09-13 10:55-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -398,7 +398,7 @@ msgid "Request Reset" msgstr "" #: ckanext/canada/strings.py:38 -#: ckanext/canada/templates/user/edit_user_form.html:42 +#: ckanext/canada/templates/user/edit_user_form.html:47 msgid "Create API Token" msgstr "" @@ -945,7 +945,7 @@ msgstr "" #: ckanext/canada/tables/briefingt.yaml:406 #: ckanext/canada/tables/contractsa.yaml:396 #: ckanext/canada/tables/hospitalityq.yaml:606 -#: ckanext/canada/tables/qpnotes.yaml:453 +#: ckanext/canada/tables/qpnotes.yaml:456 #: ckanext/canada/tables/reclassification.yaml:389 #: ckanext/canada/tables/travela.yaml:645 ckanext/canada/tables/travelq.yaml:600 msgid "This must list the year you are reporting on (not the fiscal year)." @@ -2172,7 +2172,7 @@ msgstr "" #: ckanext/canada/templates/organization/member_new.html:60 #: ckanext/canada/templates/scheming/package/read.html:26 #: ckanext/canada/templates/scheming/snippets/form_field.html:21 -#: ckanext/canada/templates/user/edit_user_form.html:37 +#: ckanext/canada/templates/user/edit_user_form.html:42 msgid "Delete" msgstr "" @@ -3146,29 +3146,34 @@ msgid "Change password" msgstr "" #: ckanext/canada/templates/user/edit_user_form.html:22 +#: ckanext/canada/templates/user/perform_reset.html:8 +msgid "password reset requirements" +msgstr "" + +#: ckanext/canada/templates/user/edit_user_form.html:27 msgid "Sysadmin Password" msgstr "" -#: ckanext/canada/templates/user/edit_user_form.html:22 +#: ckanext/canada/templates/user/edit_user_form.html:27 msgid "Old Password" msgstr "" -#: ckanext/canada/templates/user/edit_user_form.html:30 +#: ckanext/canada/templates/user/edit_user_form.html:35 #: ckanext/canada/templates/user/new_user_form.html:21 #: ckanext/canada/templates/user/snippets/login_form.html:12 msgid "Password" msgstr "" -#: ckanext/canada/templates/user/edit_user_form.html:31 +#: ckanext/canada/templates/user/edit_user_form.html:36 #: ckanext/canada/templates/user/new_user_form.html:24 msgid "Confirm Password" msgstr "" -#: ckanext/canada/templates/user/edit_user_form.html:37 +#: ckanext/canada/templates/user/edit_user_form.html:42 msgid "Are you sure you want to delete this User?" msgstr "" -#: ckanext/canada/templates/user/edit_user_form.html:45 +#: ckanext/canada/templates/user/edit_user_form.html:50 msgid "Update Profile" msgstr "" @@ -3206,52 +3211,56 @@ msgstr "" msgid "login welcome text" msgstr "" -#: ckanext/canada/templates/user/login.html:11 +#: ckanext/canada/templates/user/login.html:7 +msgid "password reset alert" +msgstr "" + +#: ckanext/canada/templates/user/login.html:12 msgid "NOTE: Username and password are case sensitive." msgstr "" -#: ckanext/canada/templates/user/login.html:23 +#: ckanext/canada/templates/user/login.html:24 msgid "Need an account" msgstr "" -#: ckanext/canada/templates/user/login.html:26 +#: ckanext/canada/templates/user/login.html:27 msgid "Then sign right up, it only takes a minute" msgstr "" -#: ckanext/canada/templates/user/login.html:28 +#: ckanext/canada/templates/user/login.html:29 #: ckanext/canada/templates/user/new.html:5 msgid "Request an Account" msgstr "" -#: ckanext/canada/templates/user/login.html:34 +#: ckanext/canada/templates/user/login.html:35 msgid "Forgotten your password?" msgstr "" -#: ckanext/canada/templates/user/login.html:36 +#: ckanext/canada/templates/user/login.html:37 msgid "No problem, use our password recovery form to reset it" msgstr "" -#: ckanext/canada/templates/user/login.html:38 +#: ckanext/canada/templates/user/login.html:39 msgid "Reset password" msgstr "" -#: ckanext/canada/templates/user/login.html:46 +#: ckanext/canada/templates/user/login.html:47 msgid "Forgotten your username?" msgstr "" -#: ckanext/canada/templates/user/login.html:49 +#: ckanext/canada/templates/user/login.html:50 msgid "No problem, use our username recovery form to recover it" msgstr "" -#: ckanext/canada/templates/user/login.html:51 +#: ckanext/canada/templates/user/login.html:52 msgid "Recover username" msgstr "" -#: ckanext/canada/templates/user/login.html:66 +#: ckanext/canada/templates/user/login.html:67 msgid " Create an Account" msgstr "" -#: ckanext/canada/templates/user/login.html:76 +#: ckanext/canada/templates/user/login.html:77 msgid "Forgot your password?" msgstr "" @@ -3416,19 +3425,6 @@ msgstr "" msgid "I do not agree" msgstr "" -#: ckanext/canada/templates/user/perform_reset.html:9 -#, python-format -msgid "" -"1. Passwords must contain characters from at least 3 of the following 4 " -"classes:\n" -" * Upper Case Letters: A, B, C, … Z\n" -" * Lower Case Letters: a, b, c, … z\n" -" * Westernised Arabic Numerals: 0, 1, 2, … 9\n" -" * Special characters: ({}[],.<>;:'\"?/|\\`~!@#$%%^&*()_-+=).\n" -"2. No accented characters are permitted.\n" -"3. All passwords must be at least 12 characters long.\n" -msgstr "" - #: ckanext/canada/templates/user/read_base.html:14 msgid "Edit User" msgstr "" diff --git a/ckanext/canada/i18n/en/LC_MESSAGES/ckanext-canada.po b/ckanext/canada/i18n/en/LC_MESSAGES/ckanext-canada.po index 0f247d721..eb2432023 100644 --- a/ckanext/canada/i18n/en/LC_MESSAGES/ckanext-canada.po +++ b/ckanext/canada/i18n/en/LC_MESSAGES/ckanext-canada.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: CKAN\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-09-09 14:43-0400\n" +"POT-Creation-Date: 2024-09-13 10:55-0400\n" "PO-Revision-Date: 2014-01-23 13:04+0000\n" "Last-Translator: Sean Hammond \n" "Language: en\n" @@ -408,7 +408,7 @@ msgid "Request Reset" msgstr "" #: ckanext/canada/strings.py:38 -#: ckanext/canada/templates/user/edit_user_form.html:42 +#: ckanext/canada/templates/user/edit_user_form.html:47 msgid "Create API Token" msgstr "" @@ -962,7 +962,7 @@ msgstr "" #: ckanext/canada/tables/briefingt.yaml:406 #: ckanext/canada/tables/contractsa.yaml:396 #: ckanext/canada/tables/hospitalityq.yaml:606 -#: ckanext/canada/tables/qpnotes.yaml:453 +#: ckanext/canada/tables/qpnotes.yaml:456 #: ckanext/canada/tables/reclassification.yaml:389 #: ckanext/canada/tables/travela.yaml:645 #: ckanext/canada/tables/travelq.yaml:600 @@ -2210,7 +2210,7 @@ msgstr "" #: ckanext/canada/templates/organization/member_new.html:60 #: ckanext/canada/templates/scheming/package/read.html:26 #: ckanext/canada/templates/scheming/snippets/form_field.html:21 -#: ckanext/canada/templates/user/edit_user_form.html:37 +#: ckanext/canada/templates/user/edit_user_form.html:42 msgid "Delete" msgstr "" @@ -2747,7 +2747,7 @@ msgid "" msgid_plural "" "Are you sure you want to delete {num} records? This action cannot be " "undone." -msgstr[0] "Are you sure you want to delete record - {name}?" +msgstr[0] "" msgstr[1] "" #: ckanext/canada/templates/recombinant/create_pd_record.html:3 @@ -3206,29 +3206,41 @@ msgid "Change password" msgstr "" #: ckanext/canada/templates/user/edit_user_form.html:22 +#: ckanext/canada/templates/user/perform_reset.html:8 +msgid "password reset requirements" +msgstr "" +"
  1. Passwords must contain characters from at least 3 of the " +"following 4 classes:
    • Upper Case Letters: A, B, C, … " +"Z
    • Lower Case Letters: a, b, c, … z
    • Westernised Arabic " +"Numerals: 0, 1, 2, … 9
    • Special characters: " +"({}[],.<>;:'\"?/|\\`~!@#$%%^&*()_-+=).
  2. No accented " +"characters are permitted.
  3. All passwords must be at least 8 " +"characters long.
  4. Password does not equal username.
" + +#: ckanext/canada/templates/user/edit_user_form.html:27 msgid "Sysadmin Password" msgstr "" -#: ckanext/canada/templates/user/edit_user_form.html:22 +#: ckanext/canada/templates/user/edit_user_form.html:27 msgid "Old Password" msgstr "" -#: ckanext/canada/templates/user/edit_user_form.html:30 +#: ckanext/canada/templates/user/edit_user_form.html:35 #: ckanext/canada/templates/user/new_user_form.html:21 #: ckanext/canada/templates/user/snippets/login_form.html:12 msgid "Password" msgstr "" -#: ckanext/canada/templates/user/edit_user_form.html:31 +#: ckanext/canada/templates/user/edit_user_form.html:36 #: ckanext/canada/templates/user/new_user_form.html:24 msgid "Confirm Password" msgstr "" -#: ckanext/canada/templates/user/edit_user_form.html:37 +#: ckanext/canada/templates/user/edit_user_form.html:42 msgid "Are you sure you want to delete this User?" msgstr "" -#: ckanext/canada/templates/user/edit_user_form.html:45 +#: ckanext/canada/templates/user/edit_user_form.html:50 msgid "Update Profile" msgstr "" @@ -3270,52 +3282,70 @@ msgstr "" " information on using the Registry or to report errors, contact open-" "ouvert@tbs-sct.gc.ca.

" -#: ckanext/canada/templates/user/login.html:11 +#: ckanext/canada/templates/user/login.html:7 +msgid "password reset alert" +msgstr "" +"
New password security " +"requirements

The Open Government Registry is now enforcing " +"new password requirements to align with the best practices outlined in " +"the Government of Canada's Password Guidance:

  • Minimum length " +"equals 12 characters
  • Includes at least three of the following " +"character sets: uppercase characters, lowercase characters, digits, " +"punctuation & special characters
  • Does not equal " +"username

Users with passwords that do not currently meet the " +"new requirements can update their passwords, through Change " +"password section of My Profile page or the Reset password function.

Please " +"note: if passwords are not updated by the end of 2024, we will " +"implement a process to force users to change their password to meet the " +"new requirements before they can access the Registry.

" + +#: ckanext/canada/templates/user/login.html:12 msgid "NOTE: Username and password are case sensitive." msgstr "" -#: ckanext/canada/templates/user/login.html:23 +#: ckanext/canada/templates/user/login.html:24 msgid "Need an account" msgstr "" -#: ckanext/canada/templates/user/login.html:26 +#: ckanext/canada/templates/user/login.html:27 msgid "Then sign right up, it only takes a minute" msgstr "" -#: ckanext/canada/templates/user/login.html:28 +#: ckanext/canada/templates/user/login.html:29 #: ckanext/canada/templates/user/new.html:5 msgid "Request an Account" msgstr "" -#: ckanext/canada/templates/user/login.html:34 +#: ckanext/canada/templates/user/login.html:35 msgid "Forgotten your password?" msgstr "" -#: ckanext/canada/templates/user/login.html:36 +#: ckanext/canada/templates/user/login.html:37 msgid "No problem, use our password recovery form to reset it" msgstr "" -#: ckanext/canada/templates/user/login.html:38 +#: ckanext/canada/templates/user/login.html:39 msgid "Reset password" msgstr "" -#: ckanext/canada/templates/user/login.html:46 +#: ckanext/canada/templates/user/login.html:47 msgid "Forgotten your username?" msgstr "" -#: ckanext/canada/templates/user/login.html:49 +#: ckanext/canada/templates/user/login.html:50 msgid "No problem, use our username recovery form to recover it" msgstr "" -#: ckanext/canada/templates/user/login.html:51 +#: ckanext/canada/templates/user/login.html:52 msgid "Recover username" msgstr "" -#: ckanext/canada/templates/user/login.html:66 +#: ckanext/canada/templates/user/login.html:67 msgid " Create an Account" msgstr "" -#: ckanext/canada/templates/user/login.html:76 +#: ckanext/canada/templates/user/login.html:77 msgid "Forgot your password?" msgstr "" @@ -3485,19 +3515,6 @@ msgstr "" msgid "I do not agree" msgstr "" -#: ckanext/canada/templates/user/perform_reset.html:9 -#, python-format -msgid "" -"1. Passwords must contain characters from at least 3 of the following 4 " -"classes:\n" -" * Upper Case Letters: A, B, C, … Z\n" -" * Lower Case Letters: a, b, c, … z\n" -" * Westernised Arabic Numerals: 0, 1, 2, … 9\n" -" * Special characters: ({}[],.<>;:'\"?/|\\`~!@#$%%^&*()_-+=).\n" -"2. No accented characters are permitted.\n" -"3. All passwords must be at least 12 characters long.\n" -msgstr "" - #: ckanext/canada/templates/user/read_base.html:14 msgid "Edit User" msgstr "" @@ -8428,37 +8445,6 @@ msgstr "" #~ "C1 exactly as downloaded." #~ msgstr "" -#~ msgid "" -#~ "File Format and Naming: Your completed" -#~ " data template should be an Excel " -#~ "spreadsheet in either XLS or XLSX " -#~ "format. Do not rename the file, as" -#~ " the system relies on a unique " -#~ "ID associated with each template. " -#~ "Renaming it could lead to complications." -#~ msgstr "" - -#~ msgid "" -#~ "If your organization hasn't uploaded " -#~ "data yet for that proactive disclosure" -#~ " type, your template hasn't been " -#~ "initiated. To access the Upload button," -#~ " you'll need to download the template" -#~ " first." -#~ msgstr "" - -#~ msgid "" -#~ "1. Passwords must contain characters " -#~ "from at least 3 of the following" -#~ " 4 classes:\n" -#~ " * Upper Case Letters: A, B, C, … Z\n" -#~ " * Lower Case Letters: a, b, c, … z\n" -#~ " * Westernised Arabic Numerals: 0, 1, 2, … 9\n" -#~ " * Special characters: ({}[],.<>;:'\"?/|\\`~!@#$%%^&*()_-+=).\n" -#~ "2. No accented characters are permitted.\n" -#~ "3. All passwords must be at least 8 characters long.\n" -#~ msgstr "" - #~ msgid "this field must not be empty" #~ msgstr "" diff --git a/ckanext/canada/i18n/fr/LC_MESSAGES/ckanext-canada.po b/ckanext/canada/i18n/fr/LC_MESSAGES/ckanext-canada.po index 4e171f4c4..738be411a 100644 --- a/ckanext/canada/i18n/fr/LC_MESSAGES/ckanext-canada.po +++ b/ckanext/canada/i18n/fr/LC_MESSAGES/ckanext-canada.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-09-09 14:43-0400\n" +"POT-Creation-Date: 2024-09-13 10:55-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: fr\n" @@ -422,7 +422,7 @@ msgid "Request Reset" msgstr "Demander une réinitialisation" #: ckanext/canada/strings.py:38 -#: ckanext/canada/templates/user/edit_user_form.html:42 +#: ckanext/canada/templates/user/edit_user_form.html:47 msgid "Create API Token" msgstr "Créer un jeton d’API" @@ -770,11 +770,11 @@ msgstr "Le recombinant resource_name n’a pas été trouvé" #: ckanext/canada/view.py:596 msgid "User {0} not authorized to update resource {1}" -msgstr "Vous n'êtes pas autorisé à supprimer la ressource %s" +msgstr "L'utilisateur {0} n'est pas autorisé à mettre à jour la ressource {1}" #: ckanext/canada/view.py:642 msgid "{num} deleted." -msgstr "Aperçu supprimé." +msgstr "{num} supprimé" #: ckanext/canada/view.py:684 msgid "Number required" @@ -1032,7 +1032,7 @@ msgstr "" #: ckanext/canada/tables/briefingt.yaml:406 #: ckanext/canada/tables/contractsa.yaml:396 #: ckanext/canada/tables/hospitalityq.yaml:606 -#: ckanext/canada/tables/qpnotes.yaml:453 +#: ckanext/canada/tables/qpnotes.yaml:456 #: ckanext/canada/tables/reclassification.yaml:389 #: ckanext/canada/tables/travela.yaml:645 #: ckanext/canada/tables/travelq.yaml:600 @@ -1970,9 +1970,9 @@ msgid "" "Upload button, you'll need to click on the \"Get Started\" " "button." msgstr "" -"Si votre organisation n’a pas encore téléversé de données pour ce type de" -" divulgation proactive, votre modèle n’a pas été initié. Pour accéder au " -"bouton de téléchargement, vous devez d’abord télécharger le modèle." +"Si votre organisation n'a pas encore téléversé de données pour ce type de" +" divulgation proactive, votre modèle n'a pas été initié. Pour accéder au " +"bouton de téléversement, vous devez cliquez sur le bouton « Commencer »." #: ckanext/canada/templates/help.html:102 msgid "Why doesn't all the text I entered in the template appear?" @@ -2527,7 +2527,7 @@ msgstr "Êtes-vous sûr de vouloir supprimer ce membre?" #: ckanext/canada/templates/organization/member_new.html:60 #: ckanext/canada/templates/scheming/package/read.html:26 #: ckanext/canada/templates/scheming/snippets/form_field.html:21 -#: ckanext/canada/templates/user/edit_user_form.html:37 +#: ckanext/canada/templates/user/edit_user_form.html:42 msgid "Delete" msgstr "Supprimer" @@ -2937,7 +2937,7 @@ msgstr "Modifier dans Excel" #: ckanext/canada/templates/package/wet_datatable.html:103 msgid "Delete records" -msgstr "Mettre à jour les données" +msgstr "Supprimer un dossier" #: ckanext/canada/templates/package/snippets/additional_info.html:1 msgid "Additional Info" @@ -3107,8 +3107,12 @@ msgid "" msgid_plural "" "Are you sure you want to delete {num} records? This action cannot be " "undone." -msgstr[0] "Êtes-vous certain de vouloir supprimer cet état?" +msgstr[0] "" +"Souhaitez-vous vraiment supprimer {num} demande? Cette action ne peut pas" +" être annulée." msgstr[1] "" +"Souhaitez-vous vraiment supprimer {num} demandes? Cette action ne peut " +"pas être annulée." #: ckanext/canada/templates/recombinant/create_pd_record.html:3 #: ckanext/canada/templates/recombinant/create_pd_record.html:4 @@ -3641,29 +3645,42 @@ msgid "Change password" msgstr "Changer le mot de passe" #: ckanext/canada/templates/user/edit_user_form.html:22 +#: ckanext/canada/templates/user/perform_reset.html:8 +msgid "password reset requirements" +msgstr "" +"
  1. Les mots de passe doivent contenir des caractères appartenant à " +"au moins 3 des 4 catégories suivantes :
    • Lettres majuscules : " +"A, B, C, … Z
    • Lettres minuscules : a, b, c, … z
    • Chiffres " +"arabes occidentalisés : 0, 1, 2, … 9
    • Caractères spéciaux : " +"({}[],.<>;:'\"?/|\\`~!@#$%%^&*()_-+=).
  2. Les caractères " +"accentués ne sont pas autorisés.
  3. Tous les mots de passe doivent " +"comporter au moins 12 caractères.
  4. Le mot de passe n'égale pas au " +"nom d'utilisateur.
" + +#: ckanext/canada/templates/user/edit_user_form.html:27 msgid "Sysadmin Password" msgstr "Mot de passe administrateur système" -#: ckanext/canada/templates/user/edit_user_form.html:22 +#: ckanext/canada/templates/user/edit_user_form.html:27 msgid "Old Password" msgstr "Ancien mot de passe" -#: ckanext/canada/templates/user/edit_user_form.html:30 +#: ckanext/canada/templates/user/edit_user_form.html:35 #: ckanext/canada/templates/user/new_user_form.html:21 #: ckanext/canada/templates/user/snippets/login_form.html:12 msgid "Password" msgstr "Mot de passe" -#: ckanext/canada/templates/user/edit_user_form.html:31 +#: ckanext/canada/templates/user/edit_user_form.html:36 #: ckanext/canada/templates/user/new_user_form.html:24 msgid "Confirm Password" msgstr "Confirmer le mot de passe" -#: ckanext/canada/templates/user/edit_user_form.html:37 +#: ckanext/canada/templates/user/edit_user_form.html:42 msgid "Are you sure you want to delete this User?" msgstr "Êtes-vous sûr de vouloir supprimer cet utilisateur?" -#: ckanext/canada/templates/user/edit_user_form.html:45 +#: ckanext/canada/templates/user/edit_user_form.html:50 msgid "Update Profile" msgstr "Mettre à jour le profil" @@ -3707,56 +3724,78 @@ msgstr "" "registre ou pour signaler des erreurs, communiquez avec open-ouvert@tbs-" "sct.gc.ca.

" -#: ckanext/canada/templates/user/login.html:11 +#: ckanext/canada/templates/user/login.html:7 +msgid "password reset alert" +msgstr "" +"
Nouvelles exigences en " +"matière de sécurité des mots de passe

Le registre du " +"gouvernement ouvert applique désormais de nouvelles exigences en matière " +"de mots de passe afin d'assurer la conformité aux meilleures pratiques " +"décrites dans le guide des mots de passe du gouvernement du Canada " +":

  • La longueur minimale est de 12 caractères
  • Doit être " +"composé d'au moins trois des caractères suivants : majuscules, " +"minuscules, chiffres, ponctuation et caractères spéciaux
  • Le mot " +"de passe n'égale pas au nom d'utilisateur

Les utilisateurs " +"dont les mots de passe ne répondent pas aux nouvelles exigences peuvent " +"les mettre à jour dans section Modifier le mot de passe dans la " +"page Mon profil ou en utilisant la fonction de réinitialisation du mot de " +"passe.

Remarque : si les mots de passe ne sont" +" pas mis à jour avant la fin de l'année 2024, nous mettrons en œuvre un " +"processus obligeant les utilisateurs à modifier leur mot de passe pour " +"répondre aux nouvelles exigences avant de pouvoir accéder au " +"registre.

" + +#: ckanext/canada/templates/user/login.html:12 msgid "NOTE: Username and password are case sensitive." msgstr "NOTE: Le nom d’utilisateur et mot de passe sont sensibles à la casse." -#: ckanext/canada/templates/user/login.html:23 +#: ckanext/canada/templates/user/login.html:24 msgid "Need an account" msgstr "Besoin d’un compte" -#: ckanext/canada/templates/user/login.html:26 +#: ckanext/canada/templates/user/login.html:27 msgid "Then sign right up, it only takes a minute" msgstr "Inscrivez-vous maintenant, cela ne prend qu’une minute" -#: ckanext/canada/templates/user/login.html:28 +#: ckanext/canada/templates/user/login.html:29 #: ckanext/canada/templates/user/new.html:5 msgid "Request an Account" msgstr "Demande d’un compte" -#: ckanext/canada/templates/user/login.html:34 +#: ckanext/canada/templates/user/login.html:35 msgid "Forgotten your password?" msgstr "Réinitialiser le mot de passe" -#: ckanext/canada/templates/user/login.html:36 +#: ckanext/canada/templates/user/login.html:37 msgid "No problem, use our password recovery form to reset it" msgstr "" "Utilisez notre formulaire de récupération de mot de passe pour rétablir " "votre identité" -#: ckanext/canada/templates/user/login.html:38 +#: ckanext/canada/templates/user/login.html:39 msgid "Reset password" msgstr "Réinitialiser le mot de passe" -#: ckanext/canada/templates/user/login.html:46 +#: ckanext/canada/templates/user/login.html:47 msgid "Forgotten your username?" msgstr "Vous avez oublié votre nom d'utilisateur ?" -#: ckanext/canada/templates/user/login.html:49 +#: ckanext/canada/templates/user/login.html:50 msgid "No problem, use our username recovery form to recover it" msgstr "" "Pas de problème, utilisez notre formulaire de récupération du nom " "d'utilisateur pour le récupérer" -#: ckanext/canada/templates/user/login.html:51 +#: ckanext/canada/templates/user/login.html:52 msgid "Recover username" msgstr "Récupérer le nom d'utilisateur" -#: ckanext/canada/templates/user/login.html:66 +#: ckanext/canada/templates/user/login.html:67 msgid " Create an Account" msgstr "Créer un compte" -#: ckanext/canada/templates/user/login.html:76 +#: ckanext/canada/templates/user/login.html:77 msgid "Forgot your password?" msgstr "Réinitialiser le mot de passe" @@ -4033,25 +4072,6 @@ msgstr "J’accepte" msgid "I do not agree" msgstr "Je n’accepte pas" -#: ckanext/canada/templates/user/perform_reset.html:9 -#, python-format -msgid "" -"1. Passwords must contain characters from at least 3 of the following 4 " -"classes:\n" -" * Upper Case Letters: A, B, C, … Z\n" -" * Lower Case Letters: a, b, c, … z\n" -" * Westernised Arabic Numerals: 0, 1, 2, … 9\n" -" * Special characters: ({}[],.<>;:'\"?/|\\`~!@#$%%^&*()_-+=).\n" -"2. No accented characters are permitted.\n" -"3. All passwords must be at least 12 characters long.\n" -msgstr "" -"1. Les mots de passe doivent contenir des caractères appartenant à au " -"moins 3 des 4 catégories suivantes : * Lettres majuscules : A, B, C, … Z " -"* Lettres minuscules : a, b, c, … z * Chiffres arabes occidentalisés : 0," -" 1, 2, … 9 * Caractères spéciaux : ({}[],.<>;:'\"?/|\\`~!@#$%%^&*()_-+=)." -" 2. Les caractères accentués ne sont pas autorisés. 3. Tous les mots de " -"passe doivent comporter au moins 12 caractères." - #: ckanext/canada/templates/user/read_base.html:14 msgid "Edit User" msgstr "Modifier l’utilisateur" diff --git a/ckanext/canada/templates/user/edit_user_form.html b/ckanext/canada/templates/user/edit_user_form.html index 9c98d90b9..a654b9b20 100644 --- a/ckanext/canada/templates/user/edit_user_form.html +++ b/ckanext/canada/templates/user/edit_user_form.html @@ -3,7 +3,7 @@
{{ form.errors(error_summary) }}
- {{ _('Change details') }} + {{ _('Change details') }} {{ form.input('name', label=_('Username'), id='field-username', value=data.name, error=errors.name, classes=['control-medium'], attrs={'readonly': '', 'class': 'form-control'}) }} {{ form.input('fullname', label=_('Full name'), id='field-fullname', value=data.fullname, error=errors.fullname, placeholder=_('eg. Joe Bloggs'), classes=['control-medium']) }} {{ form.input('email', label=_('Email'), id='field-email', type='email', value=data.email, error=errors.email, placeholder=_('eg. joe@example.com'), classes=['control-medium'], is_required=true) }} @@ -16,7 +16,12 @@ {% endif %}
- {{ _('Change password') }} + {{ _('Change password') }} + +
+

{% trans %}password reset requirements{% endtrans %}

+
+ {{ form.input('old_password', type='password', label=_('Sysadmin Password') if is_sysadmin and not is_myself else _('Old Password'), diff --git a/ckanext/canada/templates/user/login.html b/ckanext/canada/templates/user/login.html index fdf3e44d8..d5aee8a41 100644 --- a/ckanext/canada/templates/user/login.html +++ b/ckanext/canada/templates/user/login.html @@ -4,6 +4,7 @@ {% if g.is_registry %}
{% trans %}login welcome text{% endtrans %} + {% trans %}password reset alert{% endtrans %} {% block form %} {{ super() }} {% endblock %} diff --git a/ckanext/canada/templates/user/perform_reset.html b/ckanext/canada/templates/user/perform_reset.html index 536560513..42159290f 100644 --- a/ckanext/canada/templates/user/perform_reset.html +++ b/ckanext/canada/templates/user/perform_reset.html @@ -5,16 +5,7 @@
-

- {{ h.render_markdown(_( - '1. Passwords must contain characters from at least 3 of the following 4 classes:\n' - ' * Upper Case Letters: A, B, C, … Z\n' - ' * Lower Case Letters: a, b, c, … z\n' - ' * Westernised Arabic Numerals: 0, 1, 2, … 9\n' - ' * Special characters: ({}[],.<>;:\'"?/|\\`~!@#$%%^&*()_-+=).\n' - '2. No accented characters are permitted.\n' - '3. All passwords must be at least 12 characters long.\n')) }} -

+

{% trans %}password reset requirements{% endtrans %}

{% block primary_content_inner %}