From 433ee298dc7703005c63b298ab76df8b340d3e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= Date: Sun, 8 Apr 2018 17:41:45 +0000 Subject: [PATCH] Translation: Mark all strings in templates of cotisation --- .../templates/cotisations/aff_article.html | 15 ++-- .../templates/cotisations/aff_banque.html | 7 +- .../cotisations/aff_cotisations.html | 86 ++++++++++++------- .../templates/cotisations/aff_paiement.html | 11 +-- .../templates/cotisations/control.html | 64 ++++++++++---- cotisations/templates/cotisations/delete.html | 15 ++-- .../templates/cotisations/edit_facture.html | 18 ++-- .../templates/cotisations/facture.html | 5 +- cotisations/templates/cotisations/index.html | 10 +-- .../templates/cotisations/index_article.html | 22 ++--- .../templates/cotisations/index_banque.html | 22 ++--- .../templates/cotisations/index_paiement.html | 22 ++--- .../templates/cotisations/new_facture.html | 59 +++++++------ .../cotisations/new_facture_solde.html | 57 ++++++------ .../templates/cotisations/payment.html | 18 ++-- .../templates/cotisations/recharge.html | 22 +++-- .../templates/cotisations/sidebar.html | 19 ++-- 17 files changed, 275 insertions(+), 197 deletions(-) diff --git a/cotisations/templates/cotisations/aff_article.html b/cotisations/templates/cotisations/aff_article.html index 833b7de0..eb4ec0a7 100644 --- a/cotisations/templates/cotisations/aff_article.html +++ b/cotisations/templates/cotisations/aff_article.html @@ -23,15 +23,16 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endcomment %} {% load acl %} +{% load i18n %} - - - - - + + + + + @@ -44,11 +45,11 @@ with this program; if not, write to the Free Software Foundation, Inc., diff --git a/cotisations/templates/cotisations/aff_banque.html b/cotisations/templates/cotisations/aff_banque.html index 1ef4cb76..d9ec8d1c 100644 --- a/cotisations/templates/cotisations/aff_banque.html +++ b/cotisations/templates/cotisations/aff_banque.html @@ -23,11 +23,12 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endcomment %} {% load acl %} +{% load i18n %}
ArticlePrixType CotisationDurée (mois)Article pour{% trans "Article" %}{% trans "Price" %}{% trans "Cotisation type" %}{% trans "Duration (month)" %}{% trans "Concerned users" %}
{{ article.type_user }} {% can_edit article %} - + {% acl_end %} - +
- + @@ -36,11 +37,11 @@ with this program; if not, write to the Free Software Foundation, Inc., diff --git a/cotisations/templates/cotisations/aff_cotisations.html b/cotisations/templates/cotisations/aff_cotisations.html index 48a856a2..fdb575ed 100644 --- a/cotisations/templates/cotisations/aff_cotisations.html +++ b/cotisations/templates/cotisations/aff_cotisations.html @@ -23,20 +23,34 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endcomment %} {% load acl %} +{% load i18n %} +
{% if facture_list.paginator %} -{% include "pagination.html" with list=facture_list %} +{% include 'pagination.html' with list=facture_list %} {% endif %}
Banque{% trans "Bank" %}
{{ banque.name }} {% can_edit banque %} - + {% acl_end %} - +
- - - - - - + + + + + + @@ -50,39 +64,49 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endfor %}
{% include "buttons/sort.html" with prefix='cotis' col='user' text='Utilisateur' %}DesignationPrix total{% include "buttons/sort.html" with prefix='cotis' col='paiement' text='Moyen de paiement' %}{% include "buttons/sort.html" with prefix='cotis' col='date' text='Date' %}{% include "buttons/sort.html" with prefix='cotis' col='id' text='Id facture' %} + {% trans "User" as tr_user %} + {% include 'buttons/sort.html' with prefix='cotis' col='user' text=tr_user %} + {% trans "Designation" %}{% trans "Total price" %} + {% trans "Payment method" as tr_payment_method %} + {% include 'buttons/sort.html' with prefix='cotis' col='paiement' text=tr_payment_method %} + + {% trans "Date" as tr_date %} + {% include 'buttons/sort.html' with prefix='cotis' col='date' text=tr_date %} + + {% trans "Invoice id" as tr_invoice_id %} + {% include 'buttons/sort.html' with prefix='cotis' col='id' text=tr_invoice_id %} +
{{ facture.date }} {{ facture.id }} -
- -
    - {% can_edit facture %} -
  • Modifier
    • - {% acl_else %} -
  • Facture controlée
    • - {% acl_end %} - {% can_delete facture %} -
  • Supprimer
    • - {% acl_end %} -
  • Historique
    • -
