diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 489e64cd..a4852919 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-11 11:44+0100\n" +"POT-Creation-Date: 2020-03-14 17:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,9 +23,10 @@ msgid "activity" msgstr "" #: apps/activity/models.py:19 apps/activity/models.py:44 -#: apps/member/models.py:60 apps/member/models.py:111 +#: apps/member/models.py:61 apps/member/models.py:112 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 -#: apps/note/models/transactions.py:44 templates/member/profile_detail.html:15 +#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:184 +#: templates/member/profile_detail.html:15 msgid "name" msgstr "" @@ -86,7 +87,7 @@ msgstr "" msgid "API" msgstr "" -#: apps/logs/apps.py:10 +#: apps/logs/apps.py:11 msgid "Logs" msgstr "" @@ -166,73 +167,73 @@ msgstr "" msgid "user profile" msgstr "" -#: apps/member/models.py:65 +#: apps/member/models.py:66 msgid "email" msgstr "" -#: apps/member/models.py:70 +#: apps/member/models.py:71 msgid "membership fee" msgstr "" -#: apps/member/models.py:74 +#: apps/member/models.py:75 msgid "membership duration" msgstr "" -#: apps/member/models.py:75 +#: apps/member/models.py:76 msgid "The longest time a membership can last (NULL = infinite)." msgstr "" -#: apps/member/models.py:80 +#: apps/member/models.py:81 msgid "membership start" msgstr "" -#: apps/member/models.py:81 +#: apps/member/models.py:82 msgid "How long after January 1st the members can renew their membership." msgstr "" -#: apps/member/models.py:86 +#: apps/member/models.py:87 msgid "membership end" msgstr "" -#: apps/member/models.py:87 +#: apps/member/models.py:88 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." msgstr "" -#: apps/member/models.py:93 apps/note/models/notes.py:139 +#: apps/member/models.py:94 apps/note/models/notes.py:139 msgid "club" msgstr "" -#: apps/member/models.py:94 +#: apps/member/models.py:95 msgid "clubs" msgstr "" -#: apps/member/models.py:117 +#: apps/member/models.py:118 msgid "role" msgstr "" -#: apps/member/models.py:118 +#: apps/member/models.py:119 msgid "roles" msgstr "" -#: apps/member/models.py:142 +#: apps/member/models.py:143 msgid "membership starts on" msgstr "" -#: apps/member/models.py:145 +#: apps/member/models.py:146 msgid "membership ends on" msgstr "" -#: apps/member/models.py:149 +#: apps/member/models.py:150 msgid "fee" msgstr "" -#: apps/member/models.py:153 +#: apps/member/models.py:154 msgid "membership" msgstr "" -#: apps/member/models.py:154 +#: apps/member/models.py:155 msgid "memberships" msgstr "" @@ -278,10 +279,6 @@ msgstr "" msgid "Maximal size: 2MB" msgstr "" -#: apps/note/forms.py:70 -msgid "Source and destination must be different." -msgstr "" - #: apps/note/models/notes.py:27 msgid "account balance" msgstr "" @@ -374,15 +371,15 @@ msgstr "" msgid "aliases" msgstr "" -#: apps/note/models/notes.py:229 +#: apps/note/models/notes.py:233 msgid "Alias is too long." msgstr "" -#: apps/note/models/notes.py:234 +#: apps/note/models/notes.py:238 msgid "An alias with a similar name already exists: {} " msgstr "" -#: apps/note/models/notes.py:243 +#: apps/note/models/notes.py:247 msgid "You can't delete your main alias." msgstr "" @@ -434,23 +431,31 @@ msgstr "" msgid "transactions" msgstr "" -#: apps/note/models/transactions.py:185 +#: apps/note/models/transactions.py:189 +msgid "first_name" +msgstr "" + +#: apps/note/models/transactions.py:194 +msgid "bank" +msgstr "" + +#: apps/note/models/transactions.py:211 msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:186 +#: apps/note/models/transactions.py:212 msgid "membership transactions" msgstr "" -#: apps/note/views.py:29 +#: apps/note/views.py:31 msgid "Transfer money" msgstr "" -#: apps/note/views.py:139 -msgid "Consommations" +#: apps/note/views.py:129 templates/base.html:71 +msgid "Consumptions" msgstr "" -#: note_kfet/settings/__init__.py:63 +#: note_kfet/settings/__init__.py:61 msgid "" "The Central Authentication Service grants you access to most of our websites " "by authenticating only once, so you don't need to type your credentials " @@ -473,23 +478,20 @@ msgstr "" msgid "The ENS Paris-Saclay BDE note." msgstr "" -#: templates/base.html:70 -msgid "Consumptions" -msgstr "" - -#: templates/base.html:73 +#: templates/base.html:74 msgid "Clubs" msgstr "" -#: templates/base.html:76 +#: templates/base.html:77 msgid "Activities" msgstr "" -#: templates/base.html:79 -msgid "Button" +#: templates/base.html:80 +msgid "Buttons" msgstr "" -#: templates/base.html:82 templates/note/transaction_form.html:35 +#: templates/base.html:83 templates/note/transaction_form.html:19 +#: templates/note/transaction_form.html:126 msgid "Transfer" msgstr "" @@ -549,6 +551,7 @@ msgid "Field filters" msgstr "" #: templates/django_filters/rest_framework/form.html:5 +#: templates/member/club_form.html:10 msgid "Submit" msgstr "" @@ -572,6 +575,14 @@ msgstr "" msgid "Transaction history" msgstr "" +#: templates/member/club_form.html:6 +msgid "Clubs list" +msgstr "" + +#: templates/member/club_list.html:8 +msgid "New club" +msgstr "" + #: templates/member/manage_auth_tokens.html:16 msgid "Token" msgstr "" @@ -620,8 +631,99 @@ msgstr "" msgid "Save Changes" msgstr "" +#: templates/member/signup.html:5 templates/member/signup.html:8 #: templates/member/signup.html:14 -msgid "Sign Up" +msgid "Sign up" +msgstr "" + +#: templates/note/conso_form.html:28 templates/note/transaction_form.html:38 +msgid "Select emitters" +msgstr "" + +#: templates/note/conso_form.html:45 +msgid "Select consumptions" +msgstr "" + +#: templates/note/conso_form.html:50 +msgid "Consume!" +msgstr "" + +#: templates/note/conso_form.html:62 +msgid "The most used buttons will display here." +msgstr "" + +#: templates/note/conso_form.html:107 +msgid "Edit" +msgstr "" + +#: templates/note/conso_form.html:112 +msgid "Single consumptions" +msgstr "" + +#: templates/note/conso_form.html:116 +msgid "Double consumptions" +msgstr "" + +#: templates/note/conso_form.html:127 +msgid "Recent transactions history" +msgstr "" + +#: templates/note/transaction_form.html:15 +msgid "Gift" +msgstr "" + +#: templates/note/transaction_form.html:23 +msgid "Credit" +msgstr "" + +#: templates/note/transaction_form.html:27 +msgid "Debit" +msgstr "" + +#: templates/note/transaction_form.html:55 +msgid "External payment" +msgstr "" + +#: templates/note/transaction_form.html:63 +msgid "Transfer type" +msgstr "" + +#: templates/note/transaction_form.html:73 +msgid "Name" +msgstr "" + +#: templates/note/transaction_form.html:79 +msgid "First name" +msgstr "" + +#: templates/note/transaction_form.html:85 +msgid "Bank" +msgstr "" + +#: templates/note/transaction_form.html:97 +#: templates/note/transaction_form.html:179 +#: templates/note/transaction_form.html:186 +msgid "Select receivers" +msgstr "" + +#: templates/note/transaction_form.html:114 +msgid "Amount" +msgstr "" + +#: templates/note/transaction_form.html:119 +msgid "Reason" +msgstr "" + +#: templates/note/transaction_form.html:193 +msgid "Credit note" +msgstr "" + +#: templates/note/transaction_form.html:200 +msgid "Debit note" +msgstr "" + +#: templates/note/transactiontemplate_form.html:6 +msgid "Buttons list" msgstr "" #: templates/registration/logged_out.html:8 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 695a789b..99e1a6f1 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-11 11:44+0100\n" +"POT-Creation-Date: 2020-03-14 17:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,9 +18,10 @@ msgid "activity" msgstr "activité" #: apps/activity/models.py:19 apps/activity/models.py:44 -#: apps/member/models.py:60 apps/member/models.py:111 +#: apps/member/models.py:61 apps/member/models.py:112 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:24 -#: apps/note/models/transactions.py:44 templates/member/profile_detail.html:15 +#: apps/note/models/transactions.py:44 apps/note/models/transactions.py:184 +#: templates/member/profile_detail.html:15 msgid "name" msgstr "nom" @@ -81,7 +82,7 @@ msgstr "invités" msgid "API" msgstr "" -#: apps/logs/apps.py:10 +#: apps/logs/apps.py:11 msgid "Logs" msgstr "" @@ -161,37 +162,37 @@ msgstr "payé" msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:65 +#: apps/member/models.py:66 msgid "email" msgstr "courriel" -#: apps/member/models.py:70 +#: apps/member/models.py:71 msgid "membership fee" msgstr "cotisation pour adhérer" -#: apps/member/models.py:74 +#: apps/member/models.py:75 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:75 +#: apps/member/models.py:76 msgid "The longest time a membership can last (NULL = infinite)." msgstr "La durée maximale d'une adhésion (NULL = infinie)." -#: apps/member/models.py:80 +#: apps/member/models.py:81 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:81 +#: apps/member/models.py:82 msgid "How long after January 1st the members can renew their membership." msgstr "" "Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur " "adhésion." -#: apps/member/models.py:86 +#: apps/member/models.py:87 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:87 +#: apps/member/models.py:88 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." @@ -199,45 +200,39 @@ msgstr "" "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " "suivante avant que les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:93 apps/note/models/notes.py:139 +#: apps/member/models.py:94 apps/note/models/notes.py:139 msgid "club" msgstr "club" -msgid "New club" -msgstr "Nouveau club" - -msgid "Clubs list" -msgstr "Liste des clubs" - -#: apps/member/models.py:94 +#: apps/member/models.py:95 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:117 +#: apps/member/models.py:118 msgid "role" msgstr "rôle" -#: apps/member/models.py:118 +#: apps/member/models.py:119 msgid "roles" msgstr "rôles" -#: apps/member/models.py:142 +#: apps/member/models.py:143 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:145 +#: apps/member/models.py:146 msgid "membership ends on" msgstr "l'adhésion finie le" -#: apps/member/models.py:149 +#: apps/member/models.py:150 msgid "fee" msgstr "cotisation" -#: apps/member/models.py:153 +#: apps/member/models.py:154 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:154 +#: apps/member/models.py:155 msgid "memberships" msgstr "adhésions" @@ -283,10 +278,6 @@ msgstr "Choisissez une image" msgid "Maximal size: 2MB" msgstr "Taille maximale : 2 Mo" -#: apps/note/forms.py:70 -msgid "Source and destination must be different." -msgstr "La source et la destination doivent être différentes." - #: apps/note/models/notes.py:27 msgid "account balance" msgstr "solde du compte" @@ -380,15 +371,15 @@ msgstr "alias" msgid "aliases" msgstr "alias" -#: apps/note/models/notes.py:229 +#: apps/note/models/notes.py:233 msgid "Alias is too long." msgstr "L'alias est trop long." -#: apps/note/models/notes.py:234 +#: apps/note/models/notes.py:238 msgid "An alias with a similar name already exists: {} " msgstr "Un alias avec un nom similaire existe déjà : {}" -#: apps/note/models/notes.py:243 +#: apps/note/models/notes.py:247 msgid "You can't delete your main alias." msgstr "Vous ne pouvez pas supprimer votre alias principal." @@ -408,10 +399,6 @@ msgstr "Un modèle de transaction avec un nom similaire existe déjà." msgid "amount" msgstr "montant" -#: apps/note/models/transactions.py:56 apps/note/models/transactions.py:109 -msgid "Amount" -msgstr "Montant" - #: apps/note/models/transactions.py:57 msgid "in centimes" msgstr "en centimes" @@ -432,9 +419,6 @@ msgstr "quantité" msgid "reason" msgstr "raison" -msgid "Reason" -msgstr "Raison" - #: apps/note/models/transactions.py:115 msgid "valid" msgstr "valide" @@ -447,19 +431,31 @@ msgstr "transaction" msgid "transactions" msgstr "transactions" -#: apps/note/models/transactions.py:185 +#: apps/note/models/transactions.py:189 +msgid "first_name" +msgstr "" + +#: apps/note/models/transactions.py:194 +msgid "bank" +msgstr "" + +#: apps/note/models/transactions.py:211 msgid "membership transaction" msgstr "transaction d'adhésion" -#: apps/note/models/transactions.py:186 +#: apps/note/models/transactions.py:212 msgid "membership transactions" msgstr "transactions d'adhésion" -#: apps/note/views.py:29 +#: apps/note/views.py:31 msgid "Transfer money" msgstr "Transferts d'argent" -#: note_kfet/settings/__init__.py:63 +#: apps/note/views.py:129 templates/base.html:71 +msgid "Consumptions" +msgstr "Consommations" + +#: note_kfet/settings/__init__.py:61 msgid "" "The Central Authentication Service grants you access to most of our websites " "by authenticating only once, so you don't need to type your credentials " @@ -482,26 +478,20 @@ msgstr "" msgid "The ENS Paris-Saclay BDE note." msgstr "La note du BDE de l'ENS Paris-Saclay." -#: templates/base.html:70 -msgid "Consumptions" -msgstr "Consommations" - -#: templates/base.html:73 +#: templates/base.html:74 msgid "Clubs" msgstr "Clubs" -#: templates/base.html:76 +#: templates/base.html:77 msgid "Activities" msgstr "Activités" -#: templates/base.html:79 +#: templates/base.html:80 msgid "Buttons" msgstr "Boutons" -msgid "Buttons list" -msgstr "Liste des boutons" - -#: templates/base.html:82 templates/note/transaction_form.html:35 +#: templates/base.html:83 templates/note/transaction_form.html:19 +#: templates/note/transaction_form.html:126 msgid "Transfer" msgstr "Virement" @@ -563,6 +553,7 @@ msgid "Field filters" msgstr "" #: templates/django_filters/rest_framework/form.html:5 +#: templates/member/club_form.html:10 msgid "Submit" msgstr "" @@ -586,6 +577,14 @@ msgstr "solde du compte" msgid "Transaction history" msgstr "Historique des transactions" +#: templates/member/club_form.html:6 +msgid "Clubs list" +msgstr "Liste des clubs" + +#: templates/member/club_list.html:8 +msgid "New club" +msgstr "Nouveau club" + #: templates/member/manage_auth_tokens.html:16 msgid "Token" msgstr "Jeton" @@ -634,11 +633,102 @@ msgstr "Voir mes adhésions" msgid "Save Changes" msgstr "Sauvegarder les changements" -#: templates/member/signup.html:8 +#: templates/member/signup.html:5 templates/member/signup.html:8 #: templates/member/signup.html:14 msgid "Sign up" msgstr "Inscription" +#: templates/note/conso_form.html:28 templates/note/transaction_form.html:38 +msgid "Select emitters" +msgstr "Sélection des émetteurs" + +#: templates/note/conso_form.html:45 +msgid "Select consumptions" +msgstr "Consommations" + +#: templates/note/conso_form.html:50 +msgid "Consume!" +msgstr "Consommer !" + +#: templates/note/conso_form.html:62 +msgid "The most used buttons will display here." +msgstr "Les boutons les plus utilisés apparaîtront ici." + +#: templates/note/conso_form.html:107 +msgid "Edit" +msgstr "Éditer" + +#: templates/note/conso_form.html:112 +#| msgid "Consumptions" +msgid "Single consumptions" +msgstr "Consos simples" + +#: templates/note/conso_form.html:116 +msgid "Double consumptions" +msgstr "Consos doubles" + +#: templates/note/conso_form.html:127 +msgid "Recent transactions history" +msgstr "Historique des transactions récentes" + +#: templates/note/transaction_form.html:15 +msgid "Gift" +msgstr "Don" + +#: templates/note/transaction_form.html:23 +msgid "Credit" +msgstr "Crédit" + +#: templates/note/transaction_form.html:27 +msgid "Debit" +msgstr "Retrait" + +#: templates/note/transaction_form.html:55 +msgid "External payment" +msgstr "Paiement extérieur" + +#: templates/note/transaction_form.html:63 +msgid "Transfer type" +msgstr "Type de transfert" + +#: templates/note/transaction_form.html:73 +msgid "Name" +msgstr "Nom" + +#: templates/note/transaction_form.html:79 +msgid "First name" +msgstr "Prénom" + +#: templates/note/transaction_form.html:85 +msgid "Bank" +msgstr "Banque" + +#: templates/note/transaction_form.html:97 +#: templates/note/transaction_form.html:179 +#: templates/note/transaction_form.html:186 +msgid "Select receivers" +msgstr "Sélection des destinataires" + +#: templates/note/transaction_form.html:114 +msgid "Amount" +msgstr "Montant" + +#: templates/note/transaction_form.html:119 +msgid "Reason" +msgstr "Raison" + +#: templates/note/transaction_form.html:193 +msgid "Credit note" +msgstr "Note à créditer" + +#: templates/note/transaction_form.html:200 +msgid "Debit note" +msgstr "Note à débiter" + +#: templates/note/transactiontemplate_form.html:6 +msgid "Buttons list" +msgstr "Liste des boutons" + #: templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" diff --git a/templates/note/conso_form.html b/templates/note/conso_form.html index 596b3d82..94185c16 100644 --- a/templates/note/conso_form.html +++ b/templates/note/conso_form.html @@ -25,7 +25,7 @@

