From 19e3bc6223d2005ff3114f39340040a18d4537f7 Mon Sep 17 00:00:00 2001
From: James McMahon <james1345@googlemail.com>
Date: Wed, 19 Nov 2014 14:42:25 +0000
Subject: [PATCH 1/2] Changed password templates to use the help text supplied
 in the form definition

---
 django/contrib/admin/templates/admin/auth/user/change_password.html   | 3 ++-
 django/contrib/admin/templates/registration/password_change_form.html | 2 ++
 django/contrib/auth/forms.py                                          | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/django/contrib/admin/templates/admin/auth/user/change_password.html b/django/contrib/admin/templates/admin/auth/user/change_password.html
index 8bbc448..7fb7b55 100644
--- a/django/contrib/admin/templates/admin/auth/user/change_password.html
+++ b/django/contrib/admin/templates/admin/auth/user/change_password.html
@@ -35,12 +35,13 @@
 <div class="form-row">
   {{ form.password1.errors }}
   {{ form.password1.label_tag }} {{ form.password1 }}
+  <p class="help">{{ form.password1.help_text }}</p>
 </div>
 
 <div class="form-row">
   {{ form.password2.errors }}
   {{ form.password2.label_tag }} {{ form.password2 }}
-  <p class="help">{% trans 'Enter the same password as above, for verification.' %}</p>
+  <p class="help">{{ form.password2.help_text }}</p>
 </div>
 
 </fieldset>
diff --git a/django/contrib/admin/templates/registration/password_change_form.html b/django/contrib/admin/templates/registration/password_change_form.html
index 6c1118d..78b46a6 100644
--- a/django/contrib/admin/templates/registration/password_change_form.html
+++ b/django/contrib/admin/templates/registration/password_change_form.html
@@ -35,11 +35,13 @@
 <div class="form-row">
     {{ form.new_password1.errors }}
     {{ form.new_password1.label_tag }} {{ form.new_password1 }}
+	<p class="help">{{ form.new_password1.help_text }}</p>
 </div>
 
 <div class="form-row">
 {{ form.new_password2.errors }}
     {{ form.new_password2.label_tag }} {{ form.new_password2 }}
+	<p class="help">{{ form.new_password2.help_text }}</p>
 </div>
 
 </fieldset>
diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py
index c54a086..b982674 100644
--- a/django/contrib/auth/forms.py
+++ b/django/contrib/auth/forms.py
@@ -340,7 +340,8 @@ class AdminPasswordChangeForm(forms.Form):
     password1 = forms.CharField(label=_("Password"),
                                 widget=forms.PasswordInput)
     password2 = forms.CharField(label=_("Password (again)"),
-                                widget=forms.PasswordInput)
+                                widget=forms.PasswordInput,
+								help_text=_("Enter the same password as above, for verification.")
 
     def __init__(self, user, *args, **kwargs):
         self.user = user
-- 
1.9.4.msysgit.2


From f76d2946d5f8c5368fc26b045e6f72668abd59c7 Mon Sep 17 00:00:00 2001
From: James McMahon <james1345@googlemail.com>
Date: Wed, 19 Nov 2014 14:45:50 +0000
Subject: [PATCH 2/2] changed tabs to spaces

---
 django/contrib/admin/templates/registration/password_change_form.html | 4 ++--
 django/contrib/auth/forms.py                                          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/django/contrib/admin/templates/registration/password_change_form.html b/django/contrib/admin/templates/registration/password_change_form.html
index 78b46a6..aaa2009 100644
--- a/django/contrib/admin/templates/registration/password_change_form.html
+++ b/django/contrib/admin/templates/registration/password_change_form.html
@@ -35,13 +35,13 @@
 <div class="form-row">
     {{ form.new_password1.errors }}
     {{ form.new_password1.label_tag }} {{ form.new_password1 }}
-	<p class="help">{{ form.new_password1.help_text }}</p>
+    <p class="help">{{ form.new_password1.help_text }}</p>
 </div>
 
 <div class="form-row">
 {{ form.new_password2.errors }}
     {{ form.new_password2.label_tag }} {{ form.new_password2 }}
-	<p class="help">{{ form.new_password2.help_text }}</p>
+    <p class="help">{{ form.new_password2.help_text }}</p>
 </div>
 
 </fieldset>
diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py
index b982674..7aad16c 100644
--- a/django/contrib/auth/forms.py
+++ b/django/contrib/auth/forms.py
@@ -341,7 +341,7 @@ class AdminPasswordChangeForm(forms.Form):
                                 widget=forms.PasswordInput)
     password2 = forms.CharField(label=_("Password (again)"),
                                 widget=forms.PasswordInput,
-								help_text=_("Enter the same password as above, for verification.")
+                                help_text=_("Enter the same password as above, for verification.")
 
     def __init__(self, user, *args, **kwargs):
         self.user = user
-- 
1.9.4.msysgit.2