From 4408890ab2e7884591cf6d127aa1a229c53e60f3 Mon Sep 17 00:00:00 2001 From: Skia Date: Wed, 27 Jul 2016 00:13:20 +0200 Subject: [PATCH] Templating and translation --- counter/templates/counter/user_account.jinja | 6 + locale/fr/LC_MESSAGES/django.mo | Bin 17589 -> 18262 bytes locale/fr/LC_MESSAGES/django.po | 136 +++++++++++++------ 3 files changed, 103 insertions(+), 39 deletions(-) diff --git a/counter/templates/counter/user_account.jinja b/counter/templates/counter/user_account.jinja index 6c671aa8..02283eb3 100644 --- a/counter/templates/counter/user_account.jinja +++ b/counter/templates/counter/user_account.jinja @@ -7,6 +7,7 @@ {% block infos %}

{% trans %}User account{% endtrans %}

{% trans %}Amount: {% endtrans %}{{ customer.amount }} €

+{% if customer.refillings.exists() %}

{% trans %}Refillings{% endtrans %}

@@ -26,6 +27,8 @@ {% endfor %}
+{% endif %} +{% if customer.buyings.exists() %}

{% trans %}Buyings{% endtrans %}

@@ -49,6 +52,8 @@ {% endfor %}
+{% endif %} +{% if customer.user.invoices.exists() %}

{% trans %}Invoices{% endtrans %}