-
+
+ + +
- {% if facture.valid %} + {% if facture.valid %} - - PDF + {% trans "PDF" %} - {% else %} - Facture invalide - {% endif %} + {% else %} + {% trans "Invalidated invoice" %} + {% endif %}
{% if facture_list.paginator %} -{% include "pagination.html" with list=facture_list %} +{% include 'pagination.html' with list=facture_list %} {% endif %} diff --git a/cotisations/templates/cotisations/aff_paiement.html b/cotisations/templates/cotisations/aff_paiement.html index 09e5acc3..63a5cf35 100644 --- a/cotisations/templates/cotisations/aff_paiement.html +++ b/cotisations/templates/cotisations/aff_paiement.html @@ -23,11 +23,12 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endcomment %} {% load acl %} +{% load i18n %} - + @@ -35,12 +36,12 @@ with this program; if not, write to the Free Software Foundation, Inc., diff --git a/cotisations/templates/cotisations/control.html b/cotisations/templates/cotisations/control.html index 48071429..cdd212e3 100644 --- a/cotisations/templates/cotisations/control.html +++ b/cotisations/templates/cotisations/control.html @@ -25,13 +25,14 @@ with this program; if not, write to the Free Software Foundation, Inc., {% load bootstrap3 %} {% load staticfiles%} +{% load i18n %} -{% block title %}Controle des factures{% endblock %} +{% block title %}{% trans "Invoice control" %}{% endblock %} {% block content %} -

Controle et validité des factures

+

{% trans "Invoice control and validation" %}

{% if facture_list.paginator %} -{% include "pagination.html" with list=facture_list %} +{% include 'pagination.html' with list=facture_list %} {% endif %} {% csrf_token %} @@ -39,24 +40,50 @@ with this program; if not, write to the Free Software Foundation, Inc.,
Moyen de paiement{% trans "Payment method" %}
{{ paiement.moyen }} - {% can_edit paiement %} - + {% can_edit paiement %} + - {% acl_end %} - + {% acl_end %} +
- - - - - - - - - - - + + + + + + + + + {% for form in controlform.forms %} {% bootstrap_form_errors form %} - - @@ -74,10 +101,11 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endfor %}
Profil{% include "buttons/sort.html" with prefix='control' col='name' text='Nom' %}{% include "buttons/sort.html" with prefix='control' col='surname' text='Prénom' %}{% include "buttons/sort.html" with prefix='control' col='id' text='Id facture' %}{% include "buttons/sort.html" with prefix='control' col='user-id' text='Id user' %}DesignationPrix total{% include "buttons/sort.html" with prefix='control' col='paiement' text='Moyen de paiement' %}{% include "buttons/sort.html" with prefix='control' col='date' text='Date' %}{% include "buttons/sort.html" with prefix='control' col='valid' text='Valide' %}{% include "buttons/sort.html" with prefix='control' col='control' text='Contrôlée' %}{% trans "Profil" %} + {% trans "Last name" as tr_last_name %} + {% include 'buttons/sort.html' with prefix='control' col='name' text=tr_last_name %} + + {% trans "First name" as tr_first_name %} + {% include 'buttons/sort.html' with prefix='control' col='surname' text=tr_first_name %} + + {% trans "Invoice id" as tr_invoice_id %} + {% include 'buttons/sort.html' with prefix='control' col='id' text=tr_invoice_id %} + + {% trans "User id" as tr_user_id %} + {% include 'buttons/sort.html' with prefix='control' col='user-id' text=tr_user_id %} + {% trans "Designation" %}{% trans "Total price" %} + {% trans "Payment method" as tr_payment_method %} + {% include 'buttons/sort.html' with prefix='control' col='paiement' text=tr_payment_method %} + + {% trans "Date" as tr_date %} + {% include 'buttons/sort.html' with prefix='control' col='date' text=tr_date %}< + /th> + + {% trans "Validated" as tr_validated %} + {% include 'buttons/sort.html' with prefix='control' col='valid' text=tr_validated %}< + /th> + + {% trans "Controlled" as tr_controlled %} + {% include 'buttons/sort.html' with prefix='control' col='control' text=tr_controlled %} +
+ + + + {{ form.instance.user.name }} {{ form.instance.user.surname }}
- {% bootstrap_button "Modifier" button_type="submit" icon="star" %} + {% trans "Edit" as tr_edit %} + {% bootstrap_button tr_edit button_type='submit' icon='star' %} {% endblock %} {% if facture_list.paginator %} -{% include "pagination.html" with list=facture_list %} +{% include 'pagination.html' with list=facture_list %} {% endif %} diff --git a/cotisations/templates/cotisations/delete.html b/cotisations/templates/cotisations/delete.html index 318be65d..8dbe142a 100644 --- a/cotisations/templates/cotisations/delete.html +++ b/cotisations/templates/cotisations/delete.html @@ -24,17 +24,20 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endcomment %} {% load bootstrap3 %} +{% load i18n %} -{% block title %}Création et modification de machines{% endblock %} +{% block title %}{% trans "Deletion of cotisations" %}{% endblock %} {% block content %}
{% csrf_token %} -

