Commit 8fbf13a6 authored by Iain Dawson's avatar Iain Dawson Committed by Tim Graham
Browse files

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

parent 3f1412ff

django/contrib/auth/forms.py

+4 −4
Original line number Diff line number Diff line
@@ -261,8 +261,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."),
@@ -296,8 +296,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. "

django/contrib/auth/models.py

+2 −2
Original line number Diff line number Diff line
@@ -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 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.

        """

docs/internals/contributing/committing-code.txt

+1 −1
Original line number Diff line number Diff line
@@ -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.

docs/ref/contrib/auth.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

docs/topics/auth/customizing.txt

+1 −1
Original line number Diff line number Diff line
@@ -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