From d7d9a44894c62fd08370765e2b1abb60b22e4f76 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Thu, 20 Apr 2023 12:14:25 +0200 Subject: [PATCH] Change create titles (again) --- nummi/main/locale/fr/LC_MESSAGES/django.mo | Bin 3253 -> 3431 bytes nummi/main/locale/fr/LC_MESSAGES/django.po | 90 ++++++++++++------ nummi/main/templates/main/base.html | 8 +- nummi/main/templates/main/form/account.html | 6 ++ nummi/main/templates/main/form/base.html | 6 +- nummi/main/templates/main/form/category.html | 6 ++ nummi/main/templates/main/form/invoice.html | 6 ++ nummi/main/templates/main/form/snapshot.html | 6 ++ .../main/templates/main/form/transaction.html | 6 ++ 9 files changed, 97 insertions(+), 37 deletions(-) diff --git a/nummi/main/locale/fr/LC_MESSAGES/django.mo b/nummi/main/locale/fr/LC_MESSAGES/django.mo index fc30c45b81ed7411923231df086571f7a204816d..c753bf09e03a4db2c762d8ceab3fd2774faeeda9 100644 GIT binary patch delta 1671 zcmY+ETS$~q5XZ;7rQ6j@WoE6H?516{dudh_MVb&sM8vkNW!SE)yH+o4^i&T)wnR|S zQw2s6A`(OeWduD)6!;=x1%gp8MbJ}GzyI#pvf-Qgo$Jh;Ip6mU6phb~jpk)sGh`b& z53QJFb_iBwV2~@BW_hq1X2aWXGQ1CGzyY`gzJysY10#AcxiAlEeF@b5O2}i&G1JV- ztd_=f26iL|?11b0p#pbyf6R~3wm8NEZ$Npz3+1^F=D;=5 zjOM>U`T6d~e>$c!srlS&iy5c0JbH3G2P%;gI0Y_o{k5*&0H-qE1a-0_Pzj%c1@H`< z4KG6;yMxgIdZFSxgo^V7l8ZghjwLs~atlYH9DagIF_$_HMW~jCAof6Q1PkDNxEw0*KFDJ&7_IX|5AUCaY3Ky!;9PhKYQt@)g}qRLA48pZ$juK! zV%n(VXQ=P|2jsDQ%B6WPR7I+wO1}nb-5!`m{6uh-RHBpWhp`CN$IqI-vXqwI4J9dA zi>^+za1M3fI{5~4D_V^%MmM5M&{A{_nv!KS6h9%gSbaLmP@=0)Sta!eODW+(RAraw z#gc4Bb!ElqO0)#ki6uIzs#vEEvLcB@g=ij2d?qTZ?rI&Xl1a)@{+PB2twh(Ox&|*Q zsYt?Vpx$g0k$~5aIUWk1P4(M?U7YU!ny2&yF# zs)xV|A(9XY!iQ+zEQlp4>Osh$DCj~j5he8due0Jq!~ExW=9`)C`)1CZ^QmyKAUcwp zdCgGjP%+9$H^vA5X3$V}WEqnScS09zhEw1nI1{$RE$|%7hC`Nd=%zmmHUAaV`Vl++ z5za8C#eC&qIs;?l29tvq223$j;7XVYw?a8+gjBPe#shs&feu0iIs&J{uFtA}#93(DbM$Xc@>YGE_fykk%fyP*PJu=cCgeiLflJv;sY=F@)+b6^6>|A;F( z9`FN(JPe=V95@E+)3C99*_((ehi#A{6N2;L3Ai0zw&O4D_&cb?Mxhe@2C3#Zjr?R_ z)XBJ`Jm{zj;Vf7V_0DTy@^V3C+6)!g59KHT6(DRWKk8qE@^>9--W{lQ{g7%N+5S_g zM54pikg$9U_0Hcz9n}}hUr-rm5=9BkhWZc+pl*8!)OZ!ttEz+Ahz}OP7C0ZCf%1O? z;y-G7dCrbx>Ws-A<9$x2 sw;|Nt5pi%Z-t$M|eRvE^SoS$bovwIaYC==&g*y?8dx{3WdrqeP1CAk?^#A|> diff --git a/nummi/main/locale/fr/LC_MESSAGES/django.po b/nummi/main/locale/fr/LC_MESSAGES/django.po index 71dbd28..64b2199 100644 --- a/nummi/main/locale/fr/LC_MESSAGES/django.po +++ b/nummi/main/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-20 12:05+0200\n" +"POT-Creation-Date: 2023-04-20 12:13+0200\n" "PO-Revision-Date: 2022-12-21 17:30+0100\n" "Last-Translator: edpibu \n" "Language-Team: edpibu \n" @@ -66,7 +66,7 @@ msgstr "Catégorie" msgid "Budget" msgstr "Budget" -#: .\models.py:121 .\templates\main\form\snapshot.html:10 +#: .\models.py:121 .\templates\main\form\snapshot.html:16 #: .\templates\main\index.html:32 msgid "Categories" msgstr "Catégories" @@ -110,7 +110,7 @@ msgstr "Relevé du %(date)s" msgid "Statement" msgstr "Relevé" -#: .\models.py:204 .\templates\main\form\account.html:7 +#: .\models.py:204 .\templates\main\form\account.html:13 #: .\templates\main\list\snapshot.html:6 .\templates\main\list\snapshot.html:20 msgid "Statements" msgstr "Relevés" @@ -146,8 +146,8 @@ msgid "Payment" msgstr "Paiement" #: .\models.py:277 .\templates\main\base.html:50 -#: .\templates\main\form\account.html:11 .\templates\main\form\category.html:7 -#: .\templates\main\form\snapshot.html:14 .\templates\main\index.html:26 +#: .\templates\main\form\account.html:17 .\templates\main\form\category.html:13 +#: .\templates\main\form\snapshot.html:20 .\templates\main\index.html:26 #: .\templates\main\list\transaction.html:6 #: .\templates\main\list\transaction.html:23 #: .\templates\main\table\snapshot.html:28 @@ -158,7 +158,7 @@ msgstr "Transactions" msgid "Invoice" msgstr "Facture" -#: .\models.py:324 .\templates\main\form\transaction.html:5 +#: .\models.py:324 .\templates\main\form\transaction.html:11 msgid "Invoices" msgstr "Factures" @@ -174,21 +174,21 @@ msgstr "Accueil" msgid "Snapshots" msgstr "Relevés" -#: .\templates\main\base.html:56 -msgid "Create Account" -msgstr "Créer Compte" +#: .\templates\main\base.html:56 .\templates\main\form\account.html:5 +msgid "Create account" +msgstr "Créer un compte" -#: .\templates\main\base.html:61 -msgid "Create Snapshot" -msgstr "Créer Relevé" +#: .\templates\main\base.html:61 .\templates\main\form\snapshot.html:5 +msgid "Create snapshot" +msgstr "Créer un relevé" -#: .\templates\main\base.html:66 -msgid "Create Category" -msgstr "Créer Catégorie" +#: .\templates\main\base.html:66 .\templates\main\form\category.html:5 +msgid "Create category" +msgstr "Créer une catégorie" -#: .\templates\main\base.html:71 -msgid "Create Transaction" -msgstr "Créer Transaction" +#: .\templates\main\base.html:71 .\templates\main\form\transaction.html:4 +msgid "Create transaction" +msgstr "Créer une transaction" #: .\templates\main\base.html:79 msgid "Log out" @@ -211,15 +211,18 @@ msgstr "Annuler" msgid "Confirm" msgstr "Confirmer" -#: .\templates\main\form\account.html:13 .\templates\main\form\category.html:9 +#: .\templates\main\form\account.html:8 +msgid "New account" +msgstr "Nouveau compte" + +#: .\templates\main\form\account.html:19 .\templates\main\form\category.html:15 #: .\templates\main\index.html:28 msgid "History" msgstr "Historique" -#: .\templates\main\form\base.html:7 .\templates\main\form\base.html:28 -#, python-format -msgid "Create %(name)s" -msgstr "Créer %(name)s" +#: .\templates\main\form\category.html:8 +msgid "New category" +msgstr "Nouvelle catégorie" #: .\templates\main\form\form_base.html:29 #: .\templates\main\table\invoice.html:11 @@ -239,6 +242,23 @@ msgstr "Créer" msgid "Save" msgstr "Enregistrer" +#: .\templates\main\form\invoice.html:3 +msgid "Create invoice" +msgstr "Créer une facture" + +#: .\templates\main\form\invoice.html:6 .\templates\main\table\invoice.html:37 +msgid "New invoice" +msgstr "Nouvelle facture" + +#: .\templates\main\form\snapshot.html:8 +msgid "New snapshot" +msgstr "Nouveau relevés" + +#: .\templates\main\form\transaction.html:7 +#: .\templates\main\table\transaction.html:5 +msgid "New transaction" +msgstr "Nouvelle transaction" + #: .\templates\main\list\snapshot.html:27 msgid "No snapshots to show" msgstr "Aucun relevé à afficher" @@ -267,10 +287,6 @@ msgstr "Mois" msgid "No invoice" msgstr "Aucune facture" -#: .\templates\main\table\invoice.html:37 -msgid "New invoice" -msgstr "Nouvelle facture" - #: .\templates\main\table\snapshot.html:5 msgid "New statement" msgstr "Nouveau relevé" @@ -279,10 +295,22 @@ msgstr "Nouveau relevé" msgid "View all statements" msgstr "Voir tous les relevés" -#: .\templates\main\table\transaction.html:5 -msgid "New transaction" -msgstr "Nouvelle transaction" - #: .\templates\main\table\transaction.html:73 msgid "View all transactions" msgstr "Voir toutes les transactions" + +#~ msgid "Create Account" +#~ msgstr "Créer Compte" + +#~ msgid "Create Snapshot" +#~ msgstr "Créer Relevé" + +#~ msgid "Create Category" +#~ msgstr "Créer Catégorie" + +#~ msgid "Create Transaction" +#~ msgstr "Créer Transaction" + +#, python-format +#~ msgid "Create %(name)s" +#~ msgstr "Créer %(name)s" diff --git a/nummi/main/templates/main/base.html b/nummi/main/templates/main/base.html index c40f32b..9eb489c 100644 --- a/nummi/main/templates/main/base.html +++ b/nummi/main/templates/main/base.html @@ -53,22 +53,22 @@
  • {% translate "Create Account" %} + accesskey="a">{% translate "Create account" %}
  • {% translate "Create Snapshot" %} + accesskey="s">{% translate "Create snapshot" %}
  • {% translate "Create Category" %} + accesskey="c">{% translate "Create category" %}
  • {% translate "Create Transaction" %} + accesskey="t">{% translate "Create transaction" %}
  • {% blocktranslate with name=instance|verbose_name %}Create {{ name }}{% endblocktranslate %} +

    + {% block h1_new %}{% endblock %} +

    {% else %}

    {% block h1 %}{{ instance }}{% endblock %} diff --git a/nummi/main/templates/main/form/category.html b/nummi/main/templates/main/form/category.html index b07b45e..5dea5c2 100644 --- a/nummi/main/templates/main/form/category.html +++ b/nummi/main/templates/main/form/category.html @@ -1,6 +1,12 @@ {% extends "main/form/base.html" %} {% load main_extras %} {% load i18n %} +{% block title_new %} + {% translate "Create category" %} +{% endblock %} +{% block h1_new %} + {% translate "New category" %} +{% endblock %} {% block h1 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %} {% block tables %} {% if form.instance.transactions %} diff --git a/nummi/main/templates/main/form/invoice.html b/nummi/main/templates/main/form/invoice.html index 53171dc..5b3b473 100644 --- a/nummi/main/templates/main/form/invoice.html +++ b/nummi/main/templates/main/form/invoice.html @@ -1 +1,7 @@ {% extends "main/form/base.html" %} +{% block title_new %} + {% translate "Create invoice" %} +{% endblock %} +{% block h1_new %} + {% translate "New invoice" %} +{% endblock %} diff --git a/nummi/main/templates/main/form/snapshot.html b/nummi/main/templates/main/form/snapshot.html index 31e639a..aa8aec2 100644 --- a/nummi/main/templates/main/form/snapshot.html +++ b/nummi/main/templates/main/form/snapshot.html @@ -1,6 +1,12 @@ {% extends "main/form/base.html" %} {% load main_extras %} {% load i18n %} +{% block title_new %} + {% translate "Create snapshot" %} +{% endblock %} +{% block h1_new %} + {% translate "New snapshot" %} +{% endblock %} {% block h1 %} {{ form.instance.sum|check:form.instance.diff }} {{ form.instance }} diff --git a/nummi/main/templates/main/form/transaction.html b/nummi/main/templates/main/form/transaction.html index 77d19b2..81e648b 100644 --- a/nummi/main/templates/main/form/transaction.html +++ b/nummi/main/templates/main/form/transaction.html @@ -1,5 +1,11 @@ {% extends "main/form/base.html" %} {% load i18n %} +{% block title_new %} + {% translate "Create transaction" %} +{% endblock %} +{% block h1_new %} + {% translate "New transaction" %} +{% endblock %} {% block tables %} {% if not form.instance.adding %}

    {% translate "Invoices" %}