Ticket #7068: auth_translations_v7436.diff

django/contrib/auth/forms.py

@@ -47 +47 @@
     Base class for authenticating users. Extend this to get a form that accepts
     username/password logins.
     """
-    username = forms.CharField(max_length=30)
-    password = forms.CharField(max_length=30, widget=forms.PasswordInput)
+    username = forms.CharField(label=_("Username"), max_length=30)
+    password = forms.CharField(label=_("Password"), max_length=30, widget=forms.PasswordInput)
     
     def __init__(self, request=None, *args, **kwargs):
         """
@@ -88 +88 @@
         return self.user_cache
 
 class PasswordResetForm(forms.Form):
-    email = forms.EmailField(max_length=40)
+    email = forms.EmailField(label=_("E-mail"), max_length=40)
     
     def clean_email(self):
         """
@@ -129 +129 @@
     """
     A form that lets a user change his/her password.
     """
-    old_password = forms.CharField(max_length=30, widget=forms.PasswordInput)
-    new_password1 = forms.CharField(max_length=30, widget=forms.PasswordInput)
-    new_password2 = 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(label=_("New password"), 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):
         self.user = user
@@ -164 +164 @@
     """
     A form used to change the password of a user in the admin interface.
     """
-    password1 = forms.CharField(max_length=60, widget=forms.PasswordInput)
-    password2 = forms.CharField(max_length=60, widget=forms.PasswordInput)
+    password1 = forms.CharField(label=_("Password"), max_length=60, widget=forms.PasswordInput)
+    password2 = forms.CharField(label=_("Password confirmation"), max_length=60, widget=forms.PasswordInput)
     
     def __init__(self, user, *args, **kwargs):
         self.user = user