Commit 1cc5d7bb authored by chirac's avatar chirac

Merge branch 'translation' into 'dev'

Translation

See merge request federez/re2o!396
parents 54a5dca8 1c28c2d1
Pipeline #944 failed with stage
...@@ -28,7 +28,7 @@ done. ...@@ -28,7 +28,7 @@ done.
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import Permission from django.contrib.auth.models import Permission
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext as _
def _create_api_permission(): def _create_api_permission():
...@@ -71,4 +71,5 @@ def can_view(user): ...@@ -71,4 +71,5 @@ def can_view(user):
'codename': settings.API_PERMISSION_CODENAME 'codename': settings.API_PERMISSION_CODENAME
} }
can = user.has_perm('%(app_label)s.%(codename)s' % kwargs) can = user.has_perm('%(app_label)s.%(codename)s' % kwargs)
return can, None if can else _("You cannot see this application.") return can, None if can else _("You don't have the right to see this"
" application.")
...@@ -46,6 +46,6 @@ class ExpiringTokenAuthentication(TokenAuthentication): ...@@ -46,6 +46,6 @@ class ExpiringTokenAuthentication(TokenAuthentication):
) )
utc_now = datetime.datetime.now(datetime.timezone.utc) utc_now = datetime.datetime.now(datetime.timezone.utc)
if token.created < utc_now - token_duration: if token.created < utc_now - token_duration:
raise exceptions.AuthenticationFailed(_('Token has expired')) raise exceptions.AuthenticationFailed(_("The token has expired."))
return token.user, token return token.user, token
# 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
# quelques clics.
#
# Copyright © 2018 Maël Kervella
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
msgid ""
msgstr ""
"Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-01-08 23:06+0100\n"
"PO-Revision-Date: 2019-01-07 01:37+0100\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language-Team: \n"
"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: acl.py:74
msgid "You don't have the right to see this application."
msgstr "Vous n'avez pas le droit de voir cette application."
#: authentication.py:49
msgid "The token has expired."
msgstr "Le jeton a expiré."
...@@ -116,7 +116,7 @@ class DiscountForm(Form): ...@@ -116,7 +116,7 @@ class DiscountForm(Form):
Form used in oder to create a discount on an invoice. Form used in oder to create a discount on an invoice.
""" """
is_relative = forms.BooleanField( is_relative = forms.BooleanField(
label=_("Discount is on percentage"), label=_("Discount is on percentage."),
required=False, required=False,
) )
discount = forms.DecimalField( discount = forms.DecimalField(
...@@ -310,8 +310,8 @@ class RechargeForm(FormRevMixin, Form): ...@@ -310,8 +310,8 @@ class RechargeForm(FormRevMixin, Form):
if balance_method.maximum_balance is not None and \ if balance_method.maximum_balance is not None and \
value + self.user.solde > balance_method.maximum_balance: value + self.user.solde > balance_method.maximum_balance:
raise forms.ValidationError( raise forms.ValidationError(
_("Requested amount is too high. Your balance can't exceed \ _("Requested amount is too high. Your balance can't exceed"
%(max_online_balance)s €.") % { " %(max_online_balance)s €.") % {
'max_online_balance': balance_method.maximum_balance 'max_online_balance': balance_method.maximum_balance
} }
) )
......
This diff is collapsed.
...@@ -341,7 +341,7 @@ class CostEstimate(CustomInvoice): ...@@ -341,7 +341,7 @@ class CostEstimate(CustomInvoice):
"to delete a cost estimate.") "to delete a cost estimate.")
if self.final_invoice is not None: if self.final_invoice is not None:
return False, _("The cost estimate has an " return False, _("The cost estimate has an "
"invoice and cannot be deleted.") "invoice and can't be deleted.")
return True, None return True, None
......
...@@ -57,7 +57,7 @@ def note_payment(request, facture, factureid): ...@@ -57,7 +57,7 @@ def note_payment(request, facture, factureid):
user = facture.user user = facture.user
payment_method = find_payment_method(facture.paiement) payment_method = find_payment_method(facture.paiement)
if not payment_method or not isinstance(payment_method, NotePayment): if not payment_method or not isinstance(payment_method, NotePayment):
messages.error(request, "Erreur inconnue") messages.error(request, _("Unknown error."))
return redirect(reverse( return redirect(reverse(
'users:profil', 'users:profil',
kwargs={'userid': user.id} kwargs={'userid': user.id}
...@@ -85,7 +85,7 @@ def note_payment(request, facture, factureid): ...@@ -85,7 +85,7 @@ def note_payment(request, facture, factureid):
) )
facture.valid = True facture.valid = True
facture.save() 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( return redirect(reverse(
'users:profil', 'users:profil',
kwargs={'userid': user.id} kwargs={'userid': user.id}
......
...@@ -49,9 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -49,9 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>{{ article.available_for_everyone | tick }}</td> <td>{{ article.available_for_everyone | tick }}</td>
<td class="text-right"> <td class="text-right">
{% can_edit article %} {% can_edit article %}
<a class="btn btn-primary btn-sm" role="button" title="{% trans "Edit" %}" href="{% url 'cotisations:edit-article' article.id %}"> {% include 'buttons/edit.html' with href='cotisations:edit-article' id=article.id %}
<i class="fa fa-edit"></i>
</a>
{% acl_end %} {% acl_end %}
{% history_button article %} {% history_button article %}
</td> </td>
......
...@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div class="table-responsive"> <div class="table-responsive">
{% if cost_estimate_list.paginator %} {% if cost_estimate_list.paginator %}
{% include 'pagination.html' with list=cost_estimate_list%} {% include 'pagination.html' with list=cost_estimate_list%}
{% endif %} {% endif %}
<table class="table table-striped"> <table class="table table-striped">
...@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<tr> <tr>
<th> <th>
{% trans "Recipient" as tr_recip %} {% 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>
<th>{% trans "Designation" %}</th> <th>{% trans "Designation" %}</th>
<th>{% trans "Total price" %}</th> <th>{% trans "Total price" %}</th>
...@@ -96,6 +96,6 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -96,6 +96,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</table> </table>
{% if custom_invoice_list.paginator %} {% if custom_invoice_list.paginator %}
{% include 'pagination.html' with list=custom_invoice_list %} {% include 'pagination.html' with list=custom_invoice_list %}
{% endif %} {% endif %}
</div> </div>
...@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div class="table-responsive"> <div class="table-responsive">
{% if facture_list.paginator %} {% if facture_list.paginator %}
{% include 'pagination.html' with list=facture_list %} {% include 'pagination.html' with list=facture_list %}
{% endif %} {% endif %}
<table class="table table-striped"> <table class="table table-striped">
...@@ -89,7 +89,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -89,7 +89,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</table> </table>
{% if facture_list.paginator %} {% if facture_list.paginator %}
{% include 'pagination.html' with list=facture_list %} {% include 'pagination.html' with list=facture_list %}
{% endif %} {% endif %}
</div> </div>
...@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div class="table-responsive"> <div class="table-responsive">
{% if custom_invoice_list.paginator %} {% if custom_invoice_list.paginator %}
{% include 'pagination.html' with list=custom_invoice_list %} {% include 'pagination.html' with list=custom_invoice_list %}
{% endif %} {% endif %}
<table class="table table-striped"> <table class="table table-striped">
...@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<tr> <tr>
<th> <th>
{% trans "Recipient" as tr_recip %} {% 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>
<th>{% trans "Designation" %}</th> <th>{% trans "Designation" %}</th>
<th>{% trans "Total price" %}</th> <th>{% trans "Total price" %}</th>
...@@ -51,7 +51,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -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 %} {% include 'buttons/sort.html' with prefix='invoice' col='id' text=tr_invoice_id %}
</th> </th>
<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 %} {% include 'buttons/sort.html' with prefix='invoice' col='paid' text=tr_invoice_paid %}
</th> </th>
<th></th> <th></th>
...@@ -84,6 +84,6 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -84,6 +84,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</table> </table>
{% if custom_invoice_list.paginator %} {% if custom_invoice_list.paginator %}
{% include 'pagination.html' with list=custom_invoice_list %} {% include 'pagination.html' with list=custom_invoice_list %}
{% endif %} {% endif %}
</div> </div>
...@@ -45,9 +45,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -45,9 +45,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</td> </td>
<td class="text-right"> <td class="text-right">
{% can_edit paiement %} {% can_edit paiement %}
<a class="btn btn-primary btn-sm" role="button" title="{% trans "Edit" %}" href="{% url 'cotisations:edit-paiement' paiement.id %}"> {% include 'buttons/edit.html' with href='cotisations:edit-paiement' id=paiement.id %}
<i class="fa fa-edit"></i>
</a>
{% acl_end %} {% acl_end %}
{% history_button paiement %} {% history_button paiement %}
</td> </td>
......
{% extends "cotisations/sidebar.html" %} {% extends 'cotisations/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 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., ...@@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<h2>{% trans "Invoice control and validation" %}</h2> <h2>{% trans "Invoice control and validation" %}</h2>
{% if facture_list.paginator %} {% if facture_list.paginator %}
{% include 'pagination.html' with list=facture_list %} {% include 'pagination.html' with list=facture_list %}
{% endif %} {% endif %}
<form class="form" method="post"> <form class="form" method="post">
...@@ -110,6 +110,6 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -110,6 +110,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endblock %} {% endblock %}
{% if facture_list.paginator %} {% if facture_list.paginator %}
{% include 'pagination.html' with list=facture_list %} {% include 'pagination.html' with list=facture_list %}
{% endif %} {% endif %}
{% extends "machines/sidebar.html" %} {% extends 'cotisations/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 se veut agnostique au réseau considéré, de manière à être installable en
......
{% extends "cotisations/sidebar.html" %} {% extends 'cotisations/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 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., ...@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if title %} {% if title %}
<h3>{{title}}</h3> <h3>{{title}}</h3>
{% else %} {% else %}
<h3>{% trans "Edit the invoice" %}</h3> <h3>{% trans "Edit invoice" %}</h3>
{% endif %} {% endif %}
{% massive_bootstrap_form factureform 'user' %} {% massive_bootstrap_form factureform 'user' %}
{{ venteform.management_form }} {{ venteform.management_form }}
......
{% extends "cotisations/sidebar.html" %} {% extends 'cotisations/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 se veut agnostique au réseau considéré, de manière à être installable en
......
{% extends "cotisations/sidebar.html" %} {% extends 'cotisations/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 se veut agnostique au réseau considéré, de manière à être installable en
......
{% extends "cotisations/sidebar.html" %} {% extends 'cotisations/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 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., ...@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block title %}{% trans "Articles" %}{% endblock %} {% block title %}{% trans "Articles" %}{% endblock %}
{% block content %} {% block content %}
<h2>{% trans "Article types list" %}</h2> <h2>{% trans "List of article types" %}</h2>
{% can_create Article %} {% can_create Article %}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:add-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" %} <i class="fa fa-cart-plus"></i> {% trans "Add an article type" %}
......
{% extends "cotisations/sidebar.html" %} {% extends 'cotisations/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 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., ...@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block title %}{% trans "Banks" %}{% endblock %} {% block title %}{% trans "Banks" %}{% endblock %}
{% block content %} {% block content %}
<h2>{% trans "Banks list" %}</h2> <h2>{% trans "List of banks" %}</h2>
{% can_create Banque %} {% can_create Banque %}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:add-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" %} <i class="fa fa-cart-plus"></i> {% trans "Add a bank" %}
......
{% extends "cotisations/sidebar.html" %} {% extends 'cotisations/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 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., ...@@ -28,9 +28,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block title %}{% trans "Cost estimates" %}{% endblock %} {% block title %}{% trans "Cost estimates" %}{% endblock %}
{% block content %} {% block content %}
<h2>{% trans "Cost estimates list" %}</h2> <h2>{% trans "List of cost estimates" %}</h2>
{% can_create CostEstimate %} {% 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 %} {% acl_end %}
{% include 'cotisations/aff_cost_estimate.html' %} {% include 'cotisations/aff_cost_estimate.html' %}
{% endblock %} {% endblock %}
{% extends "cotisations/sidebar.html" %} {% extends 'cotisations/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 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., ...@@ -28,9 +28,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block title %}{% trans "Custom invoices" %}{% endblock %} {% block title %}{% trans "Custom invoices" %}{% endblock %}
{% block content %} {% block content %}
<h2>{% trans "Custom invoices list" %}</h2> <h2>{% trans "List of custom invoices" %}</h2>
{% can_create CustomInvoice %} {% 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 %} {% acl_end %}
{% include 'cotisations/aff_custom_invoice.html' with custom_invoice_list=custom_invoice_list %} {% include 'cotisations/aff_custom_invoice.html' with custom_invoice_list=custom_invoice_list %}
{% endblock %} {% endblock %}
{% extends "cotisations/sidebar.html" %} {% extends 'cotisations/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 se veut agnostique au réseau considéré, de manière à être installable en
......
{% extends "cotisations/sidebar.html" %} {% extends 'cotisations/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 se veut agnostique au réseau considéré, de manière à être installable en
......
{% extends "base.html" %} {% extends 'base.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 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., ...@@ -28,40 +28,40 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block sidebar %} {% block sidebar %}
{% can_create CustomInvoice %} {% 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" %} <i class="fa fa-plus"></i> {% trans "Create an invoice" %}
</a> </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" %} <i class="fa fa-eye"></i> {% trans "Control the invoices" %}
</a> </a>
{% acl_end %} {% acl_end %}
{% can_view_all Facture %} {% 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" %} <i class="fa fa-list-ul"></i> {% trans "Invoices" %}
</a> </a>
{% acl_end %} {% acl_end %}
{% can_view_all CustomInvoice %} {% 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" %} <i class="fa fa-list-ul"></i> {% trans "Custom invoices" %}
</a> </a>
{% acl_end %} {% acl_end %}
{% can_view_all CostEstimate %} {% can_view_all CostEstimate %}
<a class="list-group-item list-group-item-info" href="{% url "cotisations:index-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 estimate" %} <i class="fa fa-list-ul"></i> {% trans "Cost estimates" %}
</a> </a>
{% acl_end %} {% acl_end %}
{% can_view_all Article %} {% 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" %} <i class="fa fa-list-ul"></i> {% trans "Available articles" %}
</a> </a>
{% acl_end %} {% acl_end %}
{% can_view_all Banque %} {% 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" %} <i class="fa fa-list-ul"></i> {% trans "Banks" %}
</a> </a>
{% acl_end %} {% acl_end %}
{% can_view_all Paiement %} {% 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" %} <i class="fa fa-list-ul"></i> {% trans "Payment methods" %}
</a> </a>
{% acl_end %} {% acl_end %}
......
...@@ -421,7 +421,7 @@ def edit_cost_estimate(request, invoice, **kwargs): ...@@ -421,7 +421,7 @@ def edit_cost_estimate(request, invoice, **kwargs):
return form({ return form({
'factureform': invoice_form, 'factureform': invoice_form,
'venteform': purchase_form, 'venteform': purchase_form,
'title': "Edit the cost estimate" 'title': _("Edit cost estimate")
}, 'cotisations/edit_facture.html', request) }, 'cotisations/edit_facture.html', request)
...@@ -531,7 +531,7 @@ def del_cost_estimate(request, estimate, **_kwargs): ...@@ -531,7 +531,7 @@ def del_cost_estimate(request, estimate, **_kwargs):
return redirect(reverse('cotisations:index-cost-estimate')) return redirect(reverse('cotisations:index-cost-estimate'))
return form({ return form({
'objet': estimate, 'objet': estimate,
'objet_name': _("Cost Estimate") 'objet_name': _("Cost estimate")
}, 'cotisations/delete.html', request) }, 'cotisations/delete.html', request)
...@@ -833,8 +833,8 @@ def del_banque(request, instances): ...@@ -833,8 +833,8 @@ def del_banque(request, instances):
except ProtectedError: except ProtectedError:
messages.error( messages.error(
request, request,
_("The bank %(bank_name)s can't be deleted \ _("The bank %(bank_name)s can't be deleted because there"
because there are invoices using it.") % { " are invoices using it.") % {
'bank_name': bank_del 'bank_name': bank_del
} }
) )
......
...@@ -21,7 +21,7 @@ msgid "" ...@@ -21,7 +21,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.5\n" "Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-15 20:12+0200\n" "POT-Creation-Date: 2019-01-08 23:16+0100\n"
"PO-Revision-Date: 2018-06-23 16:01+0200\n" "PO-Revision-Date: 2018-06-23 16:01+0200\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n" "Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language-Team: \n" "Language-Team: \n"
...@@ -57,7 +57,7 @@ msgstr "Commentaire" ...@@ -57,7 +57,7 @@ msgstr "Commentaire"
#: templates/logs/aff_stats_logs.html:58 templates/logs/aff_summary.html:62 #: templates/logs/aff_stats_logs.html:58 templates/logs/aff_summary.html:62
#: templates/logs/aff_summary.html:85 templates/logs/aff_summary.html:104 #: templates/logs/aff_summary.html:85 templates/logs/aff_summary.html:104
#: templates/logs/aff_summary.html:123 templates/logs/aff_summary.html:142 #: templates/logs/aff_summary.html:128 templates/logs/aff_summary.html:147
msgid "Cancel" msgid "Cancel"
msgstr "Annuler" msgstr "Annuler"
...@@ -113,15 +113,19 @@ msgstr "%(username)s a mis à jour" ...@@ -113,15 +113,19 @@ msgstr "%(username)s a mis à jour"
#: templates/logs/aff_summary.html:113 #: templates/logs/aff_summary.html:113
#, python-format #, python-format
msgid "%(username)s has sold %(number)sx %(name)s to" msgid "%(username)s has sold %(number)sx %(name)s"
msgstr "%(username)s a vendu %(number)sx %(name)s à" msgstr "%(username)s a vendu %(number)sx %(name)s"
#: templates/logs/aff_summary.html:116 #: templates/logs/aff_summary.html:116
msgid " to"
msgstr " à"
#: templates/logs/aff_summary.html:119
#, python-format #, python-format
msgid "+%(duration)s months" msgid "+%(duration)s months"
msgstr "+%(duration)s mois" msgstr "+%(duration)s mois"
#: templates/logs/aff_summary.html:132