Commit 4408890a authored by Skia's avatar Skia
Browse files

Templating and translation

parent 4e6b5929
Pipeline #72 failed with stage
in 1 minute and 29 seconds
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
{% block infos %} {% block infos %}
<h3>{% trans %}User account{% endtrans %}</h3> <h3>{% trans %}User account{% endtrans %}</h3>
<p>{% trans %}Amount: {% endtrans %}{{ customer.amount }}</p> <p>{% trans %}Amount: {% endtrans %}{{ customer.amount }}</p>
{% if customer.refillings.exists() %}
<h4>{% trans %}Refillings{% endtrans %}</h4> <h4>{% trans %}Refillings{% endtrans %}</h4>
<table> <table>
<thead> <thead>
...@@ -26,6 +27,8 @@ ...@@ -26,6 +27,8 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
{% endif %}
{% if customer.buyings.exists() %}
<h4>{% trans %}Buyings{% endtrans %}</h4> <h4>{% trans %}Buyings{% endtrans %}</h4>
<table> <table>
<thead> <thead>
...@@ -49,6 +52,8 @@ ...@@ -49,6 +52,8 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
{% endif %}
{% if customer.user.invoices.exists() %}
<h4>{% trans %}Invoices{% endtrans %}</h4> <h4>{% trans %}Invoices{% endtrans %}</h4>
<table> <table>
<thead> <thead>
...@@ -74,6 +79,7 @@ ...@@ -74,6 +79,7 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
{% endif %}
{% endblock %} {% endblock %}
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-22 13:32+0200\n" "POT-Creation-Date: 2016-07-27 00:05+0200\n"
"PO-Revision-Date: 2016-07-18\n" "PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Skia <skia@libskia.so>\n" "Last-Translator: Skia <skia@libskia.so>\n"
"Language-Team: AE info <ae.info@utbm.fr>\n" "Language-Team: AE info <ae.info@utbm.fr>\n"
...@@ -56,7 +56,7 @@ msgid "number" ...@@ -56,7 +56,7 @@ msgid "number"
msgstr "numéro" msgstr "numéro"
#: accounting/models.py:137 core/models.py:462 counter/models.py:167 #: 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" msgid "date"
msgstr "date" msgstr "date"
...@@ -68,7 +68,7 @@ msgstr "intitulé" ...@@ -68,7 +68,7 @@ msgstr "intitulé"
msgid "remark" msgid "remark"
msgstr "remarque" 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 #: subscription/models.py:34
msgid "payment method" msgid "payment method"
msgstr "méthode de paiement" msgstr "méthode de paiement"
...@@ -201,6 +201,8 @@ msgstr "Fin" ...@@ -201,6 +201,8 @@ msgstr "Fin"
#: accounting/templates/accounting/club_account_details.jinja:20 #: accounting/templates/accounting/club_account_details.jinja:20
#: accounting/templates/accounting/journal_details.jinja:23 #: accounting/templates/accounting/journal_details.jinja:23
#: counter/templates/counter/user_account.jinja:17
#: counter/templates/counter/user_account.jinja:63
msgid "Amount" msgid "Amount"
msgstr "Montant" msgstr "Montant"
...@@ -254,6 +256,9 @@ msgid "Nb" ...@@ -254,6 +256,9 @@ msgid "Nb"
msgstr "No" msgstr "No"
#: accounting/templates/accounting/journal_details.jinja:21 #: 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" msgid "Date"
msgstr "Date" msgstr "Date"
...@@ -305,7 +310,7 @@ msgstr "Adresse" ...@@ -305,7 +310,7 @@ msgstr "Adresse"
msgid "You can not make loops in clubs" msgid "You can not make loops in clubs"
msgstr "Vous ne pouvez pas faire de boucles dans les 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" msgid "user"
msgstr "nom d'utilisateur" msgstr "nom d'utilisateur"
...@@ -369,7 +374,8 @@ msgstr "Sauver" ...@@ -369,7 +374,8 @@ msgstr "Sauver"
msgid "Edit club properties" msgid "Edit club properties"
msgstr "Éditer les propriétés du club" 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" msgid "Club list"
msgstr "Liste des clubs" msgstr "Liste des clubs"
...@@ -547,7 +553,7 @@ msgstr "Utilisateurs" ...@@ -547,7 +553,7 @@ msgstr "Utilisateurs"
#: core/templates/core/base.jinja:30 #: core/templates/core/base.jinja:30
msgid "Wiki" msgid "Wiki"
msgstr "" msgstr "Wiki"
#: core/templates/core/base.jinja:31 #: core/templates/core/base.jinja:31
msgid "Pages" msgid "Pages"
...@@ -592,7 +598,8 @@ msgstr "Éditer %(obj)s" ...@@ -592,7 +598,8 @@ msgstr "Éditer %(obj)s"
msgid "Edit group" msgid "Edit group"
msgstr "Éditer le groupe" 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 #: core/templates/core/user_group.jinja:8
msgid "Update" msgid "Update"
msgstr "Mettre à jour" msgstr "Mettre à jour"
...@@ -921,11 +928,11 @@ msgstr "Eboutic" ...@@ -921,11 +928,11 @@ msgstr "Eboutic"
msgid "bank" msgid "bank"
msgstr "banque" msgstr "banque"
#: counter/models.py:191 eboutic/models.py:51 #: counter/models.py:191 eboutic/models.py:78
msgid "unit price" msgid "unit price"
msgstr "prix unitaire" msgstr "prix unitaire"
#: counter/models.py:192 eboutic/models.py:52 #: counter/models.py:192 eboutic/models.py:79
msgid "quantity" msgid "quantity"
msgstr "quantité" msgstr "quantité"
...@@ -966,7 +973,7 @@ msgstr "Panier : " ...@@ -966,7 +973,7 @@ msgstr "Panier : "
#: counter/templates/counter/counter_click.jinja:58 #: counter/templates/counter/counter_click.jinja:58
#: counter/templates/counter/counter_main.jinja:24 #: counter/templates/counter/counter_main.jinja:24
#: eboutic/templates/eboutic/eboutic_main.jinja:31 #: eboutic/templates/eboutic/eboutic_main.jinja:30
msgid "Total: " msgid "Total: "
msgstr "Total : " msgstr "Total : "
...@@ -975,7 +982,7 @@ msgid "Finish" ...@@ -975,7 +982,7 @@ msgid "Finish"
msgstr "Terminer" msgstr "Terminer"
#: counter/templates/counter/counter_click.jinja:69 #: counter/templates/counter/counter_click.jinja:69
#: eboutic/templates/eboutic/eboutic_main.jinja:39 #: eboutic/templates/eboutic/eboutic_main.jinja:37
msgid "Products: " msgid "Products: "
msgstr "Produits : " msgstr "Produits : "
...@@ -997,6 +1004,7 @@ msgid "There is no counters in this website." ...@@ -997,6 +1004,7 @@ msgid "There is no counters in this website."
msgstr "Il n'y a pas de comptoirs dans ce site web." msgstr "Il n'y a pas de comptoirs dans ce site web."
#: counter/templates/counter/counter_main.jinja:12 #: counter/templates/counter/counter_main.jinja:12
#, python-format
msgid "%(counter_name)s counter" msgid "%(counter_name)s counter"
msgstr "Comptoir %(counter_name)s" msgstr "Comptoir %(counter_name)s"
...@@ -1041,6 +1049,39 @@ msgstr "Compte de %(user_name)s" ...@@ -1041,6 +1049,39 @@ msgstr "Compte de %(user_name)s"
msgid "User account" msgid "User account"
msgstr "Compte utilisateur" 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 #: counter/views.py:208
msgid "END" msgid "END"
msgstr "FIN" msgstr "FIN"
...@@ -1053,43 +1094,56 @@ msgstr "ANN" ...@@ -1053,43 +1094,56 @@ msgstr "ANN"
msgid "You have not enough money to buy all the basket" msgid "You have not enough money to buy all the basket"
msgstr "Vous n'avez pas assez d'argent pour acheter le panier" 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" msgid "Credit card"
msgstr "Carte banquaire" msgstr "Carte banquaire"
#: eboutic/models.py:27 #: eboutic/models.py:47
msgid "Sith account" msgid "Sith account"
msgstr "Compte utilisateur" msgstr "Compte utilisateur"
#: eboutic/models.py:29 #: eboutic/models.py:49
msgid "validated" msgid "validated"
msgstr "validé" msgstr "validé"
#: eboutic/models.py:40 #: eboutic/models.py:59
msgid "Invoice already validated" msgid "Invoice already validated"
msgstr "Facture déjà validée" 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" msgid "product name"
msgstr "nom du produit" 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" msgid "basket"
msgstr "panier" msgstr "panier"
#: eboutic/models.py:64 #: eboutic/models.py:91
msgid "invoice" msgid "invoice"
msgstr "facture" msgstr "facture"
#: eboutic/templates/eboutic/eboutic_main.jinja:35 #: eboutic/templates/eboutic/eboutic_main.jinja:33
msgid "Proceed to command" msgid "Proceed to command"
msgstr "Procéder à la commande" msgstr "Procéder à la commande"
#: eboutic/templates/eboutic/eboutic_makecommand.jinja:29 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:31
msgid "Pay with credit card" msgid "Pay with credit card"
msgstr "Payer avec une carte banquaire" msgstr "Payer avec une carte banquaire"
#: eboutic/templates/eboutic/eboutic_makecommand.jinja:34 #: 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" msgid "Pay with Sith account"
msgstr "Payer avec un compte AE" msgstr "Payer avec un compte AE"
...@@ -1101,79 +1155,83 @@ msgstr "Le paiement a échoué" ...@@ -1101,79 +1155,83 @@ msgstr "Le paiement a échoué"
msgid "Payment successful" msgid "Payment successful"
msgstr "Le paiement a été effectué" msgstr "Le paiement a été effectué"
#: eboutic/views.py:116 #: eboutic/templates/eboutic/eboutic_payment_result.jinja:12
msgid "You have not enough money to buy the basket" 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" 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:228 sith/settings_sample.py:235
#: sith/settings_sample.py:247 #: sith/settings_sample.py:247
msgid "Check" msgid "Check"
msgstr "Chèque" 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:229 sith/settings_sample.py:236
#: sith/settings_sample.py:248 #: sith/settings_sample.py:248
msgid "Cash" msgid "Cash"
msgstr "Espèces" msgstr "Espèces"
#: sith/settings.py:230 sith/settings_sample.py:230 #: sith/settings.py:242 sith/settings_sample.py:230
msgid "Transfert" msgid "Transfert"
msgstr "Virement" msgstr "Virement"
#: sith/settings.py:237 sith/settings_sample.py:237 #: sith/settings.py:249 sith/settings_sample.py:237
msgid "Other" msgid "Other"
msgstr "Autre" msgstr "Autre"
#: sith/settings.py:261 sith/settings_sample.py:261 #: sith/settings.py:273 sith/settings_sample.py:261
msgid "One semester" msgid "One semester"
msgstr "Un semestre" msgstr "Un semestre"
#: sith/settings.py:266 sith/settings_sample.py:266 #: sith/settings.py:278 sith/settings_sample.py:266
msgid "Two semesters" msgid "Two semesters"
msgstr "Deux semestres" 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" msgid "Common core cursus"
msgstr "Cursus tronc commun" 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" msgid "Branch cursus"
msgstr "Cursus branche" msgstr "Cursus branche"
#: sith/settings.py:284 sith/settings_sample.py:284 #: sith/settings.py:296 sith/settings_sample.py:284
msgid "President" msgid "President"
msgstr "Président" msgstr "Président"
#: sith/settings.py:285 sith/settings_sample.py:285 #: sith/settings.py:297 sith/settings_sample.py:285
msgid "Vice-President" msgid "Vice-President"
msgstr "Vice-Président" msgstr "Vice-Président"
#: sith/settings.py:286 sith/settings_sample.py:286 #: sith/settings.py:298 sith/settings_sample.py:286
msgid "Treasurer" msgid "Treasurer"
msgstr "Trésorier" msgstr "Trésorier"
#: sith/settings.py:287 sith/settings_sample.py:287 #: sith/settings.py:299 sith/settings_sample.py:287
msgid "Communication supervisor" msgid "Communication supervisor"
msgstr "Responsable com" msgstr "Responsable com"
#: sith/settings.py:288 sith/settings_sample.py:288 #: sith/settings.py:300 sith/settings_sample.py:288
msgid "Secretary" msgid "Secretary"
msgstr "Secrétaire" msgstr "Secrétaire"
#: sith/settings.py:289 sith/settings_sample.py:289 #: sith/settings.py:301 sith/settings_sample.py:289
msgid "IT supervisor" msgid "IT supervisor"
msgstr "Responsable info" msgstr "Responsable info"
#: sith/settings.py:290 sith/settings_sample.py:290 #: sith/settings.py:302 sith/settings_sample.py:290
msgid "Board member" msgid "Board member"
msgstr "Membre du bureau" 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" msgid "Active member"
msgstr "Membre actif" msgstr "Membre actif"
#: sith/settings.py:292 sith/settings_sample.py:292 #: sith/settings.py:304 sith/settings_sample.py:292
msgid "Curious" msgid "Curious"
msgstr "Curieux" msgstr "Curieux"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment