DGNum/kadenios
17
0
Fork 0
Code Issues 12 Pull requests Projects Wiki Activity

Typo & traduction

Browse source
This commit is contained in:
Tom Hubrecht 2021-04-20 10:04:16 +02:00
parent 6d29267ef8
commit 4d46302451
5 changed files with 74 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
elections/forms.py
View file

@ -82,7 +82,7 @@ class OptionForm(forms.ModelForm):
widgets = {"text_fr": forms.TextInput, "text_en": forms.TextInput}
help_texts = {
"abbreviation": _(
"L'abbréviation est optionnelle et sert à identifier plus facilement les "
"L'abréviation est optionnelle et sert à identifier plus facilement les "
"différentes options. Elle est affiché sans espaces et en majuscules."
)
}

20
elections/migrations/0025_alter_option_abbreviation.py Normal file
View file

@ -0,0 +1,20 @@
# Generated by Django 3.2 on 2021-04-20 08:02
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("elections", "0024_alter_option_abbreviation"),
]
operations = [
migrations.AlterField(
model_name="option",
name="abbreviation",
field=models.CharField(
blank=True, max_length=3, verbose_name="abréviation"
),
),
]

2
elections/models.py
View file

@ -137,7 +137,7 @@ class Option(models.Model):
Question, related_name="options", on_delete=models.CASCADE
)
text = TranslatedFieldWithFallback(models.TextField(_("texte"), blank=False))
abbreviation = models.CharField(_("abbréviation"), max_length=3, blank=True)
abbreviation = models.CharField(_("abréviation"), max_length=3, blank=True)
winner = models.BooleanField(_("option gagnante"), default=False)
voters = models.ManyToManyField(

BIN
shared/locale/en/LC_MESSAGES/django.mo
View file

Binary file not shown.

74
shared/locale/en/LC_MESSAGES/django.po
View file

@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-04-17 00:58+0200\n"
"PO-Revision-Date: 2021-04-17 00:58+0200\n"
"POT-Creation-Date: 2021-04-20 10:03+0200\n"
"PO-Revision-Date: 2021-04-20 10:03+0200\n"
"Last-Translator: Test Translator <test@translator>\n"
"Language-Team: \n"
"Language: en\n"
@ -34,21 +34,29 @@ msgstr "Select a .csv file"
msgid "Extension de fichier invalide, il faut un fichier au format CSV."
msgstr "Invalid file extension, a CSV file is required."
#: elections/forms.py:90
#: elections/forms.py:85
msgid ""
"L'abréviation est optionnelle et sert à identifier plus facilement les "
"différentes options. Elle est affiché sans espaces et en majuscules."
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
msgid "Supprimer le vote de {} ({}) ?"
msgstr "Delete the vote of {} ({}) ?"
#: elections/forms.py:95 elections/templates/elections/election_admin.html:176
#: elections/forms.py:101 elections/templates/elections/election_admin.html:176
#: elections/templates/elections/election_admin.html:203
#: elections/templates/elections/election_voters.html:57
msgid "Supprimer"
msgstr "Delete"
#: elections/forms.py:95
#: elections/forms.py:101
msgid "Non"
msgstr "No"
#: elections/forms.py:95
#: elections/forms.py:101
msgid "Oui"
msgstr "Yes"
@ -112,31 +120,35 @@ msgstr "maximal number of votes received"
msgid "texte"
msgstr "text"
#: elections/models.py:141
#: elections/models.py:140
msgid "abréviation"
msgstr "abbreviation"
#: elections/models.py:142
msgid "option gagnante"
msgstr "winning option"
#: elections/models.py:149
#: elections/models.py:150
msgid "nombre de votes reçus"
msgstr "number of votes received"
#: elections/models.py:168
#: elections/models.py:177
msgid "rang de l'option"
msgstr "option's ranking"
#: elections/models.py:184
#: elections/models.py:193
msgid "votes supplémentaires"
msgstr "extra votes"
#: elections/models.py:200
#: elections/models.py:209
msgid "Nom et Prénom"
msgstr "Name and surname"
#: elections/models.py:222 elections/tests/test_models.py:57
#: elections/models.py:231 elections/tests/test_models.py:57
msgid "identifiants spécifiques"
msgstr "dedicated credentials"
#: elections/models.py:226
#: elections/models.py:235
msgid "Peut administrer des élections"
msgstr "Can manage elections"
@ -495,15 +507,33 @@ msgstr "Confirm"
msgid "Annuler"
msgstr "Cancel"
#: elections/templates/elections/vote/rank.html:44
#: elections/templates/elections/vote/rank.html:120
msgid "Classement"
msgstr "Ranking"
#: elections/templates/elections/vote/rank.html:45
#: elections/templates/elections/vote/rank.html:121
#: 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
msgid "Utiliser le formulaire classique"
msgstr "Use the traditional form"
#: elections/templates/elections/vote/rank.html:143
msgid "Utiliser le cliquer-déposer"
msgstr "Use Drag & Drop"
#: elections/templates/elections/vote/rank.html:198
#, python-format
msgid "Rang %(i)s"
msgstr "Rank %(i)s"
#: elections/templates/elections/vote/rank.html:209
msgid "Ajouter un rang"
msgstr "Add an rank"
#: elections/utils.py:206
msgid "Vous devez sélectionnner une option."
msgstr "You must select an option."
@ -520,7 +550,7 @@ msgstr "The maximum ranking is {}."
msgid "Le classement minimal est 1."
msgstr "The minimum ranking is 1."
#: elections/utils.py:342
#: elections/utils.py:346
msgid ""
"Format invalide. Vérifiez que le fichier est bien formé (i.e. chaque ligne "
"de la forme 'login,nom,email')."
@ -528,23 +558,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:356
#: elections/utils.py:360
msgid "La ligne {} n'a pas le bon nombre d'éléments."
msgstr "The line {} has the wrong number of elements."
#: elections/utils.py:361
#: elections/utils.py:365
msgid "Valeur manquante dans la ligne {} : 'login'."
msgstr "Missing value in line {}: 'login'."
#: elections/utils.py:366
#: elections/utils.py:370
msgid "Doublon dans les logins : lignes {} et {}."
msgstr "Duplicate logins: lines {} and {}."
#: elections/utils.py:374
#: elections/utils.py:378
msgid "Valeur manquante dans la ligne {} : 'nom'."
msgstr "Missing value in line {}: 'name'."
#: elections/utils.py:380
#: elections/utils.py:384
msgid "Adresse mail invalide à la ligne {} : '{}'."
msgstr "Invalid e-mail address in line {}: '{}'."
@ -596,7 +626,7 @@ msgstr "Option successfully modified!"
msgid "Option supprimée !"
msgstr "Option deleted!"
#: elections/views.py:557
#: elections/views.py:558
msgid "Votre choix a bien été enregistré !"
msgstr "Your choice has been recorded!"