From 7aec32cef0e1fe2434fd331fd595de52ed09a29b Mon Sep 17 00:00:00 2001 From: Skia Date: Fri, 9 Sep 2016 20:38:27 +0200 Subject: [PATCH] Some quick improvement on account view --- core/templates/core/user_account_detail.jinja | 3 +- locale/fr/LC_MESSAGES/django.mo | Bin 33900 -> 33971 bytes locale/fr/LC_MESSAGES/django.po | 206 ++++++++++-------- 3 files changed, 114 insertions(+), 95 deletions(-) diff --git a/core/templates/core/user_account_detail.jinja b/core/templates/core/user_account_detail.jinja index 19748bd2..4f239c49 100644 --- a/core/templates/core/user_account_detail.jinja +++ b/core/templates/core/user_account_detail.jinja @@ -8,6 +8,7 @@ {% if customer %}

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

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

+

{% trans %}Back{% endtrans %}

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

{% trans %}Refillings{% endtrans %}

@@ -101,5 +102,5 @@ {% else %}

{% trans %}User has no account{% endtrans %}

{% endif %} -

Retour

+

{% trans %}Back{% endtrans %}

{% endblock %} diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index db5c407661a1f9821b4b950032c97251710b1b3e..f2a145cd06d0713c21f723ac1013d0418818a839 100644 GIT binary patch delta 12349 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 JNxz!!{{RNVR$c%A diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 925eb56f..fcea0b33 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-09 16:22+0200\n" +"POT-Creation-Date: 2016-09-09 20:36+0200\n" "PO-Revision-Date: 2016-07-18\n" "Last-Translator: Skia \n" "Language-Team: AE info \n" @@ -172,7 +172,7 @@ msgstr "Utilisateur" msgid "Club" msgstr "Club" -#: accounting/models.py:190 core/views/user.py:159 +#: accounting/models.py:190 core/views/user.py:161 msgid "Account" msgstr "Compte" @@ -180,7 +180,7 @@ msgstr "Compte" msgid "Company" msgstr "Entreprise" -#: accounting/models.py:190 sith/settings.py:289 sith/settings_sample.py:275 +#: accounting/models.py:190 sith/settings.py:286 sith/settings_sample.py:275 msgid "Other" msgstr "Autre" @@ -304,7 +304,7 @@ msgid "Delete" msgstr "Supprimer" #: accounting/templates/accounting/bank_account_details.jinja:17 -#: club/views.py:30 core/views/user.py:126 +#: club/views.py:30 core/views/user.py:128 msgid "Infos" msgstr "Infos" @@ -325,7 +325,7 @@ 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:33 core/views/user.py:143 +#: core/templates/core/user_tools.jinja:33 core/views/user.py:145 #: counter/templates/counter/counter_list.jinja:17 #: counter/templates/counter/counter_list.jinja:31 #: counter/templates/counter/counter_list.jinja:45 @@ -382,8 +382,8 @@ msgstr "Fin" #: accounting/templates/accounting/club_account_details.jinja:29 #: accounting/templates/accounting/journal_details.jinja:28 -#: core/templates/core/user_account.jinja:19 -#: core/templates/core/user_account.jinja:78 +#: core/templates/core/user_account_detail.jinja:20 +#: core/templates/core/user_account_detail.jinja:81 msgid "Amount" msgstr "Montant" @@ -421,7 +421,8 @@ msgid "General journal:" msgstr "Classeur : " #: accounting/templates/accounting/journal_details.jinja:16 -#: core/templates/core/user_account.jinja:10 +#: core/templates/core/user_account.jinja:36 +#: core/templates/core/user_account_detail.jinja:10 #: counter/templates/counter/counter_click.jinja:31 msgid "Amount: " msgstr "Montant: " @@ -444,9 +445,9 @@ msgstr "No" #: accounting/templates/accounting/journal_details.jinja:27 #: club/templates/club/club_sellings.jinja:18 -#: core/templates/core/user_account.jinja:16 -#: core/templates/core/user_account.jinja:44 -#: core/templates/core/user_account.jinja:76 +#: core/templates/core/user_account_detail.jinja:17 +#: core/templates/core/user_account_detail.jinja:46 +#: core/templates/core/user_account_detail.jinja:79 msgid "Date" msgstr "Date" @@ -644,14 +645,14 @@ msgid "Total: " msgstr "Total : " #: club/templates/club/club_sellings.jinja:19 club/views.py:159 -#: core/templates/core/user_account.jinja:17 -#: core/templates/core/user_account.jinja:45 +#: core/templates/core/user_account_detail.jinja:18 +#: core/templates/core/user_account_detail.jinja:47 msgid "Counter" msgstr "Comptoir" #: club/templates/club/club_sellings.jinja:20 -#: core/templates/core/user_account.jinja:18 -#: core/templates/core/user_account.jinja:46 +#: core/templates/core/user_account_detail.jinja:19 +#: core/templates/core/user_account_detail.jinja:48 msgid "Barman" msgstr "Barman" @@ -661,23 +662,24 @@ msgid "Customer" msgstr "Client" #: club/templates/club/club_sellings.jinja:22 -#: core/templates/core/user_account.jinja:47 +#: core/templates/core/user_account_detail.jinja:49 msgid "Label" msgstr "Intitulé" #: club/templates/club/club_sellings.jinja:23 -#: core/templates/core/user_account.jinja:48 +#: core/templates/core/user_account_detail.jinja:50 msgid "Quantity" msgstr "Quantité" #: club/templates/club/club_sellings.jinja:24 -#: core/templates/core/user_account.jinja:49 +#: core/templates/core/user_account.jinja:9 +#: core/templates/core/user_account_detail.jinja:51 msgid "Total" msgstr "Total" #: club/templates/club/club_sellings.jinja:25 -#: core/templates/core/user_account.jinja:20 -#: core/templates/core/user_account.jinja:50 +#: core/templates/core/user_account_detail.jinja:21 +#: core/templates/core/user_account_detail.jinja:52 msgid "Payment method" msgstr "Méthode de paiement" @@ -706,7 +708,7 @@ msgstr "Membres" msgid "Old members" msgstr "Anciens membres" -#: club/views.py:47 core/templates/core/base.jinja:38 core/views/user.py:132 +#: club/views.py:47 core/templates/core/base.jinja:38 core/views/user.py:134 msgid "Tools" msgstr "Outils" @@ -1008,8 +1010,8 @@ msgid "A user with that username already exists" msgstr "Un utilisateur de ce nom d'utilisateur existe déjà" #: core/models.py:395 core/templates/core/macros.jinja:17 -#: core/templates/core/user_detail.jinja:14 -#: core/templates/core/user_detail.jinja:16 +#: core/templates/core/user_detail.jinja:15 +#: core/templates/core/user_detail.jinja:17 #: core/templates/core/user_edit.jinja:16 msgid "Profile" msgstr "Profil" @@ -1337,15 +1339,24 @@ msgid "Lost password?" msgstr "Mot de passe perdu ?" #: core/templates/core/macros.jinja:27 -#: core/templates/core/user_detail.jinja:27 +#: core/templates/core/user_detail.jinja:28 msgid "Born: " msgstr "Né le : " #: core/templates/core/macros.jinja:31 -#: core/templates/core/user_detail.jinja:43 +#: core/templates/core/user_detail.jinja:49 msgid "Promo: " msgstr "Promo : " +#: core/templates/core/macros.jinja:39 launderette/models.py:129 +msgid "Slot" +msgstr "Créneau" + +#: core/templates/core/macros.jinja:50 +#: launderette/templates/launderette/launderette_admin.jinja:20 +msgid "Tokens" +msgstr "Jetons" + #: core/templates/core/new_user_email.jinja:2 msgid "" "You're receiving this email because you subscribed to the UTBM student " @@ -1548,59 +1559,78 @@ msgstr "Utilisateurs" msgid "Clubs" msgstr "Clubs" -#: core/templates/core/user_account.jinja:4 +#: core/templates/core/user_account.jinja:7 +msgid "Year" +msgstr "Année" + +#: core/templates/core/user_account.jinja:8 +msgid "Month" +msgstr "Mois" + +#: core/templates/core/user_account.jinja:30 +#: core/templates/core/user_account_detail.jinja:4 #, python-format msgid "%(user_name)s's account" msgstr "Compte de %(user_name)s" -#: core/templates/core/user_account.jinja:9 +#: core/templates/core/user_account.jinja:35 +#: core/templates/core/user_account_detail.jinja:9 msgid "User account" msgstr "Compte utilisateur" -#: core/templates/core/user_account.jinja:12 +#: core/templates/core/user_account.jinja:38 +#: core/templates/core/user_account_detail.jinja:13 msgid "Refillings" msgstr "Rechargements" -#: core/templates/core/user_account.jinja:40 +#: core/templates/core/user_account.jinja:42 +#: core/templates/core/user_account_detail.jinja:42 msgid "Account buyings" msgstr "Achat sur compte utilisateur" -#: core/templates/core/user_account.jinja:72 +#: core/templates/core/user_account.jinja:46 +#: core/templates/core/user_account_detail.jinja:75 msgid "Eboutic invoices" msgstr "Facture eboutic" -#: core/templates/core/user_account.jinja:77 -msgid "Items" -msgstr "Articles" - -#: core/templates/core/user_account.jinja:99 +#: core/templates/core/user_account.jinja:50 +#: core/templates/core/user_account_detail.jinja:103 msgid "User has no account" msgstr "L'utilisateur n'a pas de compte" -#: core/templates/core/user_detail.jinja:4 +#: core/templates/core/user_account_detail.jinja:11 +#: core/templates/core/user_account_detail.jinja:105 launderette/views.py:146 +msgid "Back" +msgstr "Retour" + +#: core/templates/core/user_account_detail.jinja:80 +msgid "Items" +msgstr "Articles" + +#: core/templates/core/user_detail.jinja:5 #, python-format msgid "%(user_name)s's profile" msgstr "Profil de %(user_name)s" -#: core/templates/core/user_detail.jinja:33 +#: core/templates/core/user_detail.jinja:34 msgid "Option: " msgstr "Filière : " -#: core/templates/core/user_detail.jinja:53 +#: core/templates/core/user_detail.jinja:59 #, python-format msgid "Subscribed until %(subscription_end)s" msgstr "Cotisant jusqu'au %(subscription_end)s" -#: core/templates/core/user_detail.jinja:54 +#: core/templates/core/user_detail.jinja:60 #: core/templates/core/user_edit.jinja:39 msgid "Account number: " msgstr "Numero de compte : " -#: core/templates/core/user_detail.jinja:63 +#: core/templates/core/user_detail.jinja:66 msgid "Not subscribed" msgstr "Non cotisant" -#: core/templates/core/user_detail.jinja:65 +#: core/templates/core/user_detail.jinja:68 #: subscription/templates/subscription/subscription.jinja:4 #: subscription/templates/subscription/subscription.jinja:8 msgid "New subscription" @@ -1681,7 +1711,7 @@ msgstr "Outils utilisateurs" msgid "Sith management" msgstr "Gestion de Sith" -#: core/templates/core/user_tools.jinja:14 core/views/user.py:149 +#: core/templates/core/user_tools.jinja:14 core/views/user.py:151 msgid "Groups" msgstr "Groupes" @@ -1764,11 +1794,11 @@ 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:137 +#: core/views/user.py:139 msgid "Stats" msgstr "Stats" -#: core/views/user.py:226 +#: core/views/user.py:228 msgid "User already has a profile picture" msgstr "L'utilisateur a déjà une photo de profil" @@ -1853,7 +1883,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:288 sith/settings.py:296 sith/settings_sample.py:274 +#: sith/settings.py:285 sith/settings.py:293 sith/settings_sample.py:274 #: sith/settings_sample.py:282 msgid "Eboutic" msgstr "Eboutic" @@ -1891,8 +1921,8 @@ msgstr "quantité" msgid "Sith account" msgstr "Compte utilisateur" -#: counter/models.py:246 sith/settings.py:281 sith/settings.py:286 -#: sith/settings.py:308 sith/settings_sample.py:267 +#: counter/models.py:246 sith/settings.py:278 sith/settings.py:283 +#: sith/settings.py:305 sith/settings_sample.py:267 #: sith/settings_sample.py:272 sith/settings_sample.py:294 msgid "Credit card" msgstr "Carte bancaire" @@ -2228,7 +2258,7 @@ msgid "You do not have enough money to buy the basket" msgstr "Vous n'avez pas assez d'argent pour acheter le panier" #: launderette/models.py:19 -#: launderette/templates/launderette/launderette_book.jinja:4 +#: launderette/templates/launderette/launderette_book.jinja:5 #: launderette/templates/launderette/launderette_book_choose.jinja:4 #: launderette/templates/launderette/launderette_main.jinja:4 msgid "Launderette" @@ -2270,10 +2300,6 @@ msgstr "machine" msgid "token" msgstr "jeton" -#: launderette/models.py:129 -msgid "Slot" -msgstr "Créneau" - #: launderette/templates/launderette/launderette_admin.jinja:4 msgid "Launderette admin" msgstr "Gestion de la laverie" @@ -2290,30 +2316,26 @@ msgstr "Machines" msgid "New machine" msgstr "Nouvelle machine" -#: launderette/templates/launderette/launderette_admin.jinja:20 -msgid "Tokens" -msgstr "Jetons" - #: launderette/templates/launderette/launderette_admin.jinja:42 #: launderette/views.py:148 msgid "Type" msgstr "Type" -#: launderette/templates/launderette/launderette_book.jinja:11 +#: launderette/templates/launderette/launderette_book.jinja:12 msgid "Choose" msgstr "Choisir" -#: launderette/templates/launderette/launderette_book.jinja:22 +#: launderette/templates/launderette/launderette_book.jinja:23 msgid "Washing and drying" msgstr "Lavage et séchage" -#: launderette/templates/launderette/launderette_book.jinja:26 -#: sith/settings.py:422 sith/settings_sample.py:408 +#: launderette/templates/launderette/launderette_book.jinja:27 +#: sith/settings.py:419 sith/settings_sample.py:408 msgid "Washing" msgstr "Lavage" -#: launderette/templates/launderette/launderette_book.jinja:30 -#: sith/settings.py:422 sith/settings_sample.py:408 +#: launderette/templates/launderette/launderette_book.jinja:31 +#: sith/settings.py:419 sith/settings_sample.py:408 msgid "Drying" msgstr "Séchage" @@ -2338,10 +2360,6 @@ msgstr "Éditer la page de présentation" msgid "Book launderette slot" msgstr "Réserver un créneau de laverie" -#: launderette/views.py:146 -msgid "Back" -msgstr "Retour" - #: launderette/views.py:147 msgid "Action" msgstr "Action" @@ -2368,119 +2386,119 @@ msgstr "L'utilisateur n'a pas réservé de créneau" msgid "Token not found" msgstr "Jeton non trouvé" -#: sith/settings.py:176 sith/settings_sample.py:162 +#: sith/settings.py:173 sith/settings_sample.py:162 msgid "English" msgstr "Anglais" -#: sith/settings.py:177 sith/settings_sample.py:163 +#: sith/settings.py:174 sith/settings_sample.py:163 msgid "French" msgstr "Français" -#: sith/settings.py:278 sith/settings.py:285 sith/settings.py:306 +#: sith/settings.py:275 sith/settings.py:282 sith/settings.py:303 #: sith/settings_sample.py:264 sith/settings_sample.py:271 #: sith/settings_sample.py:292 msgid "Check" msgstr "Chèque" -#: sith/settings.py:279 sith/settings.py:287 sith/settings.py:307 +#: sith/settings.py:276 sith/settings.py:284 sith/settings.py:304 #: sith/settings_sample.py:265 sith/settings_sample.py:273 #: sith/settings_sample.py:293 msgid "Cash" msgstr "Espèces" -#: sith/settings.py:280 sith/settings_sample.py:266 +#: sith/settings.py:277 sith/settings_sample.py:266 msgid "Transfert" msgstr "Virement" -#: sith/settings.py:293 sith/settings_sample.py:279 +#: sith/settings.py:290 sith/settings_sample.py:279 msgid "Belfort" msgstr "Belfort" -#: sith/settings.py:294 sith/settings_sample.py:280 +#: sith/settings.py:291 sith/settings_sample.py:280 msgid "Sevenans" msgstr "Sevenans" -#: sith/settings.py:295 sith/settings_sample.py:281 +#: sith/settings.py:292 sith/settings_sample.py:281 msgid "Montbéliard" msgstr "Montbéliard" -#: sith/settings.py:335 sith/settings_sample.py:321 +#: sith/settings.py:332 sith/settings_sample.py:321 msgid "One semester" msgstr "Un semestre, 15 €" -#: sith/settings.py:340 sith/settings_sample.py:326 +#: sith/settings.py:337 sith/settings_sample.py:326 msgid "Two semesters" msgstr "Deux semestres, 28 €" -#: sith/settings.py:345 sith/settings_sample.py:331 +#: sith/settings.py:342 sith/settings_sample.py:331 msgid "Common core cursus" msgstr "Cursus tronc commun, 45 €" -#: sith/settings.py:350 sith/settings_sample.py:336 +#: sith/settings.py:347 sith/settings_sample.py:336 msgid "Branch cursus" msgstr "Cursus branche, 45 €" -#: sith/settings.py:355 sith/settings_sample.py:341 +#: sith/settings.py:352 sith/settings_sample.py:341 msgid "Alternating cursus" msgstr "Cursus alternant, 30 €" -#: sith/settings.py:360 sith/settings_sample.py:346 +#: sith/settings.py:357 sith/settings_sample.py:346 msgid "Honorary member" msgstr "Membre honoraire, 0 €" -#: sith/settings.py:365 sith/settings_sample.py:351 +#: sith/settings.py:362 sith/settings_sample.py:351 msgid "Assidu member" msgstr "Membre d'Assidu, 0 €" -#: sith/settings.py:370 sith/settings_sample.py:356 +#: sith/settings.py:367 sith/settings_sample.py:356 msgid "Amicale/DOCEO member" msgstr "Membre de l'Amicale/DOCEO, 0 €" -#: sith/settings.py:375 sith/settings_sample.py:361 +#: sith/settings.py:372 sith/settings_sample.py:361 msgid "UT network member" msgstr "Cotisant du réseau UT, 0 €" -#: sith/settings.py:380 sith/settings_sample.py:366 +#: sith/settings.py:377 sith/settings_sample.py:366 msgid "CROUS member" msgstr "Membres du CROUS, 0 €" -#: sith/settings.py:385 sith/settings_sample.py:371 +#: sith/settings.py:382 sith/settings_sample.py:371 msgid "Sbarro/ESTA member" msgstr "Membre de Sbarro ou de l'ESTA, 15 €" -#: sith/settings.py:393 sith/settings_sample.py:379 +#: sith/settings.py:390 sith/settings_sample.py:379 msgid "President" msgstr "Président" -#: sith/settings.py:394 sith/settings_sample.py:380 +#: sith/settings.py:391 sith/settings_sample.py:380 msgid "Vice-President" msgstr "Vice-Président" -#: sith/settings.py:395 sith/settings_sample.py:381 +#: sith/settings.py:392 sith/settings_sample.py:381 msgid "Treasurer" msgstr "Trésorier" -#: sith/settings.py:396 sith/settings_sample.py:382 +#: sith/settings.py:393 sith/settings_sample.py:382 msgid "Communication supervisor" msgstr "Responsable com" -#: sith/settings.py:397 sith/settings_sample.py:383 +#: sith/settings.py:394 sith/settings_sample.py:383 msgid "Secretary" msgstr "Secrétaire" -#: sith/settings.py:398 sith/settings_sample.py:384 +#: sith/settings.py:395 sith/settings_sample.py:384 msgid "IT supervisor" msgstr "Responsable info" -#: sith/settings.py:399 sith/settings_sample.py:385 +#: sith/settings.py:396 sith/settings_sample.py:385 msgid "Board member" msgstr "Membre du bureau" -#: sith/settings.py:400 sith/settings_sample.py:386 +#: sith/settings.py:397 sith/settings_sample.py:386 msgid "Active member" msgstr "Membre actif" -#: sith/settings.py:401 sith/settings_sample.py:387 +#: sith/settings.py:398 sith/settings_sample.py:387 msgid "Curious" msgstr "Curieux"