add translations for cotisations/

cotisations/forms.py

@@ -116,7 +116,7 @@ class DiscountForm(Form):
     Form used in oder to create a discount on an invoice.
     """
     is_relative = forms.BooleanField(
-        label=_("Discount is on percentage"),
+        label=_("Discount is on percentage."),
         required=False,
     )
     discount = forms.DecimalField(
@@ -310,8 +310,8 @@ class RechargeForm(FormRevMixin, Form):
         if balance_method.maximum_balance is not None and \
            value + self.user.solde > balance_method.maximum_balance:
             raise forms.ValidationError(
-                _("Requested amount is too high. Your balance can't exceed \
-                %(max_online_balance)s €.") % {
+                _("Requested amount is too high. Your balance can't exceed"
+                  " %(max_online_balance)s €.") % {
                     'max_online_balance': balance_method.maximum_balance
                 }
             )

cotisations/models.py

@@ -341,7 +341,7 @@ class CostEstimate(CustomInvoice):
                             "to delete a cost estimate.")
         if self.final_invoice is not None:
             return False, _("The cost estimate has an "
-                            "invoice and cannot be deleted.")
+                            "invoice and can't be deleted.")
         return True, None
 
 

cotisations/payment_methods/note_kfet/views.py

@@ -57,7 +57,7 @@ def note_payment(request, facture, factureid):
     user = facture.user
     payment_method = find_payment_method(facture.paiement)
     if not payment_method or not isinstance(payment_method, NotePayment):
-        messages.error(request, "Erreur inconnue")
+        messages.error(request, _("Unknown error."))
         return redirect(reverse(
             'users:profil',
             kwargs={'userid': user.id}
@@ -85,7 +85,7 @@ def note_payment(request, facture, factureid):
                 )
         facture.valid = True
         facture.save()
-        messages.success(request, "Le paiement par note a bien été effectué")
+        messages.success(request, _("The payment with note was done."))
         return redirect(reverse(
             'users:profil',
             kwargs={'userid': user.id}

cotisations/templates/cotisations/aff_article.html

@@ -49,9 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         <td>{{ article.available_for_everyone | tick }}</td>
         <td class="text-right">
             {% can_edit article %}
-            <a class="btn btn-primary btn-sm" role="button" title="{% trans "Edit" %}" href="{% url 'cotisations:edit-article' article.id %}">
-                <i class="fa fa-edit"></i>
-            </a>
+            {% include 'buttons/edit.html' with href='cotisations:edit-article' id=article.id %}
             {% acl_end %}
             {% history_button article %}
         </td>

cotisations/templates/cotisations/aff_cost_estimate.html

@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <div class="table-responsive">
     {% if cost_estimate_list.paginator %}
-    {% include 'pagination.html' with list=cost_estimate_list%}
+        {% include 'pagination.html' with list=cost_estimate_list%}
     {% endif %}
 
     <table class="table table-striped">
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <tr>
                 <th>
                     {% trans "Recipient" as tr_recip %}
-                    {% include 'buttons/sort.html' with prefix='invoice' col='user' text=tr_user %}
+                    {% include 'buttons/sort.html' with prefix='invoice' col='user' text=tr_recip %}
                 </th>
                 <th>{% trans "Designation" %}</th>
                 <th>{% trans "Total price" %}</th>
@@ -96,6 +96,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     </table>
 
     {% if custom_invoice_list.paginator %}
-    {% include 'pagination.html' with list=custom_invoice_list %}
+        {% include 'pagination.html' with list=custom_invoice_list %}
     {% endif %}
 </div>

cotisations/templates/cotisations/aff_cotisations.html

@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <div class="table-responsive">
 {% if facture_list.paginator %}
-{% include 'pagination.html' with list=facture_list %}
+    {% include 'pagination.html' with list=facture_list %}
 {% endif %}
 
     <table class="table table-striped">
@@ -89,7 +89,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     </table>
 
 {% if facture_list.paginator %}
-{% include 'pagination.html' with list=facture_list %}
+    {% include 'pagination.html' with list=facture_list %}
 {% endif %}
 </div>
 

cotisations/templates/cotisations/aff_custom_invoice.html

@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <div class="table-responsive">
     {% if custom_invoice_list.paginator %}
-    {% include 'pagination.html' with list=custom_invoice_list %}
+        {% include 'pagination.html' with list=custom_invoice_list %}
     {% endif %}
 
     <table class="table table-striped">
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <tr>
                 <th>
                     {% trans "Recipient" as tr_recip %}
-                    {% include 'buttons/sort.html' with prefix='invoice' col='user' text=tr_user %}
+                    {% include 'buttons/sort.html' with prefix='invoice' col='user' text=tr_recip %}
                 </th>
                 <th>{% trans "Designation" %}</th>
                 <th>{% trans "Total price" %}</th>
@@ -51,7 +51,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                     {% include 'buttons/sort.html' with prefix='invoice' col='id' text=tr_invoice_id %}
                 </th>
                 <th>
-                    {% trans "Paid" as tr_invoice_paid%}
+                    {% trans "Paid" as tr_invoice_paid %}
                     {% include 'buttons/sort.html' with prefix='invoice' col='paid' text=tr_invoice_paid %}
                 </th>
                 <th></th>
@@ -84,6 +84,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     </table>
 
     {% if custom_invoice_list.paginator %}
-    {% include 'pagination.html' with list=custom_invoice_list %}
+        {% include 'pagination.html' with list=custom_invoice_list %}
     {% endif %}
 </div>

cotisations/templates/cotisations/aff_paiement.html

@@ -45,9 +45,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         </td>
         <td class="text-right">
             {% can_edit paiement %}
-            <a class="btn btn-primary btn-sm" role="button" title="{% trans "Edit" %}" href="{% url 'cotisations:edit-paiement' paiement.id %}">
-                <i class="fa fa-edit"></i>
-            </a>
+            {% include 'buttons/edit.html' with href='cotisations:edit-paiement' id=paiement.id %}
             {% acl_end %}
             {% history_button paiement %}
         </td>

cotisations/templates/cotisations/control.html

-{% extends "cotisations/sidebar.html" %}
+{% extends 'cotisations/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <h2>{% trans "Invoice control and validation" %}</h2>
 
 {% if facture_list.paginator %}
-{% include 'pagination.html' with list=facture_list %}
+    {% include 'pagination.html' with list=facture_list %}
 {% endif %}
 
 <form class="form" method="post">
@@ -110,6 +110,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% endblock %}
 {% if facture_list.paginator %}
-{% include 'pagination.html' with list=facture_list %}
+    {% include 'pagination.html' with list=facture_list %}
 {% endif %}
 

cotisations/templates/cotisations/delete.html

-{% extends "machines/sidebar.html" %}
+{% extends 'cotisations/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en

cotisations/templates/cotisations/edit_facture.html

-{% extends "cotisations/sidebar.html" %}
+{% extends 'cotisations/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% if title %}
     <h3>{{title}}</h3>
     {% else %}
-    <h3>{% trans "Edit the invoice" %}</h3>
+    <h3>{% trans "Edit invoice" %}</h3>
     {% endif %}
     {% massive_bootstrap_form factureform 'user' %}
     {{ venteform.management_form }}

cotisations/templates/cotisations/facture.html

-{% extends "cotisations/sidebar.html" %}
+{% extends 'cotisations/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en

cotisations/templates/cotisations/index.html

-{% extends "cotisations/sidebar.html" %}
+{% extends 'cotisations/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en

cotisations/templates/cotisations/index_article.html

-{% extends "cotisations/sidebar.html" %}
+{% extends 'cotisations/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Articles" %}{% endblock %}
 
 {% block content %}
-    <h2>{% trans "Article types list" %}</h2>
+    <h2>{% trans "List of article types" %}</h2>
     {% can_create Article %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:add-article' %}">
         <i class="fa fa-cart-plus"></i> {% trans "Add an article type" %}

cotisations/templates/cotisations/index_banque.html

-{% extends "cotisations/sidebar.html" %}
+{% extends 'cotisations/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Banks" %}{% endblock %}
 
 {% block content %}
-    <h2>{% trans "Banks list" %}</h2>
+    <h2>{% trans "List of banks" %}</h2>
     {% can_create Banque %}
     <a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:add-banque' %}">
         <i class="fa fa-cart-plus"></i> {% trans "Add a bank" %}

cotisations/templates/cotisations/index_cost_estimate.html

-{% extends "cotisations/sidebar.html" %}
+{% extends 'cotisations/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -28,9 +28,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Cost estimates" %}{% endblock %}
 
 {% block content %}
-<h2>{% trans "Cost estimates list" %}</h2>
+<h2>{% trans "List of cost estimates" %}</h2>
 {% can_create CostEstimate %}
-{% include "buttons/add.html" with href='cotisations:new-cost-estimate'%}
+{% include 'buttons/add.html' with href='cotisations:new-cost-estimate'%}
 {% acl_end %}
 {% include 'cotisations/aff_cost_estimate.html' %}
 {% endblock %}

cotisations/templates/cotisations/index_custom_invoice.html

-{% extends "cotisations/sidebar.html" %}
+{% extends 'cotisations/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -28,9 +28,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block title %}{% trans "Custom invoices" %}{% endblock %}
 
 {% block content %}
-<h2>{% trans "Custom invoices list" %}</h2>
+<h2>{% trans "List of custom invoices" %}</h2>
 {% can_create CustomInvoice %}
-{% include "buttons/add.html" with href='cotisations:new-custom-invoice'%}
+{% include 'buttons/add.html' with href='cotisations:new-custom-invoice'%}
 {% acl_end %}
 {% include 'cotisations/aff_custom_invoice.html' with custom_invoice_list=custom_invoice_list %}
 {% endblock %}

cotisations/templates/cotisations/index_paiement.html

-{% extends "cotisations/sidebar.html" %}
+{% extends 'cotisations/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en

cotisations/templates/cotisations/payment.html

-{% extends "cotisations/sidebar.html" %}
+{% extends 'cotisations/sidebar.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en

cotisations/templates/cotisations/sidebar.html

-{% extends "base.html" %}
+{% extends 'base.html' %}
 {% comment %}
 Re2o est un logiciel d'administration développé initiallement au rezometz. Il
 se veut agnostique au réseau considéré, de manière à être installable en
@@ -28,40 +28,40 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block sidebar %}
     {% can_create CustomInvoice %}
-    <a class="list-group-item list-group-item-success" href="{% url "cotisations:new-custom-invoice" %}">
+    <a class="list-group-item list-group-item-success" href="{% url 'cotisations:new-custom-invoice' %}">
         <i class="fa fa-plus"></i> {% trans "Create an invoice" %}
     </a>
-    <a class="list-group-item list-group-item-warning" href="{% url "cotisations:control" %}">
+    <a class="list-group-item list-group-item-warning" href="{% url 'cotisations:control' %}">
         <i class="fa fa-eye"></i> {% trans "Control the invoices" %}
     </a>
     {% acl_end %}
     {% can_view_all Facture %}
-    <a class="list-group-item list-group-item-info" href="{% url "cotisations:index" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'cotisations:index' %}">
         <i class="fa fa-list-ul"></i> {% trans "Invoices" %}
     </a>
     {% acl_end %}
     {% can_view_all CustomInvoice %}
-    <a class="list-group-item list-group-item-info" href="{% url "cotisations:index-custom-invoice" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'cotisations:index-custom-invoice' %}">
         <i class="fa fa-list-ul"></i> {% trans "Custom invoices" %}
     </a>
     {% acl_end %}
     {% can_view_all CostEstimate %}
-    <a class="list-group-item list-group-item-info" href="{% url "cotisations:index-cost-estimate" %}">
-        <i class="fa fa-list-ul"></i> {% trans "Cost estimate" %}
+    <a class="list-group-item list-group-item-info" href="{% url 'cotisations:index-cost-estimate' %}">
+        <i class="fa fa-list-ul"></i> {% trans "Cost estimates" %}
     </a>
     {% acl_end %}
     {% can_view_all Article %}
-    <a class="list-group-item list-group-item-info" href="{% url "cotisations:index-article" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'cotisations:index-article' %}">
         <i class="fa fa-list-ul"></i> {% trans "Available articles" %}
     </a>
     {% acl_end %}
     {% can_view_all Banque %}
-    <a class="list-group-item list-group-item-info" href="{% url "cotisations:index-banque" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'cotisations:index-banque' %}">
         <i class="fa fa-list-ul"></i> {% trans "Banks" %}
     </a>
     {% acl_end %}
     {% can_view_all Paiement %}
-    <a class="list-group-item list-group-item-info" href="{% url "cotisations:index-paiement" %}">
+    <a class="list-group-item list-group-item-info" href="{% url 'cotisations:index-paiement' %}">
         <i class="fa fa-list-ul"></i> {% trans "Payment methods" %}
     </a>
     {% acl_end %}

cotisations/views.py

@@ -421,7 +421,7 @@ def edit_cost_estimate(request, invoice, **kwargs):
     return form({
         'factureform': invoice_form,
         'venteform': purchase_form,
-        'title': "Edit the cost estimate"
+        'title': _("Edit cost estimate")
     }, 'cotisations/edit_facture.html', request)
 
 
@@ -531,7 +531,7 @@ def del_cost_estimate(request, estimate, **_kwargs):
         return redirect(reverse('cotisations:index-cost-estimate'))
     return form({
         'objet': estimate,
-        'objet_name': _("Cost Estimate")
+        'objet_name': _("Cost estimate")
     }, 'cotisations/delete.html', request)
 
 
@@ -833,8 +833,8 @@ def del_banque(request, instances):
             except ProtectedError:
                 messages.error(
                     request,
-                    _("The bank %(bank_name)s can't be deleted \
-                    because there are invoices using it.") % {
+                    _("The bank %(bank_name)s can't be deleted because there"
+                      " are invoices using it.") % {
                         'bank_name': bank_del
                     }
                 )