From 4b1adc132cf45507e2f910122992230d428c6856 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Mon, 8 Aug 2011 22:53:39 -0500
Subject: Marked relevant strings in python views/forms for translation via
 ugettext

---
 mediagoblin/auth/forms.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'mediagoblin/auth/forms.py')

diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py
index 7bc0aeb1..1b6bc7c2 100644
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -16,34 +16,36 @@
 
 import wtforms
 
+from mediagoblin.util import pass_to_ugettext as _
+
 
 class RegistrationForm(wtforms.Form):
     username = wtforms.TextField(
-        'Username',
+        _('Username'),
         [wtforms.validators.Required(),
          wtforms.validators.Length(min=3, max=30),
          wtforms.validators.Regexp(r'^\w+$')])
     password = wtforms.PasswordField(
-        'Password',
+        _('Password'),
         [wtforms.validators.Required(),
          wtforms.validators.Length(min=6, max=30),
          wtforms.validators.EqualTo(
                 'confirm_password',
-                'Passwords must match.')])
+                _('Passwords must match.'))])
     confirm_password = wtforms.PasswordField(
-        'Confirm password',
+        _('Confirm password'),
         [wtforms.validators.Required()])
     email = wtforms.TextField(
-        'Email address',
+        _('Email address'),
         [wtforms.validators.Required(),
          wtforms.validators.Email()])
 
 
 class LoginForm(wtforms.Form):
     username = wtforms.TextField(
-        'Username',
+        _('Username'),
         [wtforms.validators.Required(),
          wtforms.validators.Regexp(r'^\w+$')])
     password = wtforms.PasswordField(
-        'Password',
+        _('Password'),
         [wtforms.validators.Required()])
-- 
cgit v1.2.3


From 7960ac985f9b5a80063f21012d53793cb2d22dd9 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 10 Aug 2011 12:07:59 -0500
Subject: Converting all forms to use the "fake/null" gettext conversion
 function

Gettext doesn't actually get run right in the form but we do need to
wrap the strings in _() so stuff extracts :)
---
 mediagoblin/auth/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/auth/forms.py')

diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py
index 1b6bc7c2..917909c5 100644
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -16,7 +16,7 @@
 
 import wtforms
 
-from mediagoblin.util import pass_to_ugettext as _
+from mediagoblin.util import fake_ugettext_passthrough as _
 
 
 class RegistrationForm(wtforms.Form):
-- 
cgit v1.2.3