From 751fd0349c056a79bbe05ffc93632bc075f03b63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Wed, 29 Oct 2014 16:40:45 +0100
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(-)

diff --git a/po/fr.po b/po/fr.po
index b610574..cb8a0ad 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3279,8 +3279,8 @@ msgid "Randomize Items"
 msgstr "Mélanger les éléments"
 
 #: ../wcs/fields.py:1448
-msgid "Plain"
-msgstr "Plain (en clair)"
+msgid "Clear text"
+msgstr "Texte clair"
 
 #: ../wcs/fields.py:1449
 msgid "MD5"
diff --git a/wcs/fields.py b/wcs/fields.py
index 22c8488..b50e74a 100644
--- a/wcs/fields.py
+++ b/wcs/fields.py
@@ -1510,7 +1510,7 @@ class PasswordField(WidgetField):
 
     def fill_admin_form(self, form):
         WidgetField.fill_admin_form(self, form)
-        formats = [('plain', _('Plain')),
+        formats = [('cleartext', _('Clear text')),
             ('md5', _('MD5')),
             ('sha1', _('SHA1')),
             ]
diff --git a/wcs/qommon/form.py b/wcs/qommon/form.py
index 6401f7c..2c98ded 100644
--- a/wcs/qommon/form.py
+++ b/wcs/qommon/form.py
@@ -1866,9 +1866,9 @@ $(function() {
             pwd1 = None
 
         PASSWORD_FORMATS = {
-            'plain': lambda x: x,
-            'md5':   lambda x: hashlib.md5(x).hexdigest(),
-            'sha1':  lambda x: hashlib.sha1(x).hexdigest(),
+            'cleartext': lambda x: x,
+            'md5': lambda x: hashlib.md5(x).hexdigest(),
+            'sha1': lambda x: hashlib.sha1(x).hexdigest(),
         }
 
         if pwd1:
-- 
2.1.1