mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

newforms-admin: Fixed #6774, #7068 -- Use ugettext_lazy instead of ugettext in django/contrib/auth/forms.py. Marked a few strings for translation in the forms.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7449 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Brian Rosner 2008-04-23 16:02:25 +00:00
parent 0f5ffbf23e
commit 7b7f4bdee2
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
django/contrib/auth/forms.py
View File

@ -4,7 +4,7 @@ from django.contrib.sites.models import Site
from django.template import Context, loader from django.template import Context, loader
from django.core import validators from django.core import validators
from django import newforms as forms from django import newforms as forms
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
class UserCreationForm(forms.ModelForm): class UserCreationForm(forms.ModelForm):
""" """
@ -47,8 +47,8 @@ class AuthenticationForm(forms.Form):
Base class for authenticating users. Extend this to get a form that accepts Base class for authenticating users. Extend this to get a form that accepts
username/password logins. username/password logins.
""" """
username = forms.CharField(max_length=30) username = forms.CharField(label=_("Username"), max_length=30)
password = forms.CharField(max_length=30, widget=forms.PasswordInput) password = forms.CharField(label=_("Password"), max_length=30, widget=forms.PasswordInput)
def __init__(self, request=None, *args, **kwargs): def __init__(self, request=None, *args, **kwargs):
""" """
@ -88,7 +88,7 @@ class AuthenticationForm(forms.Form):
return self.user_cache return self.user_cache
class PasswordResetForm(forms.Form): class PasswordResetForm(forms.Form):
email = forms.EmailField(max_length=40) email = forms.EmailField(label=_("Email"), max_length=40)
def clean_email(self): def clean_email(self):
""" """
@ -129,9 +129,9 @@ class PasswordChangeForm(forms.Form):
""" """
A form that lets a user change his/her password. A form that lets a user change his/her password.
""" """
old_password = forms.CharField(max_length=30, widget=forms.PasswordInput) old_password = forms.CharField(label=_("Old password"), max_length=30, widget=forms.PasswordInput)
new_password1 = forms.CharField(max_length=30, widget=forms.PasswordInput) new_password1 = forms.CharField(label=_("New password"), max_length=30, widget=forms.PasswordInput)
new_password2 = forms.CharField(max_length=30, widget=forms.PasswordInput) new_password2 = forms.CharField(label=_("New password confirmation"), max_length=30, widget=forms.PasswordInput)
def __init__(self, user, *args, **kwargs): def __init__(self, user, *args, **kwargs):
self.user = user self.user = user
@ -164,8 +164,8 @@ class AdminPasswordChangeForm(forms.Form):
""" """
A form used to change the password of a user in the admin interface. A form used to change the password of a user in the admin interface.
""" """
password1 = forms.CharField(max_length=60, widget=forms.PasswordInput) password1 = forms.CharField(label=_("Password"), max_length=60, widget=forms.PasswordInput)
password2 = forms.CharField(max_length=60, widget=forms.PasswordInput) password2 = forms.CharField(label=_("Password (again)"), max_length=60, widget=forms.PasswordInput)
def __init__(self, user, *args, **kwargs): def __init__(self, user, *args, **kwargs):
self.user = user self.user = user