@@ -74,6 +79,7 @@ {% endfor %}
+{% endif %} {% endblock %} diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index ac491fbd566d5dab9f23d5251b75fa7c7d40f796..49bfa416bd521d84c5043f1b9d7d582dfea436da 100644 GIT binary patch delta 6581 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 delta 5929 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\n" "Language-Team: AE info \n" @@ -56,7 +56,7 @@ msgid "number" msgstr "numéro" #: accounting/models.py:137 core/models.py:462 counter/models.py:167 -#: counter/models.py:195 eboutic/models.py:13 eboutic/models.py:26 +#: counter/models.py:195 eboutic/models.py:13 eboutic/models.py:46 msgid "date" msgstr "date" @@ -68,7 +68,7 @@ msgstr "intitulé" msgid "remark" msgstr "remarque" -#: accounting/models.py:140 counter/models.py:168 eboutic/models.py:28 +#: accounting/models.py:140 counter/models.py:168 eboutic/models.py:48 #: subscription/models.py:34 msgid "payment method" msgstr "méthode de paiement" @@ -201,6 +201,8 @@ msgstr "Fin" #: accounting/templates/accounting/club_account_details.jinja:20 #: accounting/templates/accounting/journal_details.jinja:23 +#: counter/templates/counter/user_account.jinja:17 +#: counter/templates/counter/user_account.jinja:63 msgid "Amount" msgstr "Montant" @@ -254,6 +256,9 @@ msgid "Nb" msgstr "No" #: accounting/templates/accounting/journal_details.jinja:21 +#: counter/templates/counter/user_account.jinja:15 +#: counter/templates/counter/user_account.jinja:36 +#: counter/templates/counter/user_account.jinja:61 msgid "Date" msgstr "Date" @@ -305,7 +310,7 @@ msgstr "Adresse" msgid "You can not make loops in clubs" msgstr "Vous ne pouvez pas faire de boucles dans les clubs" -#: club/models.py:107 eboutic/models.py:12 eboutic/models.py:25 +#: club/models.py:107 eboutic/models.py:12 eboutic/models.py:45 msgid "user" msgstr "nom d'utilisateur" @@ -369,7 +374,8 @@ msgstr "Sauver" msgid "Edit club properties" msgstr "Éditer les propriétés du club" -#: club/templates/club/club_list.jinja:4 club/templates/club/club_list.jinja:24 +#: club/templates/club/club_list.jinja:4 +#: club/templates/club/club_list.jinja:24 msgid "Club list" msgstr "Liste des clubs" @@ -547,7 +553,7 @@ msgstr "Utilisateurs" #: core/templates/core/base.jinja:30 msgid "Wiki" -msgstr "" +msgstr "Wiki" #: core/templates/core/base.jinja:31 msgid "Pages" @@ -592,7 +598,8 @@ msgstr "Éditer %(obj)s" msgid "Edit group" msgstr "Éditer le groupe" -#: core/templates/core/group_edit.jinja:9 core/templates/core/user_edit.jinja:8 +#: core/templates/core/group_edit.jinja:9 +#: core/templates/core/user_edit.jinja:8 #: core/templates/core/user_group.jinja:8 msgid "Update" msgstr "Mettre à jour" @@ -921,11 +928,11 @@ msgstr "Eboutic" msgid "bank" msgstr "banque" -#: counter/models.py:191 eboutic/models.py:51 +#: counter/models.py:191 eboutic/models.py:78 msgid "unit price" msgstr "prix unitaire" -#: counter/models.py:192 eboutic/models.py:52 +#: counter/models.py:192 eboutic/models.py:79 msgid "quantity" msgstr "quantité" @@ -966,7 +973,7 @@ msgstr "Panier : " #: counter/templates/counter/counter_click.jinja:58 #: counter/templates/counter/counter_main.jinja:24 -#: eboutic/templates/eboutic/eboutic_main.jinja:31 +#: eboutic/templates/eboutic/eboutic_main.jinja:30 msgid "Total: " msgstr "Total : " @@ -975,7 +982,7 @@ msgid "Finish" msgstr "Terminer" #: counter/templates/counter/counter_click.jinja:69 -#: eboutic/templates/eboutic/eboutic_main.jinja:39 +#: eboutic/templates/eboutic/eboutic_main.jinja:37 msgid "Products: " msgstr "Produits : " @@ -997,6 +1004,7 @@ msgid "There is no counters in this website." msgstr "Il n'y a pas de comptoirs dans ce site web." #: counter/templates/counter/counter_main.jinja:12 +#, python-format msgid "%(counter_name)s counter" msgstr "Comptoir %(counter_name)s" @@ -1041,6 +1049,39 @@ msgstr "Compte de %(user_name)s" msgid "User account" msgstr "Compte utilisateur" +#: counter/templates/counter/user_account.jinja:11 +msgid "Refillings" +msgstr "Rechargements" + +#: counter/templates/counter/user_account.jinja:16 +#: counter/templates/counter/user_account.jinja:37 +msgid "Barman" +msgstr "Barman" + +#: counter/templates/counter/user_account.jinja:32 +msgid "Buyings" +msgstr "Achats" + +#: counter/templates/counter/user_account.jinja:38 +msgid "Product" +msgstr "Produit" + +#: counter/templates/counter/user_account.jinja:39 +msgid "Quantity" +msgstr "Quantité" + +#: counter/templates/counter/user_account.jinja:40 +msgid "Total" +msgstr "Total" + +#: counter/templates/counter/user_account.jinja:57 +msgid "Invoices" +msgstr "Factures" + +#: counter/templates/counter/user_account.jinja:62 +msgid "Items" +msgstr "Articles" + #: counter/views.py:208 msgid "END" msgstr "FIN" @@ -1053,43 +1094,56 @@ msgstr "ANN" msgid "You have not enough money to buy all the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" -#: eboutic/models.py:27 sith/settings.py:231 sith/settings_sample.py:231 +#: eboutic/models.py:47 sith/settings.py:243 sith/settings_sample.py:231 msgid "Credit card" msgstr "Carte banquaire" -#: eboutic/models.py:27 +#: eboutic/models.py:47 msgid "Sith account" msgstr "Compte utilisateur" -#: eboutic/models.py:29 +#: eboutic/models.py:49 msgid "validated" msgstr "validé" -#: eboutic/models.py:40 +#: eboutic/models.py:59 msgid "Invoice already validated" msgstr "Facture déjà validée" -#: eboutic/models.py:50 +#: eboutic/models.py:75 +msgid "product id" +msgstr "ID du produit" + +#: eboutic/models.py:76 msgid "product name" msgstr "nom du produit" -#: eboutic/models.py:61 +#: eboutic/models.py:77 +msgid "product type" +msgstr "type du produit" + +#: eboutic/models.py:88 msgid "basket" msgstr "panier" -#: eboutic/models.py:64 +#: eboutic/models.py:91 msgid "invoice" msgstr "facture" -#: eboutic/templates/eboutic/eboutic_main.jinja:35 +#: eboutic/templates/eboutic/eboutic_main.jinja:33 msgid "Proceed to command" msgstr "Procéder à la commande" -#: eboutic/templates/eboutic/eboutic_makecommand.jinja:29 +#: eboutic/templates/eboutic/eboutic_makecommand.jinja:31 msgid "Pay with credit card" msgstr "Payer avec une carte banquaire" #: eboutic/templates/eboutic/eboutic_makecommand.jinja:34 +msgid "" +"AE account payment disabled because your basket contains refilling items." +msgstr "Paiement par compte AE désactivé parce que votre panier contient des bons de rechargement." + +#: eboutic/templates/eboutic/eboutic_makecommand.jinja:39 msgid "Pay with Sith account" msgstr "Payer avec un compte AE" @@ -1101,79 +1155,83 @@ msgstr "Le paiement a échoué" msgid "Payment successful" msgstr "Le paiement a été effectué" -#: eboutic/views.py:116 -msgid "You have not enough money to buy the basket" +#: eboutic/templates/eboutic/eboutic_payment_result.jinja:12 +msgid "Return to eboutic" +msgstr "Retourner à l'eboutic" + +#: eboutic/views.py:131 +msgid "You do not have enough money to buy the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" -#: sith/settings.py:228 sith/settings.py:235 sith/settings.py:247 +#: sith/settings.py:240 sith/settings.py:247 sith/settings.py:259 #: sith/settings_sample.py:228 sith/settings_sample.py:235 #: sith/settings_sample.py:247 msgid "Check" msgstr "Chèque" -#: sith/settings.py:229 sith/settings.py:236 sith/settings.py:248 +#: sith/settings.py:241 sith/settings.py:248 sith/settings.py:260 #: sith/settings_sample.py:229 sith/settings_sample.py:236 #: sith/settings_sample.py:248 msgid "Cash" msgstr "Espèces" -#: sith/settings.py:230 sith/settings_sample.py:230 +#: sith/settings.py:242 sith/settings_sample.py:230 msgid "Transfert" msgstr "Virement" -#: sith/settings.py:237 sith/settings_sample.py:237 +#: sith/settings.py:249 sith/settings_sample.py:237 msgid "Other" msgstr "Autre" -#: sith/settings.py:261 sith/settings_sample.py:261 +#: sith/settings.py:273 sith/settings_sample.py:261 msgid "One semester" msgstr "Un semestre" -#: sith/settings.py:266 sith/settings_sample.py:266 +#: sith/settings.py:278 sith/settings_sample.py:266 msgid "Two semesters" msgstr "Deux semestres" -#: sith/settings.py:271 sith/settings_sample.py:271 +#: sith/settings.py:283 sith/settings_sample.py:271 msgid "Common core cursus" msgstr "Cursus tronc commun" -#: sith/settings.py:276 sith/settings_sample.py:276 +#: sith/settings.py:288 sith/settings_sample.py:276 msgid "Branch cursus" msgstr "Cursus branche" -#: sith/settings.py:284 sith/settings_sample.py:284 +#: sith/settings.py:296 sith/settings_sample.py:284 msgid "President" msgstr "Président" -#: sith/settings.py:285 sith/settings_sample.py:285 +#: sith/settings.py:297 sith/settings_sample.py:285 msgid "Vice-President" msgstr "Vice-Président" -#: sith/settings.py:286 sith/settings_sample.py:286 +#: sith/settings.py:298 sith/settings_sample.py:286 msgid "Treasurer" msgstr "Trésorier" -#: sith/settings.py:287 sith/settings_sample.py:287 +#: sith/settings.py:299 sith/settings_sample.py:287 msgid "Communication supervisor" msgstr "Responsable com" -#: sith/settings.py:288 sith/settings_sample.py:288 +#: sith/settings.py:300 sith/settings_sample.py:288 msgid "Secretary" msgstr "Secrétaire" -#: sith/settings.py:289 sith/settings_sample.py:289 +#: sith/settings.py:301 sith/settings_sample.py:289 msgid "IT supervisor" msgstr "Responsable info" -#: sith/settings.py:290 sith/settings_sample.py:290 +#: sith/settings.py:302 sith/settings_sample.py:290 msgid "Board member" msgstr "Membre du bureau" -#: sith/settings.py:291 sith/settings_sample.py:291 +#: sith/settings.py:303 sith/settings_sample.py:291 msgid "Active member" msgstr "Membre actif" -#: sith/settings.py:292 sith/settings_sample.py:292 +#: sith/settings.py:304 sith/settings_sample.py:292 msgid "Curious" msgstr "Curieux"