Projet

Général

Profil

0001-manager-use-ngettext-34237.patch

Benjamin Dauvergne, 22 juin 2019 22:25

Télécharger (4,18 ko)

Voir les différences:

Subject: [PATCH] manager: use ngettext (#34237)

 .../manager/locale/fr/LC_MESSAGES/django.po   | 36 ++++++++++++++-----
 .../manager/user_import_report.html           |  8 ++---
 2 files changed, 31 insertions(+), 13 deletions(-)
src/authentic2/manager/locale/fr/LC_MESSAGES/django.po
7 7
msgstr ""
8 8
"Project-Id-Version: authentic2\n"
9 9
"Report-Msgid-Bugs-To: \n"
10
"POT-Creation-Date: 2019-06-22 16:47+0200\n"
10
"POT-Creation-Date: 2019-06-22 22:23+0200\n"
11 11
"PO-Revision-Date: 2019-06-19 11:09+0200\n"
12 12
"Last-Translator: Benjamin Dauvergne <bdauvergne@entrouvert.com>\n"
13 13
"Language-Team: French <fr@li.org>\n"
......
986 986
msgstr "Résumé"
987 987

  
988 988
#: src/authentic2/manager/templates/authentic2/manager/user_import_report.html:80
989
msgid "rows"
990
msgstr "lignes"
989
#, python-format
990
msgid "%(rows)s row"
991
msgid_plural "%(rows)s rows"
992
msgstr[0] "%(rows)s ligne"
993
msgstr[1] "%(rows)s lignes"
991 994

  
992 995
#: src/authentic2/manager/templates/authentic2/manager/user_import_report.html:81
993
msgid "user(s) created"
994
msgstr "utilisateur(s) créé(s)"
996
#, python-format
997
msgid "%(created)s user created"
998
msgid_plural "%(created)s users created"
999
msgstr[0] "%(created)s utilisateur créé"
1000
msgstr[1] "%(created)s utilisateurs créés"
995 1001

  
996 1002
#: src/authentic2/manager/templates/authentic2/manager/user_import_report.html:82
997
msgid "user(s) updated"
998
msgstr "utilisateur(s) mis à jour"
1003
#, python-format
1004
msgid "%(updated)s user updated"
1005
msgid_plural "%(updated)s users updated"
1006
msgstr[0] "%(updated)s utilisateur mis à jour"
1007
msgstr[1] "%(updated)s utilisateurs mis à jour"
999 1008

  
1000 1009
#: src/authentic2/manager/templates/authentic2/manager/user_import_report.html:83
1001
msgid "rows have errors"
1002
msgstr "des lignes contiennent des erreurs"
1010
#, python-format
1011
msgid "%(error_rows)s row has error"
1012
msgid_plural "%(error_rows)s rows have errors"
1013
msgstr[0] "%(error_rows)s·avec des erreurs"
1014
msgstr[1] "%(error_rows)s·avec des erreurs"
1003 1015

  
1004 1016
#: src/authentic2/manager/templates/authentic2/manager/user_import_report.html:84
1005 1017
#, python-format
......
1186 1198
#: src/authentic2/manager/views.py:713
1187 1199
msgid "File is not in the expected JSON format."
1188 1200
msgstr "Le fichier n'est pas au format JSON attendu."
1201

  
1202
#~ msgid "rows"
1203
#~ msgstr "lignes"
1204

  
1205
#~ msgid "rows have errors"
1206
#~ msgstr "des lignes contiennent des erreurs"
src/authentic2/manager/templates/authentic2/manager/user_import_report.html
77 77
      {% endif %}
78 78
      <h3>{% trans "Abstract" %}</h3>
79 79
      <ul>
80
        <li>{{ importer.rows|length }} {% trans "rows" %}</li>
81
        <li>{{ importer.created }} {% trans "user(s) created" %}</li>
82
        <li>{{ importer.updated }} {% trans "user(s) updated" %}</li>
83
        <li>{{ importer.rows_with_errors }} {% trans "rows have errors" %}</li>
80
        <li>{% blocktrans count rows=importer.rows|length %}{{ rows }} row{% plural %}{{ rows }} rows{% endblocktrans %}</li>
81
        <li>{% blocktrans count created=importer.created %}{{ created }} user created{% plural %}{{ created }} users created{% endblocktrans %}</li>
82
        <li>{% blocktrans count updated=importer.updated %}{{ updated }} user updated{% plural %}{{ updated }} users updated{% endblocktrans %}</li>
83
        <li>{% blocktrans count error_rows=importer.rows_with_errors %}{{ error_rows }} row has error{% plural %}{{ error_rows }} rows have errors{% endblocktrans %}</li>
84 84
        <li>{% blocktrans with duration=report.duration %}import took {{ duration }}{% endblocktrans %}</li>
85 85
      </ul>
86 86
      <h3>{% trans "Details" %}</h3>
87
-