Permalink
Browse files

Replaced instances of 'his/her' with 'their'.

  • Loading branch information...
colons authored and timgraham committed Jul 21, 2014
1 parent 3f1412f commit 8fbf13a6c85d68b996bc09cb6e8c969e5e32005b
@@ -261,8 +261,8 @@ def save(self, domain_override=None,
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."),
@@ -296,8 +296,8 @@ def save(self, commit=True):
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. "
@@ -308,7 +308,7 @@ class PermissionsMixin(models.Model):
groups = models.ManyToManyField(Group, verbose_name=_('groups'),
blank=True, help_text=_('The groups this user belongs to. A user will '
'get all permissions granted to each of '
- 'his/her group.'),
+ 'their group.'),
related_name="user_set", related_query_name="user")
user_permissions = models.ManyToManyField(Permission,
verbose_name=_('user permissions'), blank=True,
@@ -320,7 +320,7 @@ class Meta:
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.
@@ -168,7 +168,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
@@ -819,7 +819,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
@@ -1225,7 +1225,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
@@ -1243,7 +1243,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`.

0 comments on commit 8fbf13a

Please sign in to comment.