From 32be355fd8bf7ab23b83f2e4c1f6b3e5ccd8f643 Mon Sep 17 00:00:00 2001 From: detraz Date: Sun, 2 Sep 2018 18:07:43 +0200 Subject: [PATCH 1/2] Corrections de front buttons et labels cotisations --- cotisations/locale/fr/LC_MESSAGES/django.mo | Bin 16996 -> 16926 bytes cotisations/locale/fr/LC_MESSAGES/django.po | 22 +++++++----------- .../templates/cotisations/control.html | 2 +- cotisations/templates/cotisations/delete.html | 2 +- .../templates/cotisations/edit_facture.html | 4 ++-- .../templates/cotisations/facture.html | 8 +++---- .../templates/cotisations/payment.html | 2 +- cotisations/views.py | 4 ++-- 8 files changed, 20 insertions(+), 24 deletions(-) diff --git a/cotisations/locale/fr/LC_MESSAGES/django.mo b/cotisations/locale/fr/LC_MESSAGES/django.mo index b5a65357c7cdca3510ade884242d8b729da0eb65..3a1671bbfcbedf829e2923ff601b75f00d441560 100644 GIT binary patch delta 4591 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 UWi4?7KMSp-Q>X21A9z*tzulzVyZ`_I diff --git a/cotisations/locale/fr/LC_MESSAGES/django.po b/cotisations/locale/fr/LC_MESSAGES/django.po index 129d4d72..15f6a057 100644 --- a/cotisations/locale/fr/LC_MESSAGES/django.po +++ b/cotisations/locale/fr/LC_MESSAGES/django.po @@ -681,8 +681,9 @@ msgstr "" #: templates/cotisations/delete.html:38 #: templates/cotisations/edit_facture.html:60 +#: views.py:181 views.py:235 msgid "Confirm" -msgstr "Confirmer" +msgstr "Valider" #: templates/cotisations/edit_facture.html:31 #: templates/cotisations/facture.html:30 @@ -695,12 +696,13 @@ msgstr "Modifier la facture" #: templates/cotisations/edit_facture.html:41 #: templates/cotisations/facture.html:56 -msgid "Invoice's articles" -msgstr "Articles de la facture" +#: templates/cotisations/index_article.html:30 +msgid "Articles" +msgstr "Articles" #: templates/cotisations/facture.html:37 -msgid "New invoice" -msgstr "Nouvelle facture" +msgid "Buy" +msgstr "Acheter une cotisation" #: templates/cotisations/facture.html:40 #, python-format @@ -713,8 +715,8 @@ msgid "Current balance: %(balance)s €" msgstr "Solde actuel : %(balance)s €" #: templates/cotisations/facture.html:70 -msgid "Add an article" -msgstr "Ajouter un article" +msgid "Add an extra article" +msgstr "Ajouter un article supplémentaire" #: templates/cotisations/facture.html:72 msgid "Total price: 0,00 €" @@ -728,9 +730,6 @@ msgstr "Factures" msgid "Subscriptions" msgstr "Cotisations" -#: templates/cotisations/index_article.html:30 -msgid "Articles" -msgstr "Articles" #: templates/cotisations/index_article.html:33 msgid "Article types list" @@ -812,9 +811,6 @@ msgstr "Contrôler les factures" msgid "You need to choose at least one article." msgstr "Vous devez choisir au moins un article." -#: views.py:181 views.py:235 -msgid "Create" -msgstr "Créer" #: views.py:228 msgid "The custom invoice was created." diff --git a/cotisations/templates/cotisations/control.html b/cotisations/templates/cotisations/control.html index 6a4a5cca..483c150c 100644 --- a/cotisations/templates/cotisations/control.html +++ b/cotisations/templates/cotisations/control.html @@ -105,7 +105,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endfor %} {% trans "Edit" as tr_edit %} - {% bootstrap_button tr_edit button_type='submit' icon='star' %} + {% bootstrap_button tr_edit button_type='submit' icon='ok' button_class='btn-success' %} {% endblock %} diff --git a/cotisations/templates/cotisations/delete.html b/cotisations/templates/cotisations/delete.html index dc06e5a5..58ce8ad2 100644 --- a/cotisations/templates/cotisations/delete.html +++ b/cotisations/templates/cotisations/delete.html @@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% blocktrans %}Warning: are you sure you really want to delete this {{ object_name }} object ( {{ objet }} )?{% endblocktrans %} {% trans "Confirm" as tr_confirm %} - {% bootstrap_button tr_confirm button_type='submit' icon='trash' %} + {% bootstrap_button tr_confirm button_type='submit' icon='trash' button_class='btn-danger' %} {% endblock %} diff --git a/cotisations/templates/cotisations/edit_facture.html b/cotisations/templates/cotisations/edit_facture.html index 9ddcac8c..a00084f6 100644 --- a/cotisations/templates/cotisations/edit_facture.html +++ b/cotisations/templates/cotisations/edit_facture.html @@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

{% trans "Edit the invoice" %}

{% massive_bootstrap_form factureform 'user' %} {{ venteform.management_form }} -

{% trans "Invoice's articles" %}

+

{% trans "Articles" %}

@@ -58,7 +58,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endfor %}
{% trans "Confirm" as tr_confirm %} - {% bootstrap_button tr_confirm button_type='submit' icon='star' %} + {% bootstrap_button tr_confirm button_type='submit' icon='ok' button_class='btn-success' %} {% endblock %} diff --git a/cotisations/templates/cotisations/facture.html b/cotisations/templates/cotisations/facture.html index 4f905160..1f87f579 100644 --- a/cotisations/templates/cotisations/facture.html +++ b/cotisations/templates/cotisations/facture.html @@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% if title %}

{{ title }}

{% else %} -

{% trans "New invoice" %}

+

{% trans "Buy" %}

{% endif %} {% if max_balance %}

{% blocktrans %}Maximum allowed balance: {{ max_balance }} €{% endblocktrans %}

@@ -53,7 +53,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endif %} {% if articlesformset %} -

{% trans "Invoice's articles" %}

+

{% trans "Articles" %}

{{ articlesformset.management_form }} {% for articlesform in articlesformset.forms %} @@ -67,12 +67,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endfor %} - +

{% blocktrans %}Total price: 0,00 €{% endblocktrans %}

{% endif %} - {% bootstrap_button action_name button_type='submit' icon='star' %} + {% bootstrap_button action_name button_type='submit' icon='ok' button_class='btn-success' %} {% if articlesformset or payment_method%} diff --git a/cotisations/templates/cotisations/payment.html b/cotisations/templates/cotisations/payment.html index 997168fd..ecd90ed8 100644 --- a/cotisations/templates/cotisations/payment.html +++ b/cotisations/templates/cotisations/payment.html @@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% bootstrap_form form %} {% endif %} {% trans "Pay" as tr_pay %} - {% bootstrap_button tr_pay button_type='submit' icon='piggy-bank' %} + {% bootstrap_button tr_pay button_type='submit' icon='piggy-bank' button_class='btn-success' %} {% endblock %} diff --git a/cotisations/views.py b/cotisations/views.py index 35a97545..9241f209 100644 --- a/cotisations/views.py +++ b/cotisations/views.py @@ -169,7 +169,7 @@ def new_facture(request, user, userid): 'articlesformset': article_formset, 'articlelist': article_list, 'balance': balance, - 'action_name': _('Create'), + 'action_name': _('Confirm'), }, 'cotisations/facture.html', request ) @@ -218,7 +218,7 @@ def new_custom_invoice(request): return form({ 'factureform': invoice_form, - 'action_name': _("Create"), + 'action_name': _("Confirm"), 'articlesformset': articles_formset, 'articlelist': articles }, 'cotisations/facture.html', request) From dacf1e461599a4d2b3ef6304c91233db3a55913a Mon Sep 17 00:00:00 2001 From: detraz Date: Sun, 2 Sep 2018 18:28:54 +0200 Subject: [PATCH 2/2] Correction des boutons sur les autres apps --- machines/templates/machines/delete.html | 2 +- machines/templates/machines/edit_portlist.html | 2 +- machines/templates/machines/machine.html | 2 +- preferences/templates/preferences/edit_preferences.html | 2 +- preferences/templates/preferences/preferences.html | 2 +- topologie/templates/topologie/delete.html | 2 +- topologie/templates/topologie/switch.html | 2 +- topologie/templates/topologie/topo.html | 2 +- topologie/templates/topologie/topo_more.html | 2 +- users/templates/users/delete.html | 2 +- users/templates/users/user.html | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/machines/templates/machines/delete.html b/machines/templates/machines/delete.html index 1c9811f2..ae365c69 100644 --- a/machines/templates/machines/delete.html +++ b/machines/templates/machines/delete.html @@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% csrf_token %}

{% blocktrans %}Warning: are you sure you want to delete this object {{ objet_name }} ( {{ objet }} )?{% endblocktrans %}

{% trans "Confirm" as tr_confirm %} - {% bootstrap_button tr_confirm button_type="submit" icon="trash" %} + {% bootstrap_button tr_confirm button_type="submit" icon='trash' button_class='btn-danger' %}

diff --git a/machines/templates/machines/edit_portlist.html b/machines/templates/machines/edit_portlist.html index d6a5e9df..5bb8723f 100644 --- a/machines/templates/machines/edit_portlist.html +++ b/machines/templates/machines/edit_portlist.html @@ -51,7 +51,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

{% trans "Create or edit" as tr_create_or_edit %} - {% bootstrap_button tr_create_or_edit button_type="submit" icon="star" %} + {% bootstrap_button tr_create_or_edit icon='ok' button_class='btn-success' %}