From 95b22cafe0ef4ada61ce96a4ec71ebe4a8b010b3 Mon Sep 17 00:00:00 2001 From: Skia Date: Thu, 15 Sep 2016 11:51:05 +0200 Subject: [PATCH] Template fixes --- counter/templates/counter/stats.jinja | 6 +- locale/fr/LC_MESSAGES/django.mo | Bin 34434 -> 34736 bytes locale/fr/LC_MESSAGES/django.po | 191 +++++++++++++++----------- 3 files changed, 113 insertions(+), 84 deletions(-) diff --git a/counter/templates/counter/stats.jinja b/counter/templates/counter/stats.jinja index 0907a955..2c1c1995 100644 --- a/counter/templates/counter/stats.jinja +++ b/counter/templates/counter/stats.jinja @@ -31,9 +31,11 @@ {{ customer.user.get_display_name() }} {{ customer.user.promo or '' }} - {% for m in customer.user.membership.filter(club__parent=None, end_date=None).all() %} + {% for m in customer.user.memberships.filter(club__parent=None, end_date=None, + role__gt=settings.SITH_MAXIMUM_FREE_ROLE).all() -%} + {%- if loop.index>1 -%}, {% endif -%} {{ m.club.name }} - {% endfor %} + {%- endfor %} {{ r.selling_sum }} € {{ '%.2f'|format(100 * r.selling_sum / total_sellings) }} diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index ad19e64d45c3517cb718ac337b237786655135e4..27966a4e0e81189247d68abaebb0b6e40b637d4f 100644 GIT binary patch delta 12733 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 UF6y0rc4(;I|I_Q$(Tjus2XLjU+yDRo delta 12479 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 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 9a7137de..2b14d12d 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-13 01:57+0200\n" +"POT-Creation-Date: 2016-09-15 11:21+0200\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Skia \n" "Language-Team: AE info \n" @@ -165,6 +165,7 @@ msgstr "type de cible" #: accounting/models.py:190 club/templates/club/club_members.jinja:8 #: club/templates/club/club_old_members.jinja:8 #: counter/templates/counter/cash_summary_list.jinja:27 +#: counter/templates/counter/stats.jinja:15 #: launderette/templates/launderette/launderette_admin.jinja:44 msgid "User" msgstr "Utilisateur" @@ -173,7 +174,7 @@ msgstr "Utilisateur" msgid "Club" msgstr "Club" -#: accounting/models.py:190 core/views/user.py:161 +#: accounting/models.py:190 core/views/user.py:162 msgid "Account" msgstr "Compte" @@ -181,7 +182,7 @@ msgstr "Compte" msgid "Company" msgstr "Entreprise" -#: accounting/models.py:190 sith/settings.py:277 +#: accounting/models.py:190 sith/settings.py:278 msgid "Other" msgstr "Autre" @@ -305,7 +306,7 @@ msgid "Delete" msgstr "Supprimer" #: accounting/templates/accounting/bank_account_details.jinja:17 -#: club/views.py:30 core/views/user.py:128 +#: club/views.py:30 core/views/user.py:129 msgid "Infos" msgstr "Infos" @@ -326,10 +327,10 @@ msgstr "Nouveau compte club" #: accounting/templates/accounting/club_account_details.jinja:53 #: accounting/templates/accounting/journal_details.jinja:66 club/views.py:52 #: core/templates/core/file.jinja:38 core/templates/core/page.jinja:31 -#: core/templates/core/user_tools.jinja:34 core/views/user.py:145 +#: core/templates/core/user_tools.jinja:34 core/views/user.py:146 #: counter/templates/counter/counter_list.jinja:17 -#: counter/templates/counter/counter_list.jinja:31 -#: counter/templates/counter/counter_list.jinja:45 +#: counter/templates/counter/counter_list.jinja:32 +#: counter/templates/counter/counter_list.jinja:47 #: launderette/templates/launderette/launderette_list.jinja:16 msgid "Edit" msgstr "Éditer" @@ -441,6 +442,7 @@ msgid "New operation" msgstr "Nouvelle opération" #: accounting/templates/accounting/journal_details.jinja:26 +#: counter/templates/counter/stats.jinja:14 msgid "Nb" msgstr "No" @@ -474,7 +476,7 @@ msgid "Done" msgstr "Effectué" #: accounting/templates/accounting/journal_details.jinja:34 -#: counter/templates/counter/cash_summary_list.jinja:32 counter/views.py:615 +#: counter/templates/counter/cash_summary_list.jinja:32 counter/views.py:621 msgid "Comment" msgstr "Commentaire" @@ -678,6 +680,7 @@ msgstr "Quantité" #: core/templates/core/user_account.jinja:9 #: core/templates/core/user_account_detail.jinja:51 #: counter/templates/counter/cash_summary_list.jinja:30 +#: counter/templates/counter/stats.jinja:18 msgid "Total" msgstr "Total" @@ -712,13 +715,13 @@ msgstr "Membres" msgid "Old members" msgstr "Anciens membres" -#: club/views.py:47 core/templates/core/base.jinja:40 core/views/user.py:134 +#: club/views.py:47 core/templates/core/base.jinja:40 core/views/user.py:135 msgid "Tools" msgstr "Outils" -#: club/views.py:63 counter/templates/counter/counter_list.jinja:20 -#: counter/templates/counter/counter_list.jinja:34 -#: counter/templates/counter/counter_list.jinja:48 +#: club/views.py:63 counter/templates/counter/counter_list.jinja:21 +#: counter/templates/counter/counter_list.jinja:36 +#: counter/templates/counter/counter_list.jinja:51 msgid "Props" msgstr "Propriétés" @@ -1560,6 +1563,7 @@ msgid "Users" msgstr "Utilisateurs" #: core/templates/core/search.jinja:18 +#: counter/templates/counter/stats.jinja:17 msgid "Clubs" msgstr "Clubs" @@ -1703,6 +1707,10 @@ msgstr "Stats de %(user_name)s" msgid "Permanencies" msgstr "Permanences" +#: core/templates/core/user_stats.jinja:18 +msgid "Buyings" +msgstr "Achats" + #: core/templates/core/user_tools.jinja:4 #, python-format msgid "%(user_name)s's tools" @@ -1716,7 +1724,7 @@ msgstr "Outils utilisateurs" msgid "Sith management" msgstr "Gestion de Sith" -#: core/templates/core/user_tools.jinja:14 core/views/user.py:151 +#: core/templates/core/user_tools.jinja:14 core/views/user.py:152 msgid "Groups" msgstr "Groupes" @@ -1724,8 +1732,8 @@ msgstr "Groupes" msgid "Subscriptions" msgstr "Cotisations" -#: core/templates/core/user_tools.jinja:22 counter/views.py:394 -#: counter/views.py:528 +#: core/templates/core/user_tools.jinja:22 counter/views.py:395 +#: counter/views.py:534 msgid "Counters" msgstr "Comptoirs" @@ -1746,7 +1754,7 @@ msgid "Product types management" msgstr "Gestion des types de produit" #: core/templates/core/user_tools.jinja:29 -#: counter/templates/counter/cash_summary_list.jinja:18 +#: counter/templates/counter/cash_summary_list.jinja:18 counter/views.py:415 msgid "Cash register summaries" msgstr "Relevés de caisse" @@ -1804,11 +1812,13 @@ msgstr "Blouse : montrez aux autres à quoi ressemble votre blouse !" msgid "Bad image format, only jpeg, png, and gif are accepted" msgstr "Mauvais format d'image, seuls les jpeg, png, et gif sont acceptés" -#: core/views/user.py:139 +#: core/views/user.py:140 counter/templates/counter/counter_list.jinja:18 +#: counter/templates/counter/counter_list.jinja:33 +#: counter/templates/counter/counter_list.jinja:48 msgid "Stats" msgstr "Stats" -#: core/views/user.py:228 +#: core/views/user.py:236 msgid "User already has a profile picture" msgstr "L'utilisateur a déjà une photo de profil" @@ -1893,7 +1903,7 @@ msgstr "Bureau" #: eboutic/templates/eboutic/eboutic_main.jinja:24 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:8 #: eboutic/templates/eboutic/eboutic_payment_result.jinja:4 -#: sith/settings.py:276 sith/settings.py:284 +#: sith/settings.py:277 sith/settings.py:285 msgid "Eboutic" msgstr "Eboutic" @@ -1930,8 +1940,8 @@ msgstr "quantité" msgid "Sith account" msgstr "Compte utilisateur" -#: counter/models.py:258 sith/settings.py:269 sith/settings.py:274 -#: sith/settings.py:296 +#: counter/models.py:258 sith/settings.py:270 sith/settings.py:275 +#: sith/settings.py:297 msgid "Credit card" msgstr "Carte bancaire" @@ -1995,7 +2005,7 @@ msgstr "Liste des relevés de caisse" msgid "Theoric sums" msgstr "Sommes théoriques" -#: counter/templates/counter/cash_summary_list.jinja:31 counter/views.py:616 +#: counter/templates/counter/cash_summary_list.jinja:31 counter/views.py:622 msgid "Emptied" msgstr "Coffre vidé" @@ -2054,15 +2064,15 @@ msgstr "Liste des comptoirs" msgid "New counter" msgstr "Nouveau comptoir" -#: counter/templates/counter/counter_list.jinja:25 +#: counter/templates/counter/counter_list.jinja:26 msgid "Bars" msgstr "Bars" -#: counter/templates/counter/counter_list.jinja:39 +#: counter/templates/counter/counter_list.jinja:41 msgid "Offices" msgstr "Bureaux" -#: counter/templates/counter/counter_list.jinja:54 +#: counter/templates/counter/counter_list.jinja:57 msgid "There is no counters in this website." msgstr "Il n'y a pas de comptoirs dans ce site web." @@ -2127,105 +2137,122 @@ msgstr "Nouveau type de produit" msgid "There is no product types in this website." msgstr "Il n'y a pas de types de produit dans ce site web." -#: counter/views.py:36 +#: counter/templates/counter/stats.jinja:5 +#: counter/templates/counter/stats.jinja:9 +msgid "%(counter_name)s stats" +msgstr "Stats sur %(counter_name)s" + +#: counter/templates/counter/stats.jinja:10 +msgid "Top 100 %(counter_name)s" +msgstr "Top 100 %(counter_name)s" + +#: counter/templates/counter/stats.jinja:16 +msgid "Promo" +msgstr "Promo" + +#: counter/templates/counter/stats.jinja:19 +msgid "Percentage" +msgstr "Pourcentage" + +#: counter/views.py:37 msgid "Select user" msgstr "Choisir un utilisateur" -#: counter/views.py:52 +#: counter/views.py:53 msgid "User not found" msgstr "Utilisateur non trouvé" -#: counter/views.py:85 +#: counter/views.py:86 msgid "Bad credentials" msgstr "Mauvais identifiants" -#: counter/views.py:87 +#: counter/views.py:88 msgid "User is not barman" msgstr "L'utilisateur n'est pas barman." -#: counter/views.py:267 +#: counter/views.py:268 msgid "END" msgstr "FIN" -#: counter/views.py:269 +#: counter/views.py:270 msgid "CAN" msgstr "ANN" -#: counter/views.py:299 +#: counter/views.py:300 msgid "You have not enough money to buy all the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" -#: counter/views.py:389 +#: counter/views.py:390 msgid "Counter administration" msgstr "Administration des comptoirs" -#: counter/views.py:399 +#: counter/views.py:400 msgid "Products" msgstr "Produits" -#: counter/views.py:404 +#: counter/views.py:405 msgid "Archived products" msgstr "Produits archivés" -#: counter/views.py:409 +#: counter/views.py:410 msgid "Product types" msgstr "Types de produit" -#: counter/views.py:525 +#: counter/views.py:531 msgid "Parent product" msgstr "Produit parent" -#: counter/views.py:526 +#: counter/views.py:532 msgid "Buying groups" msgstr "Groupes d'achat" -#: counter/views.py:595 +#: counter/views.py:601 msgid "10 cents" msgstr "10 centimes" -#: counter/views.py:596 +#: counter/views.py:602 msgid "20 cents" msgstr "20 centimes" -#: counter/views.py:597 +#: counter/views.py:603 msgid "50 cents" msgstr "50 centimes" -#: counter/views.py:598 +#: counter/views.py:604 msgid "1 euro" msgstr "1 €" -#: counter/views.py:599 +#: counter/views.py:605 msgid "2 euros" msgstr "2 €" -#: counter/views.py:600 +#: counter/views.py:606 msgid "5 euros" msgstr "5 €" -#: counter/views.py:601 +#: counter/views.py:607 msgid "10 euros" msgstr "10 €" -#: counter/views.py:602 +#: counter/views.py:608 msgid "20 euros" msgstr "20 €" -#: counter/views.py:603 +#: counter/views.py:609 msgid "50 euros" msgstr "50 €" -#: counter/views.py:604 +#: counter/views.py:610 msgid "100 euros" msgstr "100 €" -#: counter/views.py:605 counter/views.py:607 counter/views.py:609 -#: counter/views.py:611 counter/views.py:613 +#: counter/views.py:611 counter/views.py:613 counter/views.py:615 +#: counter/views.py:617 counter/views.py:619 msgid "Check amount" msgstr "Montant du chèque" -#: counter/views.py:606 counter/views.py:608 counter/views.py:610 -#: counter/views.py:612 counter/views.py:614 +#: counter/views.py:612 counter/views.py:614 counter/views.py:616 +#: counter/views.py:618 counter/views.py:620 msgid "Check quantity" msgstr "Nombre de chèque" @@ -2365,12 +2392,12 @@ msgid "Washing and drying" msgstr "Lavage et séchage" #: launderette/templates/launderette/launderette_book.jinja:27 -#: sith/settings.py:410 +#: sith/settings.py:411 msgid "Washing" msgstr "Lavage" #: launderette/templates/launderette/launderette_book.jinja:31 -#: sith/settings.py:410 +#: sith/settings.py:411 msgid "Drying" msgstr "Séchage" @@ -2429,115 +2456,115 @@ msgstr "Anglais" msgid "French" msgstr "Français" -#: sith/settings.py:266 sith/settings.py:273 sith/settings.py:294 +#: sith/settings.py:267 sith/settings.py:274 sith/settings.py:295 msgid "Check" msgstr "Chèque" -#: sith/settings.py:267 sith/settings.py:275 sith/settings.py:295 +#: sith/settings.py:268 sith/settings.py:276 sith/settings.py:296 msgid "Cash" msgstr "Espèces" -#: sith/settings.py:268 +#: sith/settings.py:269 msgid "Transfert" msgstr "Virement" -#: sith/settings.py:281 +#: sith/settings.py:282 msgid "Belfort" msgstr "Belfort" -#: sith/settings.py:282 +#: sith/settings.py:283 msgid "Sevenans" msgstr "Sevenans" -#: sith/settings.py:283 +#: sith/settings.py:284 msgid "Montbéliard" msgstr "Montbéliard" -#: sith/settings.py:323 +#: sith/settings.py:324 msgid "One semester" msgstr "Un semestre, 15 €" -#: sith/settings.py:328 +#: sith/settings.py:329 msgid "Two semesters" msgstr "Deux semestres, 28 €" -#: sith/settings.py:333 +#: sith/settings.py:334 msgid "Common core cursus" msgstr "Cursus tronc commun, 45 €" -#: sith/settings.py:338 +#: sith/settings.py:339 msgid "Branch cursus" msgstr "Cursus branche, 45 €" -#: sith/settings.py:343 +#: sith/settings.py:344 msgid "Alternating cursus" msgstr "Cursus alternant, 30 €" -#: sith/settings.py:348 +#: sith/settings.py:349 msgid "Honorary member" msgstr "Membre honoraire, 0 €" -#: sith/settings.py:353 +#: sith/settings.py:354 msgid "Assidu member" msgstr "Membre d'Assidu, 0 €" -#: sith/settings.py:358 +#: sith/settings.py:359 msgid "Amicale/DOCEO member" msgstr "Membre de l'Amicale/DOCEO, 0 €" -#: sith/settings.py:363 +#: sith/settings.py:364 msgid "UT network member" msgstr "Cotisant du réseau UT, 0 €" -#: sith/settings.py:368 +#: sith/settings.py:369 msgid "CROUS member" msgstr "Membres du CROUS, 0 €" -#: sith/settings.py:373 +#: sith/settings.py:374 msgid "Sbarro/ESTA member" msgstr "Membre de Sbarro ou de l'ESTA, 15 €" -#: sith/settings.py:381 +#: sith/settings.py:382 msgid "President" msgstr "Président" -#: sith/settings.py:382 +#: sith/settings.py:383 msgid "Vice-President" msgstr "Vice-Président" -#: sith/settings.py:383 +#: sith/settings.py:384 msgid "Treasurer" msgstr "Trésorier" -#: sith/settings.py:384 +#: sith/settings.py:385 msgid "Communication supervisor" msgstr "Responsable com" -#: sith/settings.py:385 +#: sith/settings.py:386 msgid "Secretary" msgstr "Secrétaire" -#: sith/settings.py:386 +#: sith/settings.py:387 msgid "IT supervisor" msgstr "Responsable info" -#: sith/settings.py:387 +#: sith/settings.py:388 msgid "Board member" msgstr "Membre du bureau" -#: sith/settings.py:388 +#: sith/settings.py:389 msgid "Active member" msgstr "Membre actif" -#: sith/settings.py:389 +#: sith/settings.py:390 msgid "Curious" msgstr "Curieux" -#: subscription/models.py:17 +#: subscription/models.py:16 msgid "Bad subscription type" msgstr "Mauvais type de cotisation" -#: subscription/models.py:21 +#: subscription/models.py:20 msgid "Bad payment method" msgstr "Mauvais type de paiement"