diff --git a/elections/forms.py b/elections/forms.py index b6bc9fd..abcb364 100644 --- a/elections/forms.py +++ b/elections/forms.py @@ -69,7 +69,7 @@ class UploadVotersForm(forms.Form): class VoterMailForm(forms.Form): - objet = forms.CharField() + objet = forms.CharField(label=_("Objet")) message = forms.CharField(widget=forms.Textarea) diff --git a/shared/locale/en/LC_MESSAGES/django.mo b/shared/locale/en/LC_MESSAGES/django.mo index dc7ee68..0b493d3 100644 Binary files a/shared/locale/en/LC_MESSAGES/django.mo and b/shared/locale/en/LC_MESSAGES/django.mo differ diff --git a/shared/locale/en/LC_MESSAGES/django.po b/shared/locale/en/LC_MESSAGES/django.po index 56bb634..277368d 100644 --- a/shared/locale/en/LC_MESSAGES/django.po +++ b/shared/locale/en/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-20 10:03+0200\n" -"PO-Revision-Date: 2021-04-20 10:03+0200\n" +"POT-Creation-Date: 2021-05-27 00:24+0200\n" +"PO-Revision-Date: 2021-05-27 00:26+0200\n" "Last-Translator: Test Translator \n" "Language-Team: \n" "Language: en\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" +"X-Generator: Poedit 2.4.3\n" #: elections/forms.py:19 msgid "Impossible de faire débuter l'élection dans le passé" @@ -26,15 +26,25 @@ msgstr "Impossible to start the election in the past" msgid "Impossible de terminer l'élection avant de la commencer" msgstr "Impossible to end the election before it starts" -#: elections/forms.py:46 +#: elections/forms.py:30 +msgid "" +"Le mail d'annonce a déjà été envoyé, il n'est pas possible d'ouvrir " +"l'élection à tout le monde" +msgstr "" + +#: elections/forms.py:55 msgid "Sélectionnez un fichier .csv" msgstr "Select a .csv file" -#: elections/forms.py:56 +#: elections/forms.py:65 msgid "Extension de fichier invalide, il faut un fichier au format CSV." msgstr "Invalid file extension, a CSV file is required." -#: elections/forms.py:85 +#: elections/forms.py:72 +msgid "Objet" +msgstr "Subject" + +#: elections/forms.py:94 msgid "" "L'abréviation est optionnelle et sert à identifier plus facilement les " "différentes options. Elle est affiché sans espaces et en majuscules." @@ -42,21 +52,21 @@ msgstr "" "The abbreviation is optional and serves to identify the different options " "more easily. It is displayed without spaces and in capital letters." -#: elections/forms.py:96 +#: elections/forms.py:105 msgid "Supprimer le vote de {} ({}) ?" msgstr "Delete the vote of {} ({}) ?" -#: elections/forms.py:101 elections/templates/elections/election_admin.html:176 -#: elections/templates/elections/election_admin.html:203 +#: elections/forms.py:110 elections/templates/elections/election_admin.html:178 +#: elections/templates/elections/election_admin.html:205 #: elections/templates/elections/election_voters.html:57 msgid "Supprimer" msgstr "Delete" -#: elections/forms.py:101 +#: elections/forms.py:110 msgid "Non" msgstr "No" -#: elections/forms.py:101 +#: elections/forms.py:110 msgid "Oui" msgstr "Yes" @@ -144,11 +154,11 @@ msgstr "extra votes" msgid "Nom et Prénom" msgstr "Name and surname" -#: elections/models.py:231 elections/tests/test_models.py:57 +#: elections/models.py:232 elections/tests/test_models.py:57 msgid "identifiants spécifiques" msgstr "dedicated credentials" -#: elections/models.py:235 +#: elections/models.py:236 msgid "Peut administrer des élections" msgstr "Can manage elections" @@ -208,34 +218,6 @@ msgstr "" msgid "Supprimer un vote" msgstr "Delete a vote" -#: elections/templates/elections/delete_vote.html:23 -#: elections/templates/elections/election_create.html:41 -#: elections/templates/elections/election_update.html:47 -#: elections/templates/elections/option_update.html:29 -#: elections/templates/elections/question_update.html:29 -#: elections/templates/elections/vote.html:40 -#: shared/templates/auth/election_login.html:25 -#: shared/templates/authens/pwd_login.html:25 -#: shared/templates/authens/pwd_reset_confirm.html:25 -#: shared/templates/forms/modal-form.html:23 -msgid "Enregistrer" -msgstr "Save" - -#: elections/templates/elections/delete_vote.html:32 -#: elections/templates/elections/election_ballots.html:18 -#: elections/templates/elections/election_update.html:55 -#: elections/templates/elections/election_voters.html:19 -#: elections/templates/elections/mail_voters.html:43 -#: elections/templates/elections/option_update.html:37 -#: elections/templates/elections/question_update.html:37 -#: elections/templates/elections/upload_voters.html:46 -#: elections/templates/elections/vote.html:49 -#: shared/templates/auth/election_login.html:34 -#: shared/templates/authens/pwd_login.html:34 -#: shared/templates/authens/pwd_reset.html:34 -msgid "Retour" -msgstr "Back" - #: elections/templates/elections/election.html:20 msgid "Votant·e·s" msgstr "Voters" @@ -298,7 +280,7 @@ msgstr "Login with credentials" msgid "Connexion via CAS" msgstr "Login via CAS" -#: elections/templates/elections/election.html:187 +#: elections/templates/elections/election.html:189 msgid "A voté" msgstr "Voted" @@ -311,13 +293,13 @@ msgid "Exporter les votant·e·s" msgstr "Export the list of voters" #: elections/templates/elections/election_admin.html:61 -#: elections/templates/elections/election_admin.html:185 -#: elections/templates/elections/election_admin.html:208 +#: elections/templates/elections/election_admin.html:187 +#: elections/templates/elections/election_admin.html:210 msgid "Modifier" msgstr "Edit" #: elections/templates/elections/election_admin.html:70 -#: elections/templates/elections/upload_voters.html:25 +#: elections/templates/elections/upload_voters.html:27 msgid "Gestion de la liste de votant·e·s" msgstr "Management of the voters' list" @@ -342,16 +324,28 @@ msgstr "De-publish" msgid "Archiver" msgstr "Archive" -#: elections/templates/elections/election_admin.html:251 -#: elections/templates/elections/election_admin.html:262 +#: elections/templates/elections/election_admin.html:253 +#: elections/templates/elections/election_admin.html:264 msgid "Rajouter une option" msgstr "Add an option" -#: elections/templates/elections/election_admin.html:266 -#: elections/templates/elections/election_admin.html:276 +#: elections/templates/elections/election_admin.html:268 +#: elections/templates/elections/election_admin.html:278 msgid "Rajouter une question" msgstr "Add a question" +#: elections/templates/elections/election_ballots.html:18 +#: elections/templates/elections/election_voters.html:19 +#: elections/templates/elections/option_update.html:37 +#: elections/templates/elections/upload_voters.html:48 +#: elections/templates/elections/vote.html:49 +#: shared/templates/auth/election_login.html:34 +#: shared/templates/authens/pwd_login.html:34 +#: shared/templates/authens/pwd_reset.html:34 +#: shared/templates/forms/common-form.html:25 +msgid "Retour" +msgstr "Back" + #: elections/templates/elections/election_ballots.html:26 msgid "Liste des bulletins" msgstr "List of ballots" @@ -360,6 +354,17 @@ msgstr "List of ballots" msgid "Création d'une élection" msgstr "Creating an election" +#: elections/templates/elections/election_create.html:41 +#: elections/templates/elections/option_update.html:29 +#: elections/templates/elections/vote.html:40 +#: shared/templates/auth/create-user.html:23 +#: shared/templates/auth/election_login.html:25 +#: shared/templates/authens/pwd_login.html:25 +#: shared/templates/authens/pwd_reset_confirm.html:25 +#: shared/templates/forms/modal-form.html:23 +msgid "Enregistrer" +msgstr "Save" + #: elections/templates/elections/election_list.html:10 msgid "Liste des élections" msgstr "List of elections" @@ -393,7 +398,7 @@ msgstr "" "your login credentials." #: elections/templates/elections/election_voters.html:54 -#: elections/templates/elections/upload_voters.html:105 +#: elections/templates/elections/upload_voters.html:107 msgid "Nom" msgstr "Name" @@ -427,7 +432,7 @@ msgstr "" "Add the message to be sent to voters between 'Dear {full_name}' and the " "election url." -#: elections/templates/elections/mail_voters.html:34 +#: elections/templates/elections/mail_voters.html:22 msgid "Envoyer" msgstr "Send" @@ -458,11 +463,11 @@ msgstr "" msgid "L'option majoritaire et gagnante est colorée en vert." msgstr "The dominant and winning option is coloured green." -#: elections/templates/elections/upload_voters.html:36 +#: elections/templates/elections/upload_voters.html:38 msgid "Envoyer le mail d'annonce" msgstr "Send the announcement e-mail" -#: elections/templates/elections/upload_voters.html:57 +#: elections/templates/elections/upload_voters.html:59 msgid "" "Importez un fichier au format CSV, avec sur la première colonne le login, " "sur la deuxième, le nom et prénom et enfin l'adresse email sur la troisième. " @@ -474,19 +479,19 @@ msgstr "" "

