heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Marked relevant strings in python views/forms for translation via ugettext

Browse Source
This commit is contained in:
Christopher Allan Webber
2011-08-08 22:53:39 -05:00
parent 03e5bd6d35
commit 4b1adc132c
6 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mediagoblin/auth/forms.py
View File

@@ -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()])

18
mediagoblin/auth/views.py
View File

@@ -21,6 +21,7 @@ from webob import exc
from mediagoblin import messages
from mediagoblin import mg_globals
from mediagoblin.util import render_to_response, redirect
from mediagoblin.util import pass_to_ugettext as _
from mediagoblin.db.util import ObjectId
from mediagoblin.auth import lib as auth_lib
from mediagoblin.auth import forms as auth_forms
@@ -36,7 +37,7 @@ def register(request):
messages.add_message(
request,
messages.WARNING,
('Sorry, registration is disabled on this instance.'))
_('Sorry, registration is disabled on this instance.'))
return redirect(request, "index")
register_form = auth_forms.RegistrationForm(request.POST)
@@ -51,7 +52,7 @@ def register(request):
if users_with_username:
register_form.username.errors.append(
u'Sorry, a user with that name already exists.')
_(u'Sorry, a user with that name already exists.'))
else:
# Create the user
@@ -148,12 +149,13 @@ def verify_email(request):
messages.add_message(
request,
messages.SUCCESS,
('Your email address has been verified. '
'You may now login, edit your profile, and submit images!'))
_("Your email address has been verified. "
"You may now login, edit your profile, and submit images!"))
else:
messages.add_message(request,
messages.ERROR,
'The verification key or user id is incorrect')
messages.add_message(
request,
messages.ERROR,
_('The verification key or user id is incorrect'))
return redirect(
request, 'mediagoblin.user_pages.user_home',
@@ -174,7 +176,7 @@ def resend_activation(request):
messages.add_message(
request,
messages.INFO,
'Resent your verification email.')
_('Resent your verification email.'))
return redirect(
request, 'mediagoblin.user_pages.user_home',
user=request.user['username'])