[1.7.x] Replaced instances of 'his/her' with 'their'.
Backport of 8fbf13a6c8
from master
This commit is contained in:
parent
6e41ae1a4e
commit
59fec1ca9b
|
@ -278,8 +278,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."),
|
||||
|
@ -313,8 +313,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. "
|
||||
|
|
|
@ -305,7 +305,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.
|
||||
"""
|
||||
|
|
|
@ -228,7 +228,7 @@ another committer, **before** you commit it in the first place!
|
|||
|
||||
When a mistaken commit is discovered, please follow these guidelines:
|
||||
|
||||
* If possible, have the original author revert his/her own commit.
|
||||
* If possible, have the original author revert their own commit.
|
||||
|
||||
* Don't revert another author's changes without permission from the
|
||||
original author.
|
||||
|
|
|
@ -179,7 +179,7 @@ Methods
|
|||
|
||||
.. method:: get_group_permissions(obj=None)
|
||||
|
||||
Returns a set of permission strings that the user has, through his/her
|
||||
Returns a set of permission strings that the user has, through their
|
||||
groups.
|
||||
|
||||
If ``obj`` is passed in, only returns the group permissions for
|
||||
|
|
|
@ -807,7 +807,7 @@ methods and attributes:
|
|||
|
||||
.. method:: models.PermissionsMixin.get_group_permissions(obj=None)
|
||||
|
||||
Returns a set of permission strings that the user has, through his/her
|
||||
Returns a set of permission strings that the user has, through their
|
||||
groups.
|
||||
|
||||
If ``obj`` is passed in, only returns the group permissions for
|
||||
|
|
|
@ -1211,7 +1211,7 @@ provides several built-in forms located in :mod:`django.contrib.auth.forms`:
|
|||
|
||||
.. class:: SetPasswordForm
|
||||
|
||||
A form that lets a user change his/her password without entering the old
|
||||
A form that lets a user change their password without entering the old
|
||||
password.
|
||||
|
||||
.. class:: UserChangeForm
|
||||
|
@ -1229,7 +1229,7 @@ provides several built-in forms located in :mod:`django.contrib.auth.forms`:
|
|||
Authentication data in templates
|
||||
--------------------------------
|
||||
|
||||
The currently logged-in user and his/her permissions are made available in the
|
||||
The currently logged-in user and their permissions are made available in the
|
||||
:doc:`template context </ref/templates/api>` when you use
|
||||
:class:`~django.template.RequestContext`.
|
||||
|
||||
|
|
Loading…
Reference in New Issue