Login_1,Firstname/Lastname_1,mail_1@thing.test
Login_2,"
 "Firstname/Lastname_2,mail_2@thingy.test
...
" -#: elections/templates/elections/upload_voters.html:83 +#: elections/templates/elections/upload_voters.html:85 msgid "Importer" msgstr "Import" -#: elections/templates/elections/upload_voters.html:96 +#: elections/templates/elections/upload_voters.html:98 msgid "Liste des votant·e·s pour cette élection" msgstr "List of voters for this election" -#: elections/templates/elections/upload_voters.html:104 +#: elections/templates/elections/upload_voters.html:106 msgid "Login" msgstr "Login" -#: elections/templates/elections/upload_voters.html:106 +#: elections/templates/elections/upload_voters.html:108 shared/auth/forms.py:73 msgid "Email" msgstr "E-mail" @@ -507,50 +512,50 @@ msgstr "Confirm" msgid "Annuler" msgstr "Cancel" -#: elections/templates/elections/vote/rank.html:120 +#: elections/templates/elections/vote/rank.html:150 msgid "Classement" msgstr "Ranking" -#: elections/templates/elections/vote/rank.html:121 +#: elections/templates/elections/vote/rank.html:151 #: elections/templates/elections/vote/select.html:24 msgid "Option(s) selectionnée(s)" msgstr "Selected option(s)" -#: elections/templates/elections/vote/rank.html:141 -#: elections/templates/elections/vote/rank.html:188 +#: elections/templates/elections/vote/rank.html:171 +#: elections/templates/elections/vote/rank.html:224 msgid "Utiliser le formulaire classique" msgstr "Use the traditional form" -#: elections/templates/elections/vote/rank.html:143 +#: elections/templates/elections/vote/rank.html:176 msgid "Utiliser le cliquer-déposer" msgstr "Use Drag & Drop" -#: elections/templates/elections/vote/rank.html:198 +#: elections/templates/elections/vote/rank.html:234 #, python-format msgid "Rang %(i)s" msgstr "Rank %(i)s" -#: elections/templates/elections/vote/rank.html:209 +#: elections/templates/elections/vote/rank.html:245 msgid "Ajouter un rang" msgstr "Add an rank" -#: elections/utils.py:206 +#: elections/utils.py:207 msgid "Vous devez sélectionnner une option." msgstr "You must select an option." -#: elections/utils.py:211 +#: elections/utils.py:212 msgid "Vous ne pouvez pas sélectionner plus d'une option." msgstr "You cannot select more than one option." -#: elections/utils.py:228 +#: elections/utils.py:229 msgid "Le classement maximal est {}." msgstr "The maximum ranking is {}." -#: elections/utils.py:232 +#: elections/utils.py:233 msgid "Le classement minimal est 1." msgstr "The minimum ranking is 1." -#: elections/utils.py:346 +#: elections/utils.py:347 msgid "" "Format invalide. Vérifiez que le fichier est bien formé (i.e. chaque ligne " "de la forme 'login,nom,email')." @@ -558,23 +563,23 @@ msgstr "" "Invalid format. Check that the file is properly formed (i.e. each line of " "the form 'login,name,e-mail')." -#: elections/utils.py:360 +#: elections/utils.py:361 msgid "La ligne {} n'a pas le bon nombre d'éléments." msgstr "The line {} has the wrong number of elements." -#: elections/utils.py:365 +#: elections/utils.py:366 msgid "Valeur manquante dans la ligne {} : 'login'." msgstr "Missing value in line {}: 'login'." -#: elections/utils.py:370 +#: elections/utils.py:371 msgid "Doublon dans les logins : lignes {} et {}." msgstr "Duplicate logins: lines {} and {}." -#: elections/utils.py:378 +#: elections/utils.py:379 msgid "Valeur manquante dans la ligne {} : 'nom'." msgstr "Missing value in line {}: 'name'." -#: elections/utils.py:384 +#: elections/utils.py:385 msgid "Adresse mail invalide à la ligne {} : '{}'." msgstr "Invalid e-mail address in line {}: '{}'." @@ -582,51 +587,51 @@ msgstr "Invalid e-mail address in line {}: '{}'." msgid "Élection créée avec succès !" msgstr "Election successfully created!" -#: elections/views.py:133 +#: elections/views.py:130 msgid "Liste de votant·e·s importée avec succès !" msgstr "Voters list successfully imported!" -#: elections/views.py:167 +#: elections/views.py:164 msgid "Mail d'annonce envoyé avec succès !" msgstr "Announcement e-mail sent successfully!" -#: elections/views.py:199 +#: elections/views.py:196 msgid "Élection modifiée avec succès !" msgstr "Election successfully modified!" -#: elections/views.py:269 +#: elections/views.py:279 msgid "Élection dépouillée avec succès !" msgstr "Election successfully counted!" -#: elections/views.py:295 +#: elections/views.py:305 msgid "Élection publiée avec succès !" msgstr "Election successfully published!" -#: elections/views.py:296 +#: elections/views.py:306 msgid "Élection dépubliée avec succès !" msgstr "Election successfully de-published!" -#: elections/views.py:308 +#: elections/views.py:318 msgid "Élection archivée avec succès !" msgstr "Election successfully archived!" -#: elections/views.py:340 +#: elections/views.py:350 msgid "Question modifiée avec succès !" msgstr "Question successfully modified!" -#: elections/views.py:352 +#: elections/views.py:362 msgid "Question supprimée !" msgstr "Question deleted!" -#: elections/views.py:390 +#: elections/views.py:400 msgid "Option modifiée avec succès !" msgstr "Option successfully modified!" -#: elections/views.py:402 +#: elections/views.py:412 msgid "Option supprimée !" msgstr "Option deleted!" -#: elections/views.py:558 +#: elections/views.py:568 msgid "Votre choix a bien été enregistré !" msgstr "Your choice has been recorded!" @@ -638,15 +643,15 @@ msgstr "French" msgid "Anglais" msgstr "English" -#: shared/auth/forms.py:13 +#: shared/auth/forms.py:14 msgid "Identifiant" msgstr "Username" -#: shared/auth/forms.py:15 +#: shared/auth/forms.py:16 msgid "Mot de passe" msgstr "Password" -#: shared/auth/forms.py:50 +#: shared/auth/forms.py:51 msgid "" "Aucun·e électeur·ice avec cet identifiant et mot de passe n'existe pour " "cette élection. Vérifiez que les informations rentrées sont correctes, les " @@ -655,6 +660,10 @@ msgstr "" "No voter with this username and password exists for this election. Check " "that the information entered is correct, the fields are case sensitive." +#: shared/templates/auth/create-user.html:7 +msgid "Créer un compte avec mot de passe" +msgstr "Create a password account" + #: shared/templates/auth/election_login.html:9 #: shared/templates/authens/login_switch.html:33 #: shared/templates/authens/pwd_login.html:9 @@ -682,20 +691,20 @@ msgstr "Password reset" msgid "Envoyer un mail" msgstr "Send an e-mail" -#: shared/templates/base.html:113 +#: shared/templates/base.html:124 msgid "Élections" msgstr "Elections" -#: shared/templates/base.html:125 +#: shared/templates/base.html:136 #, python-format msgid "Connecté·e en tant que %(name)s par %(connection)s" msgstr "Logged in as %(name)s via %(connection)s" -#: shared/templates/base.html:141 +#: shared/templates/base.html:152 msgid "Se connecter" msgstr "Log in" -#: shared/templates/base.html:224 +#: shared/templates/base.html:235 msgid "" "Développé par KDEns. En cas de pépin, contacter KDEns. In case of glitches, contact klub-dev [at] ens [dot] fr." +#: shared/templates/forms/common-form.html:16 +msgid "Enregister" +msgstr "Save" + #: shared/templates/forms/file.html:17 msgid "Choisissez un fichier..." msgstr "Choose a file..."