Merge branch 'master' of https://gitlab.crans.org/nounous/intranet

README.md

@@ -22,6 +22,7 @@ des applications se base sur les données `ldap` et nécessitent `lc_ldap`.
  * texlive-latex-extra
  * texlive-lang-french
  * snimpy
+ * python-snimpy
  * snmp-mibs-downloader
  * libfile-mimeinfo-perl
 

solde/locale/en/LC_MESSAGES/django.po

@@ -112,23 +112,23 @@ msgstr "Back"
 
 #: templates/solde/detail_transac.html:3
 #, python-format
-msgid "id transaction : %(tr.idTransaction)s"
-msgstr "transaction ID: %(tr.idTransaction)s"
+msgid "id transaction : %(idTransaction)s"
+msgstr "transaction ID: %(idTransaction)s"
 
 #: templates/solde/detail_transac.html:4
 #, python-format
-msgid "montant : %(tr.montant)s"
-msgstr "amount: %(tr.montant)s"
+msgid "montant : %(montant)s"
+msgstr "amount: %(montant)s"
 
 #: templates/solde/detail_transac.html:5
 #, python-format
-msgid "bénéficiaire : %(tr.uid)s"
-msgstr "recipient: %(tr.uid)s"
+msgid "bénéficiaire : %(uid)s"
+msgstr "recipient: %(uid)s"
 
 #: templates/solde/detail_transac.html:6
 #, python-format
-msgid "date : %(tr.created)s"
-msgstr "date: %(tr.created)s"
+msgid "date : %(created)s"
+msgstr "date: %(created)s"
 
 #: templates/solde/factures.html:6
 msgid "Mes factures Com'N'Pay/PayPal"

solde/locale/es/LC_MESSAGES/django.po

@@ -113,23 +113,23 @@ msgstr "Atrás"
 
 #: templates/solde/detail_transac.html:3
 #, python-format
-msgid "id transaction : %(tr.idTransaction)s"
-msgstr "Id transacción: %(tr.idTransaction)s"
+msgid "id transaction : %(idTransaction)s"
+msgstr "Id transacción: %(idTransaction)s"
 
 #: templates/solde/detail_transac.html:4
 #, python-format
-msgid "montant : %(tr.montant)s"
-msgstr "Importe: %(tr.montant)s"
+msgid "montant : %(montant)s"
+msgstr "Importe: %(montant)s"
 
 #: templates/solde/detail_transac.html:5
 #, python-format
-msgid "bénéficiaire : %(tr.uid)s"
-msgstr "Beneficiario: %(tr.uid)s"
+msgid "bénéficiaire : %(uid)s"
+msgstr "Beneficiario: %(uid)s"
 
 #: templates/solde/detail_transac.html:6
 #, python-format
-msgid "date : %(tr.created)s"
-msgstr "Fecha: %(tr.created)s"
+msgid "date : %(created)s"
+msgstr "Fecha: %(created)s"
 
 #: templates/solde/factures.html:6
 msgid "Mes factures Com'N'Pay/PayPal"

solde/templates/solde/credited.html

 {% extends "solde/base.html" %}
+{% load i18n %}
 {% block h1 %}{% trans "Transaction déjà validée" %}{% endblock %}
 {% block content %}
 {% include 'solde/detail_transac.html' %}

solde/templates/solde/detail_transac.html

 {% load i18n %}
 <ul>
-  <li>{% blocktrans %}id transaction : {{ tr.idTransaction }}{% endblocktrans %}</li>
-  <li>{% blocktrans %}montant : {{ tr.montant }}{% endblocktrans %}</li>
-  <li>{% blocktrans %}bénéficiaire : {{ tr.uid }}{% endblocktrans %}</li>
-  <li>{% blocktrans %}date : {{ tr.created }}{% endblocktrans %}</li>
+  <li>{% blocktrans with idTransaction=tr.idTransaction %}id transaction : {{ idTransaction }}{% endblocktrans %}</li>
+  <li>{% blocktrans with montant=tr.montant %}montant : {{ montant }}{% endblocktrans %}</li>
+  <li>{% blocktrans with uid=tr.uid %}bénéficiaire : {{ uid }}{% endblocktrans %}</li>
+  <li>{% blocktrans with created=tr.created %}date : {{ created }}{% endblocktrans %}</li>
 </ul>