diff --git a/mayan/apps/authentication/settings.py b/mayan/apps/authentication/settings.py index e15f2f083b..de693442d5 100644 --- a/mayan/apps/authentication/settings.py +++ b/mayan/apps/authentication/settings.py @@ -17,7 +17,7 @@ setting_login_method = namespace.add_setting( setting_maximum_session_length = namespace.add_setting( global_name='AUTHENTICATION_MAXIMUM_SESSION_LENGTH', default=DEFAULT_MAXIMUM_SESSION_LENGTH, help_text=_( - 'Maximum time an user clicking the "Remember me" checkbox will ' + 'Maximum time a user clicking the "Remember me" checkbox will ' 'remain logged in. Value is time in seconds.' ) ) diff --git a/mayan/apps/common/mixins.py b/mayan/apps/common/mixins.py index 171de89529..a014542bc1 100644 --- a/mayan/apps/common/mixins.py +++ b/mayan/apps/common/mixins.py @@ -242,7 +242,7 @@ class MultipleObjectMixin(SingleObjectMixin): class ObjectActionMixin(object): """ - Mixin that performs an user action to a queryset + Mixin that performs a user action to a queryset """ error_message = 'Unable to perform operation on object %(instance)s.' success_message = 'Operation performed on %(count)d object.' diff --git a/mayan/apps/common/models.py b/mayan/apps/common/models.py index 41f736c700..511e64c77e 100644 --- a/mayan/apps/common/models.py +++ b/mayan/apps/common/models.py @@ -85,7 +85,7 @@ class SharedUploadedFile(models.Model): @python_2_unicode_compatible class UserLocaleProfile(models.Model): """ - Stores the locale preferences of an user. Stores timezone and language + Stores the locale preferences of a user. Stores timezone and language at the moment. """ user = models.OneToOneField( diff --git a/mayan/apps/events/models.py b/mayan/apps/events/models.py index af9988d160..bf71479349 100644 --- a/mayan/apps/events/models.py +++ b/mayan/apps/events/models.py @@ -46,7 +46,7 @@ class StoredEventType(models.Model): @python_2_unicode_compatible class EventSubscription(models.Model): """ - This model stores the event subscriptions of an user for the entire + This model stores the event subscriptions of a user for the entire system. """ user = models.ForeignKey( @@ -72,7 +72,7 @@ class EventSubscription(models.Model): @python_2_unicode_compatible class Notification(models.Model): """ - This model keeps track of the notifications for an user. Notifications are + This model keeps track of the notifications for a user. Notifications are created when an event to which this user has been subscribed, are commited elsewhere in the system. """ diff --git a/mayan/apps/permissions/models.py b/mayan/apps/permissions/models.py index 1541ab3b60..2dc287e63b 100644 --- a/mayan/apps/permissions/models.py +++ b/mayan/apps/permissions/models.py @@ -64,7 +64,7 @@ class StoredPermission(models.Model): def user_has_this(self, user): """ - Helper method to check if an user has been granted this permission. + Helper method to check if a user has been granted this permission. The check is done sequentially over all of the user's groups and roles. The check is interrupted at the first positive result. The check always returns True for superusers or staff users. diff --git a/mayan/apps/user_management/api_views.py b/mayan/apps/user_management/api_views.py index 2174f5d011..e8a2f91b70 100644 --- a/mayan/apps/user_management/api_views.py +++ b/mayan/apps/user_management/api_views.py @@ -97,7 +97,7 @@ class APIUserView(generics.RetrieveUpdateDestroyAPIView): class APIUserGroupList(generics.ListCreateAPIView): """ - get: Returns a list of all the groups to which an user belongs. + get: Returns a list of all the groups to which a user belongs. post: Add a user to a list of groups. """ mayan_object_permissions = { diff --git a/mayan/apps/user_management/forms.py b/mayan/apps/user_management/forms.py index 41efc631df..dee1b84d33 100644 --- a/mayan/apps/user_management/forms.py +++ b/mayan/apps/user_management/forms.py @@ -6,7 +6,7 @@ from django.contrib.auth import get_user_model class UserForm(forms.ModelForm): """ - Form used to edit an user's mininal fields by the user himself + Form used to edit a user's mininal fields by the user himself """ class Meta: fields = ( diff --git a/mayan/apps/user_management/models.py b/mayan/apps/user_management/models.py index 878a8c1bc6..e1ab0e6f4f 100644 --- a/mayan/apps/user_management/models.py +++ b/mayan/apps/user_management/models.py @@ -9,8 +9,8 @@ from .managers import UserOptionsManager class UserOptions(models.Model): """ - This model stores administrative configurations for an user accounts. - At the moment it stores a boolean flag to restrict an user's + This model stores administrative configurations for a user accounts. + At the moment it stores a boolean flag to restrict a user's ability to change their password. """ user = models.OneToOneField( diff --git a/mayan/apps/user_management/tests/mixins.py b/mayan/apps/user_management/tests/mixins.py index e7076133f7..548df197e8 100644 --- a/mayan/apps/user_management/tests/mixins.py +++ b/mayan/apps/user_management/tests/mixins.py @@ -170,7 +170,7 @@ class UserAPITestMixin(object): class UserTestCaseMixin(object): """ - This TestCaseMixin is used to create an user and group to execute the + This TestCaseMixin is used to create a user and group to execute the test case, these are used to just create an identity which is required by most of the code in the project, these are not meant to be acted upon (edited, deleted, etc). To create a test users or groups to modify, use diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py index 0933f9d313..9858cd54b6 100644 --- a/mayan/apps/user_management/views.py +++ b/mayan/apps/user_management/views.py @@ -296,7 +296,7 @@ class UserListView(SingleObjectListView): ), 'no_results_text': _( 'User accounts can be create from this view. After creating ' - 'an user account you will prompted to set a password for it. ' + 'a user account you will prompted to set a password for it. ' ), 'no_results_title': _('There are no user accounts'), 'title': _('Users'),