Attention, voulez-vous vraiment supprimer cet objet {{ objet_name }} ( {{ objet }} ) ?

- {% bootstrap_button "Confirmer" button_type="submit" icon="trash" %} +

+ {% blocktrans %} + Warning. Are you sure you really want te delete this this {{ object_name }} object ( {{ objet }} ) ? + {% endblocktrans %} +

+ {% trans "Confirm" as tr_confirm %} + {% bootstrap_button tr_confirm button_type='submit' icon='trash' %}
-
-
-
{% endblock %} diff --git a/cotisations/templates/cotisations/edit_facture.html b/cotisations/templates/cotisations/edit_facture.html index f1af2b8b..d28f8511 100644 --- a/cotisations/templates/cotisations/edit_facture.html +++ b/cotisations/templates/cotisations/edit_facture.html @@ -26,27 +26,28 @@ with this program; if not, write to the Free Software Foundation, Inc., {% load bootstrap3 %} {% load staticfiles%} {% load massive_bootstrap_form %} +{% load i18n %} -{% block title %}Création et modification de factures{% endblock %} +{% block title %}{% trans "Invoices creation and edition" %}{% endblock %} {% block content %} {% bootstrap_form_errors factureform %}
{% csrf_token %} -

Editer la facture

+

{% trans "Edit the invoice" %}

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

Articles de la facture

+

{% trans "Invoice's articles" %}

- - + + - {% for form in venteform.forms %} - {% bootstrap_form_errors form %} + {% for form in venteform.forms %} + {% bootstrap_form_errors form %} @@ -56,7 +57,8 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endfor %}
DésignationQuantité{% trans "Designation" %}{% trans "Quantity" %}
{{ form.name }} {{ form.number }}
- {% bootstrap_button "Créer ou modifier" button_type="submit" icon="star" %} + {% trans "Confirm" as tr_confirm %} + {% bootstrap_button tr_confirm button_type='submit' icon='star' %}
{% endblock %} diff --git a/cotisations/templates/cotisations/facture.html b/cotisations/templates/cotisations/facture.html index 5ed3e94e..69fcf2a4 100644 --- a/cotisations/templates/cotisations/facture.html +++ b/cotisations/templates/cotisations/facture.html @@ -25,8 +25,9 @@ with this program; if not, write to the Free Software Foundation, Inc., {% load bootstrap3 %} {% load staticfiles%} +{% load i18n %} -{% block title %}Création et modification de factures{% endblock %} +{% block title %}{% trans "invoices creation and edition" %}{% endblock %} {% block content %} {% bootstrap_form_errors factureform %} @@ -34,7 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% csrf_token %} {% bootstrap_form factureform %} - {% bootstrap_button action_name button_type="submit" icon="star" %} + {% bootstrap_button action_name button_type='submit' icon='star' %}
{% endblock %} diff --git a/cotisations/templates/cotisations/index.html b/cotisations/templates/cotisations/index.html index 52ff4689..9482cb5a 100644 --- a/cotisations/templates/cotisations/index.html +++ b/cotisations/templates/cotisations/index.html @@ -24,14 +24,12 @@ with this program; if not, write to the Free Software Foundation, Inc., {% endcomment %} {% load bootstrap3 %} +{% load i18n %} -{% block title %}Facture{% endblock %} +{% block title %}{% trans "Invoices" %}{% endblock %} {% block content %} -

Cotisations

- {% include "cotisations/aff_cotisations.html" with facture_list=facture_list %} -
-
-
+

{% trans "Cotisations" %}

+ {% include 'cotisations/aff_cotisations.html' with facture_list=facture_list %} {% endblock %} diff --git a/cotisations/templates/cotisations/index_article.html b/cotisations/templates/cotisations/index_article.html index 7803c2ca..24b1abde 100644 --- a/cotisations/templates/cotisations/index_article.html +++ b/cotisations/templates/cotisations/index_article.html @@ -25,18 +25,20 @@ with this program; if not, write to the Free Software Foundation, Inc., {% load bootstrap3 %} {% load acl %} +{% load i18n %} -{% block title %}Articles{% endblock %} +{% block title %}{% trans "Articles" %}{% endblock %} {% block content %} -