- Sélection des émetteurs + {% trans "Select emitters" %}

    @@ -42,12 +42,14 @@

    - Sélection des consommations + {% trans "Select consumptions" %}

    - +
@@ -59,7 +61,7 @@

- Les boutons les plus utilisés s'afficheront ici. + {% trans "The most used buttons will display here." %}

@@ -104,16 +106,16 @@ {# Mode switch #}
- Éditer + {% trans "Edit" %}
@@ -124,7 +126,7 @@

- Historique des transactions récentes + {% trans "Recent transactions history" %}

{% render_table table %} diff --git a/templates/note/transaction_form.html b/templates/note/transaction_form.html index c6f3cd9b..a2eae32d 100644 --- a/templates/note/transaction_form.html +++ b/templates/note/transaction_form.html @@ -12,19 +12,19 @@ SPDX-License-Identifier: GPL-2.0-or-later
@@ -35,7 +35,7 @@ SPDX-License-Identifier: GPL-2.0-or-later

- Sélection des émetteurs + {% trans "Select emitters" %}

    @@ -52,7 +52,7 @@ SPDX-License-Identifier: GPL-2.0-or-later

    - Paiement externe + {% trans "External payment" %}

      @@ -60,7 +60,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
      - +
      - +
      - +
      @@ -94,7 +94,7 @@ SPDX-License-Identifier: GPL-2.0-or-later

      - Sélection des destinataires + {% trans "Select receivers" %}

        @@ -176,28 +176,28 @@ SPDX-License-Identifier: GPL-2.0-or-later $("#emitters_div").hide(); $("#external_div").hide(); $("#dests_div").attr('class', 'col-md-12'); - $("#dest_title").text("Sélection des destinataires"); + $("#dest_title").text("{% trans "Select receivers" %}"); }); $("#type_transfer").click(function() { $("#emitters_div").show(); $("#external_div").hide(); $("#dests_div").attr('class', 'col-md-6'); - $("#dest_title").text("Sélection des destinataires"); + $("#dest_title").text("{% trans "Select receivers" %}"); }); $("#type_credit").click(function() { $("#emitters_div").hide(); $("#external_div").show(); $("#dests_div").attr('class', 'col-md-6'); - $("#dest_title").text("Note à créditer"); + $("#dest_title").text("{% trans "Credit note" %}"); }); $("#type_debit").click(function() { $("#emitters_div").hide(); $("#external_div").show(); $("#dests_div").attr('class', 'col-md-6'); - $("#dest_title").text("Note à prélever"); + $("#dest_title").text("{% trans "Debit note" %}"); }); $("#transfer").click(function() {