mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-29 00:26:07 +00:00
Code Issues 32 Releases Wiki Activity

[1.6.x] Replaced instances of 'his/her' with 'their'.

Browse Source 
Backport of 8fbf13a6c8 from master
This commit is contained in:
Iain Dawson
2014-07-21 18:55:37 +01:00
committed by Tim Graham
parent ca44366b15
commit 205090bc71
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,8 +259,8 @@ class PasswordResetForm(forms.Form):
class SetPasswordForm(forms.Form):
"""
A form that lets a user change set his/her password without entering the
old password
A form that lets a user change set their password without entering the old
password
"""
error_messages = {
'password_mismatch': _("The two password fields didn't match."),
@@ -294,8 +294,8 @@ class SetPasswordForm(forms.Form):
class PasswordChangeForm(SetPasswordForm):
"""
A form that lets a user change his/her password by entering
their old password.
A form that lets a user change their password by entering their old
password.
"""
error_messages = dict(SetPasswordForm.error_messages, **{
'password_incorrect': _("Your old password was entered incorrectly. "

2
django/contrib/auth/models.py
View File

@@ -306,7 +306,7 @@ class PermissionsMixin(models.Model):
def get_group_permissions(self, obj=None):
"""
Returns a list of permission strings that this user has through his/her
Returns a list of permission strings that this user has through their
groups. This method queries all available auth backends. If an object
is passed in, only permissions matching this object are returned.
"""