Fix 'repos group' - it is 'repository group'

docs/changelog.rst

@@ -33,7 +33,7 b' fixes'
 - fixes #762 user global activation flag is also respected for LDAP created
   accounts
 - use password obfuscate when clonning a remote repo with credentials inside
-- fixed issue with renaming repos group together with changing parents
+- fixed issue with renaming repository group together with changing parents
 - disallow cloning from file:/// URIs
 - handle all cases with multiple IP addresses in proxy headers
 
@@ -239,7 +239,7 b' news'
 fixes
 +++++
 
-- fixed visual permissions check on repos groups inside groups
+- fixed visual permissions check on repository groups inside groups
 - fixed issues with non-ascii search terms in search, and indexers
 - fixed parsing of page number in GET parameters
 - fixed issues with generating pull-request overview for repos with
@@ -406,7 +406,7 b' news'
 - created rcextensions module with additional mappings (ref #322) and
   post push/pull/create repo hooks callbacks
 - implemented #377 Users view for his own permissions on account page
-- #399 added inheritance of permissions for user group on repos groups
+- #399 added inheritance of permissions for user group on repository groups
 - #401 repository group is automatically pre-selected when adding repos
   inside a repository group
 - added alternative HTTP 403 response when client failed to authenticate. Helps
@@ -600,7 +600,7 b' 1.2.3 (**2011-11-02**)'
 news
 ++++
 
-- added option to manage repos group for non admin users
+- added option to manage repository group for non admin users
 - added following API methods for get_users, create_user, get_users_groups,
   get_users_group, create_users_group, add_user_to_users_groups, get_repos,
   get_repo, create_repo, add_user_to_repo

rhodecode/config/routing.py

@@ -205,13 +205,13 b' def make_map(config):'
         m.connect("formatted_repos_group", "/repos_groups/{group_name:.*?}.{format}",
                   action="show", conditions=dict(method=["GET"],
                                                  function=check_group))
-        # ajax delete repos group perm user
+        # ajax delete repository group perm user
         m.connect('delete_repos_group_user_perm',
                   "/delete_repos_group_user_perm/{group_name:.*?}",
              action="delete_repos_group_user_perm",
              conditions=dict(method=["DELETE"], function=check_group))
 
-        # ajax delete repos group perm users_group
+        # ajax delete repository group perm users_group
         m.connect('delete_repos_group_users_group_perm',
                   "/delete_repos_group_users_group_perm/{group_name:.*?}",
                   action="delete_repos_group_users_group_perm",

rhodecode/controllers/admin/repos_groups.py

@@ -142,7 +142,7 b' class ReposGroupsController(BaseControll'
                     owner=self.rhodecode_user.user_id
             )
             Session().commit()
-            h.flash(_('Created repos group %s') \
+            h.flash(_('Created repository group %s') \
                     % form_result['group_name'], category='success')
             #TODO: in futureaction_logger(, '', '', '', self.sa)
         except formencode.Invalid, errors:
@@ -154,7 +154,7 b' class ReposGroupsController(BaseControll'
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('Error occurred during creation of repos group %s') \
+            h.flash(_('Error occurred during creation of repository group %s') \
                     % request.POST.get('group_name'), category='error')
         parent_group_id = form_result['group_parent_id']
         #TODO: maybe we should get back to the main view, not the admin one
@@ -217,7 +217,7 b' class ReposGroupsController(BaseControll'
 
             new_gr = ReposGroupModel().update(group_name, form_result)
             Session().commit()
-            h.flash(_('Updated repos group %s') \
+            h.flash(_('Updated repository group %s') \
                     % form_result['group_name'], category='success')
             # we now have new name !
             group_name = new_gr.group_name
@@ -232,7 +232,7 b' class ReposGroupsController(BaseControll'
                 encoding="UTF-8")
         except Exception:
             log.error(traceback.format_exc())
-            h.flash(_('Error occurred during update of repos group %s') \
+            h.flash(_('Error occurred during update of repository group %s') \
                     % request.POST.get('group_name'), category='error')
 
         return redirect(url('edit_repos_group', group_name=group_name))
@@ -263,7 +263,7 b' class ReposGroupsController(BaseControll'
         try:
             ReposGroupModel().delete(group_name)
             Session().commit()
-            h.flash(_('Removed repos group %s') % group_name,
+            h.flash(_('Removed repository group %s') % group_name,
                     category='success')
             #TODO: in future action_logger(, '', '', '', self.sa)
         except Exception:

rhodecode/lib/utils.py

@@ -240,7 +240,7 b' def is_valid_repo(repo_name, base_path, '
 
 def is_valid_repos_group(repos_group_name, base_path, skip_path_check=False):
     """
-    Returns True if given path is a repos group False otherwise
+    Returns True if given path is a repository group False otherwise
 
     :param repo_name:
     :param base_path:

rhodecode/model/repos_group.py

@@ -104,7 +104,7 b' class ReposGroupModel(BaseModel):'
             log.debug('skipping group rename')
             return
 
-        log.debug('renaming repos group from %s to %s' % (old, new))
+        log.debug('renaming repository group from %s to %s' % (old, new))
 
         old_path = os.path.join(self.repos_path, old)
         new_path = os.path.join(self.repos_path, new)

rhodecode/model/user.py

@@ -472,7 +472,7 b' class UserModel(BaseModel):'
             return user
 
         #==================================================================
-        # SET DEFAULTS GLOBAL, REPOS, REPOS GROUPS
+        # SET DEFAULTS GLOBAL, REPOS, REPOSITORY GROUPS
         #==================================================================
         uid = user.user_id
 

rhodecode/model/users_group.py

@@ -88,7 +88,7 b' class UserGroupModel(BaseModel):'
 
     def delete(self, users_group, force=False):
         """
-        Deletes repos group, unless force flag is used
+        Deletes repository group, unless force flag is used
         raises exception if there are members in that group, else deletes
         group and users
 

rhodecode/templates/admin/repos_groups/repos_groups_add.html

@@ -2,15 +2,15 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Add repos group')} &middot; ${c.rhodecode_name}
+    ${_('Add repository group')} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
-    ${h.link_to(_('Repos groups'),h.url('repos_groups'))}
+    ${h.link_to(_('Repository groups'),h.url('repos_groups'))}
     &raquo;
-    ${_('add new repos group')}
+    ${_('Add new repository group')}
 </%def>
 
 <%def name="page_nav()">

rhodecode/templates/admin/repos_groups/repos_groups_edit.html

@@ -2,15 +2,15 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Edit repos group')} ${c.repos_group.name} &middot; ${c.rhodecode_name}
+    ${_('Edit repository group')} ${c.repos_group.name} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
-    ${h.link_to(_('Repos groups'),h.url('repos_groups'))}
+    ${h.link_to(_('Repository groups'),h.url('repos_groups'))}
     &raquo;
-    ${_('edit repos group')} "${c.repos_group.name}"
+    ${_('Edit repository group')} "${c.repos_group.name}"
 </%def>
 
 <%def name="page_nav()">