Projet

Général

Profil

0001-fields-use-clear-text-instead-of-plain-5824.patch

Frédéric Péters, 29 octobre 2014 16:43

Télécharger (1,7 ko)

Voir les différences:

Subject: [PATCH] fields: use "clear text" instead of "plain" (#5824)

 po/fr.po           | 4 ++--
 wcs/fields.py      | 2 +-
 wcs/qommon/form.py | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
po/fr.po
3279 3279
msgstr "Mélanger les éléments"
3280 3280

  
3281 3281
#: ../wcs/fields.py:1448
3282
msgid "Plain"
3283
msgstr "Plain (en clair)"
3282
msgid "Clear text"
3283
msgstr "Texte clair"
3284 3284

  
3285 3285
#: ../wcs/fields.py:1449
3286 3286
msgid "MD5"
wcs/fields.py
1510 1510

  
1511 1511
    def fill_admin_form(self, form):
1512 1512
        WidgetField.fill_admin_form(self, form)
1513
        formats = [('plain', _('Plain')),
1513
        formats = [('cleartext', _('Clear text')),
1514 1514
            ('md5', _('MD5')),
1515 1515
            ('sha1', _('SHA1')),
1516 1516
            ]
wcs/qommon/form.py
1866 1866
            pwd1 = None
1867 1867

  
1868 1868
        PASSWORD_FORMATS = {
1869
            'plain': lambda x: x,
1870
            'md5':   lambda x: hashlib.md5(x).hexdigest(),
1871
            'sha1':  lambda x: hashlib.sha1(x).hexdigest(),
1869
            'cleartext': lambda x: x,
1870
            'md5': lambda x: hashlib.md5(x).hexdigest(),
1871
            'sha1': lambda x: hashlib.sha1(x).hexdigest(),
1872 1872
        }
1873 1873

  
1874 1874
        if pwd1:
1875
-