Liste des types d'articles

- {% can_create Article %} - Ajouter un type d'articles - {% acl_end %} - Supprimer un ou plusieurs types d'articles - {% include "cotisations/aff_article.html" with article_list=article_list %} -
-
-
+

{% trans "Article type list" %}

+ {% can_create Article %} + + {% trans "Add an article type" %} + + {% acl_end %} + + {% trans "Delete article types" %} + + {% include 'cotisations/aff_article.html' with article_list=article_list %} {% endblock %} diff --git a/cotisations/templates/cotisations/index_banque.html b/cotisations/templates/cotisations/index_banque.html index 77c23977..e9118d75 100644 --- a/cotisations/templates/cotisations/index_banque.html +++ b/cotisations/templates/cotisations/index_banque.html @@ -25,18 +25,20 @@ with this program; if not, write to the Free Software Foundation, Inc., {% load bootstrap3 %} {% load acl %} +{% load i18n %} -{% block title %}Banques{% endblock %} +{% block title %}{% trans "Banks" %}{% endblock %} {% block content %} -

Liste des banques

- {% can_create Banque %} - Ajouter une banque - {% acl_end %} - Supprimer une ou plusieurs banques - {% include "cotisations/aff_banque.html" with banque_list=banque_list %} -
-
-
+

{% trans "Banks list" %}

+ {% can_create Banque %} + + {% trans "Add a bank" %} + + {% acl_end %} + + {% trans "Delete banks" %} + + {% include 'cotisations/aff_banque.html' with banque_list=banque_list %} {% endblock %} diff --git a/cotisations/templates/cotisations/index_paiement.html b/cotisations/templates/cotisations/index_paiement.html index 414c6b38..d84c72eb 100644 --- a/cotisations/templates/cotisations/index_paiement.html +++ b/cotisations/templates/cotisations/index_paiement.html @@ -25,18 +25,20 @@ with this program; if not, write to the Free Software Foundation, Inc., {% load bootstrap3 %} {% load acl %} +{% load i18n %} -{% block title %}Paiements{% endblock %} +{% block title %}{% trans "Payments" %}{% endblock %} {% block content %} -

Liste des types de paiements

- {% can_create Paiement %} - Ajouter un type de paiement - {% acl_end %} - Supprimer un ou plusieurs types de paiements - {% include "cotisations/aff_paiement.html" with paiement_list=paiement_list %} -
-
-
+

{% trans "Payment types list" %}

+ {% can_create Paiement %} + + {% trans "Add a payment type" %} + + {% acl_end %} + + {% trans "Delete payment types" %} + + {% include 'cotisations/aff_paiement.html' with paiement_list=paiement_list %} {% endblock %} diff --git a/cotisations/templates/cotisations/new_facture.html b/cotisations/templates/cotisations/new_facture.html index 10aa69fd..4dab92d3 100644 --- a/cotisations/templates/cotisations/new_facture.html +++ b/cotisations/templates/cotisations/new_facture.html @@ -25,40 +25,45 @@ with this program; if not, write to the Free Software Foundation, Inc., {% load bootstrap3 %} {% load staticfiles%} +{% load i18n %} -{% block title %}Création et modification de factures{% endblock %} +{% block title %}{% trans "Invoices creation and edition" %}{% endblock %} {% block content %} {% bootstrap_form_errors factureform %}
{% csrf_token %} -

Nouvelle facture

+

{% trans "New invoice" %}

- Solde de l'utilisateur : {{ user.solde }} € + {% blocktrans %} + User's balance : {{ user.solde }} € + {% endblocktrans %}

{% bootstrap_form factureform %} {{ venteform.management_form }} -

Articles de la facture

+

{% trans "Invoice's articles" %}

- {% for form in venteform.forms %} + {% for form in venteform.forms %}
- Article :   - {% bootstrap_form form label_class='sr-only' %} -   - + {% trans "Article" %} :   + {% bootstrap_form form label_class='sr-only' %} +   +
- {% endfor %} + {% endfor %}
- +

- Prix total : 0,00 € + {% blocktrans %} + Total price : 0,00 € + {% endblocktrans %}

- {% bootstrap_button "Créer" button_type="submit" icon="star" %} + {% trans "Create" as tr_create %} + {% bootstrap_button tr_create button_type='submit' icon='star' %}