From 00cfca3438bf9c2d50847acc0a407dc79de3fc5a Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Tue, 26 Apr 2022 23:31:49 +0200 Subject: [PATCH] Fix report table heading wording --- src/common/locale/en/LC_MESSAGES/django.po | 2 +- src/common/locale/fr/LC_MESSAGES/django.po | 2 +- src/purchase/locale/en/LC_MESSAGES/django.po | 54 ++++++++--------- src/purchase/locale/fr/LC_MESSAGES/django.po | 59 ++++++++++--------- .../snippets/report_no_payment_method.html | 2 +- 5 files changed, 61 insertions(+), 58 deletions(-) diff --git a/src/common/locale/en/LC_MESSAGES/django.po b/src/common/locale/en/LC_MESSAGES/django.po index cfbd74a..89838bc 100644 --- a/src/common/locale/en/LC_MESSAGES/django.po +++ b/src/common/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-26 21:11+0200\n" +"POT-Creation-Date: 2022-04-26 23:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/common/locale/fr/LC_MESSAGES/django.po b/src/common/locale/fr/LC_MESSAGES/django.po index 8f3d4e0..4e503fb 100644 --- a/src/common/locale/fr/LC_MESSAGES/django.po +++ b/src/common/locale/fr/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-26 21:11+0200\n" +"POT-Creation-Date: 2022-04-26 23:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/purchase/locale/en/LC_MESSAGES/django.po b/src/purchase/locale/en/LC_MESSAGES/django.po index 63ea1c6..6bea479 100644 --- a/src/purchase/locale/en/LC_MESSAGES/django.po +++ b/src/purchase/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-26 21:11+0200\n" +"POT-Creation-Date: 2022-04-26 23:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,64 +46,64 @@ msgstr "" msgid "updated at" msgstr "" -#: purchase/models.py:37 purchase/models.py:69 +#: purchase/models.py:42 purchase/models.py:83 msgid "name" msgstr "" -#: purchase/models.py:42 purchase/models.py:152 +#: purchase/models.py:47 purchase/models.py:170 msgid "payment method" msgstr "" -#: purchase/models.py:43 +#: purchase/models.py:48 msgid "payment methods" msgstr "" -#: purchase/models.py:70 +#: purchase/models.py:84 msgid "image" msgstr "" -#: purchase/models.py:72 +#: purchase/models.py:86 msgid "unit price (cents)" msgstr "" -#: purchase/models.py:72 +#: purchase/models.py:86 msgid "unit price in cents" msgstr "" -#: purchase/models.py:75 +#: purchase/models.py:89 msgid "display order" msgstr "" -#: purchase/models.py:82 purchase/models.py:180 +#: purchase/models.py:96 purchase/models.py:198 msgid "product" msgstr "" -#: purchase/models.py:83 +#: purchase/models.py:97 msgid "products" msgstr "" -#: purchase/models.py:158 purchase/models.py:186 +#: purchase/models.py:176 purchase/models.py:204 msgid "basket" msgstr "" -#: purchase/models.py:159 +#: purchase/models.py:177 msgid "baskets" msgstr "" -#: purchase/models.py:162 +#: purchase/models.py:180 #, python-format msgid "Basket #%(id)s" msgstr "" -#: purchase/models.py:188 +#: purchase/models.py:206 msgid "quantity" msgstr "" -#: purchase/models.py:193 +#: purchase/models.py:211 msgid "basket item" msgstr "" -#: purchase/models.py:194 +#: purchase/models.py:212 msgid "basket items" msgstr "" @@ -140,50 +140,50 @@ msgid_plural "%(counter)s items" msgstr[0] "" msgstr[1] "" -#: purchase/templates/purchase/reports.html:6 +#: purchase/templates/purchase/reports.html:11 msgid "Reports" msgstr "" -#: purchase/templates/purchase/reports.html:7 +#: purchase/templates/purchase/reports.html:12 msgid "General" msgstr "" -#: purchase/templates/purchase/reports.html:9 +#: purchase/templates/purchase/reports.html:14 msgid "Total turnover:" msgstr "" -#: purchase/templates/purchase/reports.html:10 +#: purchase/templates/purchase/reports.html:15 msgid "Average basket:" msgstr "" -#: purchase/templates/purchase/reports.html:13 +#: purchase/templates/purchase/reports.html:18 msgid "By day" msgstr "" -#: purchase/templates/purchase/reports.html:14 +#: purchase/templates/purchase/reports.html:19 #: purchase/templates/purchase/snippets/report_payment_methods.html:8 #: purchase/templates/purchase/snippets/report_products.html:8 msgid "Turnover" msgstr "" -#: purchase/templates/purchase/reports.html:20 +#: purchase/templates/purchase/reports.html:25 msgid "Average basket" msgstr "" -#: purchase/templates/purchase/reports.html:29 +#: purchase/templates/purchase/reports.html:34 msgid "Products" msgstr "" -#: purchase/templates/purchase/reports.html:33 +#: purchase/templates/purchase/reports.html:38 msgid "Turnover by payment method" msgstr "" -#: purchase/templates/purchase/reports.html:36 +#: purchase/templates/purchase/reports.html:41 msgid "Baskets without payment method" msgstr "" #: purchase/templates/purchase/snippets/report_no_payment_method.html:6 -msgid "Basket ID" +msgid "Basket" msgstr "" #: purchase/templates/purchase/snippets/report_no_payment_method.html:7 diff --git a/src/purchase/locale/fr/LC_MESSAGES/django.po b/src/purchase/locale/fr/LC_MESSAGES/django.po index a35b884..8c04375 100644 --- a/src/purchase/locale/fr/LC_MESSAGES/django.po +++ b/src/purchase/locale/fr/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-26 21:11+0200\n" +"POT-Creation-Date: 2022-04-26 23:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -43,64 +43,64 @@ msgstr "créé à" msgid "updated at" msgstr "mis à jour à" -#: purchase/models.py:37 purchase/models.py:69 +#: purchase/models.py:42 purchase/models.py:83 msgid "name" msgstr "nom" -#: purchase/models.py:42 purchase/models.py:152 +#: purchase/models.py:47 purchase/models.py:170 msgid "payment method" msgstr "moyen de paiement" -#: purchase/models.py:43 +#: purchase/models.py:48 msgid "payment methods" msgstr "moyens de paiement" -#: purchase/models.py:70 +#: purchase/models.py:84 msgid "image" msgstr "image" -#: purchase/models.py:72 +#: purchase/models.py:86 msgid "unit price (cents)" msgstr "prix unitaire (centimes)" -#: purchase/models.py:72 +#: purchase/models.py:86 msgid "unit price in cents" msgstr "prix unitaire en centimes" -#: purchase/models.py:75 +#: purchase/models.py:89 msgid "display order" msgstr "ordre d'affichage" -#: purchase/models.py:82 purchase/models.py:180 +#: purchase/models.py:96 purchase/models.py:198 msgid "product" msgstr "produit" -#: purchase/models.py:83 +#: purchase/models.py:97 msgid "products" msgstr "produits" -#: purchase/models.py:158 purchase/models.py:186 +#: purchase/models.py:176 purchase/models.py:204 msgid "basket" msgstr "panier" -#: purchase/models.py:159 +#: purchase/models.py:177 msgid "baskets" msgstr "paniers" -#: purchase/models.py:162 +#: purchase/models.py:180 #, python-format msgid "Basket #%(id)s" msgstr "Panier n°%(id)s" -#: purchase/models.py:188 +#: purchase/models.py:206 msgid "quantity" msgstr "quantité" -#: purchase/models.py:193 +#: purchase/models.py:211 msgid "basket item" msgstr "article de panier" -#: purchase/models.py:194 +#: purchase/models.py:212 msgid "basket items" msgstr "articles de panier" @@ -137,51 +137,51 @@ msgid_plural "%(counter)s items" msgstr[0] "1 article" msgstr[1] "%(counter)s articles" -#: purchase/templates/purchase/reports.html:6 +#: purchase/templates/purchase/reports.html:11 msgid "Reports" msgstr "Rapports" -#: purchase/templates/purchase/reports.html:7 +#: purchase/templates/purchase/reports.html:12 msgid "General" msgstr "Général" -#: purchase/templates/purchase/reports.html:9 +#: purchase/templates/purchase/reports.html:14 msgid "Total turnover:" msgstr "Chiffre d'affaires total :" -#: purchase/templates/purchase/reports.html:10 +#: purchase/templates/purchase/reports.html:15 msgid "Average basket:" msgstr "Panier moyen :" -#: purchase/templates/purchase/reports.html:13 +#: purchase/templates/purchase/reports.html:18 msgid "By day" msgstr "Par jour" -#: purchase/templates/purchase/reports.html:14 +#: purchase/templates/purchase/reports.html:19 #: purchase/templates/purchase/snippets/report_payment_methods.html:8 #: purchase/templates/purchase/snippets/report_products.html:8 msgid "Turnover" msgstr "Chiffre d'affaires" -#: purchase/templates/purchase/reports.html:20 +#: purchase/templates/purchase/reports.html:25 msgid "Average basket" msgstr "Panier moyen" -#: purchase/templates/purchase/reports.html:29 +#: purchase/templates/purchase/reports.html:34 msgid "Products" msgstr "Produits" -#: purchase/templates/purchase/reports.html:33 +#: purchase/templates/purchase/reports.html:38 msgid "Turnover by payment method" msgstr "Chiffre d'affaires par moyen de paiement" -#: purchase/templates/purchase/reports.html:36 +#: purchase/templates/purchase/reports.html:41 msgid "Baskets without payment method" msgstr "Paniers sans moyen de paiement" #: purchase/templates/purchase/snippets/report_no_payment_method.html:6 -msgid "Basket ID" -msgstr "Id de panier" +msgid "Basket" +msgstr "Panier" #: purchase/templates/purchase/snippets/report_no_payment_method.html:7 msgid "Price" @@ -231,3 +231,6 @@ msgstr "Nombre de paniers par heure" #: purchase/views/reports.py:118 msgid "Turnover by hour" msgstr "Chiffre d'affaires par heure" + +#~ msgid "Basket ID" +#~ msgstr "Id de panier" diff --git a/src/purchase/templates/purchase/snippets/report_no_payment_method.html b/src/purchase/templates/purchase/snippets/report_no_payment_method.html index 485ad4b..18fc5b3 100644 --- a/src/purchase/templates/purchase/snippets/report_no_payment_method.html +++ b/src/purchase/templates/purchase/snippets/report_no_payment_method.html @@ -3,7 +3,7 @@ - +
{% translate "Basket ID" %}{% translate "Basket" %} {% translate "Price" %}