follow-up on texts missing from 'users groups'/'repositories group' cleanup

docs/changelog.rst

@@ -520,7 +520,7 b' fixes'
   and groups
 - fixes #271 rare JSON serialization problem with statistics
 - fixes #337 missing validation check for conflicting names of a group with a
-  repositories group
+  repository group
 - #340 fixed session problem for mysql and celery tasks
 - fixed #331 RhodeCode mangles repository names if the a repository group
   contains the "full path" to the repositories

rhodecode/config/routing.py

@@ -48,7 +48,7 b' def make_map(config):'
 
     def check_group(environ, match_dict):
         """
-        check for valid repositories group for proper 404 handling
+        check for valid repository group for proper 404 handling
 
         :param environ:
         :param match_dict:

rhodecode/model/db.py

@@ -1378,10 +1378,10 b' class Permission(Base, BaseModel):'
         ('repository.write', _('Repository write access')),
         ('repository.admin', _('Repository admin access')),
 
-        ('group.none', _('Repositories Group no access')),
-        ('group.read', _('Repositories Group read access')),
-        ('group.write', _('Repositories Group write access')),
-        ('group.admin', _('Repositories Group admin access')),
+        ('group.none', _('Repository group no access')),
+        ('group.read', _('Repository group read access')),
+        ('group.write', _('Repository group write access')),
+        ('group.admin', _('Repository group admin access')),
 
         ('hg.admin', _('RhodeCode Administrator')),
         ('hg.create.none', _('Repository creation disabled')),

rhodecode/model/repos_group.py

@@ -79,7 +79,7 b' class ReposGroupModel(BaseModel):'
 
     def __create_group(self, group_name):
         """
-        makes repositories group on filesystem
+        makes repository group on filesystem
 
         :param repo_name:
         :param parent_id:
@@ -327,7 +327,7 b' class ReposGroupModel(BaseModel):'
 
     def grant_user_permission(self, repos_group, user, perm):
         """
-        Grant permission for user on given repositories group, or update
+        Grant permission for user on given repository group, or update
         existing one if found
 
         :param repos_group: Instance of ReposGroup, repositories_group_id,
@@ -356,7 +356,7 b' class ReposGroupModel(BaseModel):'
 
     def revoke_user_permission(self, repos_group, user):
         """
-        Revoke permission for user on given repositories group
+        Revoke permission for user on given repository group
 
         :param repos_group: Instance of ReposGroup, repositories_group_id,
             or repositories_group name
@@ -376,7 +376,7 b' class ReposGroupModel(BaseModel):'
 
     def grant_users_group_permission(self, repos_group, group_name, perm):
         """
-        Grant permission for user group on given repositories group, or update
+        Grant permission for user group on given repository group, or update
         existing one if found
 
         :param repos_group: Instance of ReposGroup, repositories_group_id,
@@ -407,7 +407,7 b' class ReposGroupModel(BaseModel):'
 
     def revoke_users_group_permission(self, repos_group, group_name):
         """
-        Revoke permission for user group on given repositories group
+        Revoke permission for user group on given repository group
 
         :param repos_group: Instance of ReposGroup, repositories_group_id,
             or repositories_group name

rhodecode/model/validators.py

@@ -133,7 +133,7 b' def ValidUsersGroup(edit=False, old_data'
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'invalid_group': _(u'Invalid user group name'),
-            'group_exist': _(u'Users group "%(usersgroup)s" already exists'),
+            'group_exist': _(u'User group "%(usersgroup)s" already exists'),
             'invalid_usersgroup_name':
                 _(u'user group name may only contain  alphanumeric '
                   'characters underscores, periods or dashes and must begin '
@@ -317,7 +317,7 b' def ValidRepoName(edit=False, old_data={'
                 _(u'Repository named %(repo)s already exists'),
             'repository_in_group_exists': _(u'Repository "%(repo)s" already '
                                             'exists in group "%(group)s"'),
-            'same_group_exists': _(u'Repositories group with name "%(repo)s" '
+            'same_group_exists': _(u'Repository group with name "%(repo)s" '
                                    'already exists')
         }
 

rhodecode/templates/admin/permissions/permissions.html

@@ -59,7 +59,7 b''
                     ${h.checkbox('overwrite_default_group','true')}
                     <label for="overwrite_default_group">
                     <span class="tooltip"
-                    title="${h.tooltip(_('All default permissions on each repository group will be reset to choosen permission, note that all custom default permission on repositories group will be lost'))}">
+                    title="${h.tooltip(_('All default permissions on each repository group will be reset to choosen permission, note that all custom default permission on repository groups will be lost'))}">
                     ${_('overwrite existing settings')}</span> </label>
 
                 </div>

rhodecode/templates/index_base.html

@@ -48,7 +48,7 b''
                     <tr>
                         <td>
                             <div style="white-space: nowrap">
-                            <img class="icon" alt="${_('Repositories group')}" src="${h.url('/images/icons/database_link.png')}"/>
+                            <img class="icon" alt="${_('Repository group')}" src="${h.url('/images/icons/database_link.png')}"/>
                             ${h.link_to(gr.name,url('repos_group_home',group_name=gr.group_name))}
                             </div>
                         </td>