i18n: expose custom name to catch the translation strings.

rhodecode/controllers/admin/permissions.py

@@ -57,7 +57,7 b' class PermissionsController(BaseControll'
         super(PermissionsController, self).__before__()
 
     def __load_data(self):
-        PermissionModel().set_global_permission_choices(c, translator=_)
+        PermissionModel().set_global_permission_choices(c, gettext_translator=_)
 
     @HasPermissionAllDecorator('hg.admin')
     def permission_application(self):

rhodecode/controllers/admin/user_groups.py

@@ -65,7 +65,7 b' class UserGroupsController(BaseControlle'
     def __before__(self):
         super(UserGroupsController, self).__before__()
         c.available_permissions = config['available_permissions']
-        PermissionModel().set_global_permission_choices(c, translator=_)
+        PermissionModel().set_global_permission_choices(c, gettext_translator=_)
 
     def __load_data(self, user_group_id):
         c.group_members_obj = [x.user for x in c.user_group.members]

rhodecode/controllers/admin/users.py

@@ -74,7 +74,7 b' class UsersController(BaseController):'
             ('ru', 'Russian (ru)'),
             ('zh', 'Chinese (zh)'),
         ]
-        PermissionModel().set_global_permission_choices(c, translator=_)
+        PermissionModel().set_global_permission_choices(c, gettext_translator=_)
 
     @HasPermissionAllDecorator('hg.admin')
     def index(self):

rhodecode/model/permission.py

@@ -61,62 +61,63 b' class PermissionModel(BaseModel):'
         'default_user_group_perm': None,
     }
 
-    def set_global_permission_choices(self, c_obj, translator):
+    def set_global_permission_choices(self, c_obj, gettext_translator):
+
         c_obj.repo_perms_choices = [
-            ('repository.none', translator('None'),),
-            ('repository.read', translator('Read'),),
-            ('repository.write', translator('Write'),),
-            ('repository.admin', translator('Admin'),)]
+            ('repository.none', gettext_translator('None'),),
+            ('repository.read', gettext_translator('Read'),),
+            ('repository.write', gettext_translator('Write'),),
+            ('repository.admin', gettext_translator('Admin'),)]
 
         c_obj.group_perms_choices = [
-            ('group.none', translator('None'),),
-            ('group.read', translator('Read'),),
-            ('group.write', translator('Write'),),
-            ('group.admin', translator('Admin'),)]
+            ('group.none', gettext_translator('None'),),
+            ('group.read', gettext_translator('Read'),),
+            ('group.write', gettext_translator('Write'),),
+            ('group.admin', gettext_translator('Admin'),)]
 
         c_obj.user_group_perms_choices = [
-            ('usergroup.none', translator('None'),),
-            ('usergroup.read', translator('Read'),),
-            ('usergroup.write', translator('Write'),),
-            ('usergroup.admin', translator('Admin'),)]
+            ('usergroup.none', gettext_translator('None'),),
+            ('usergroup.read', gettext_translator('Read'),),
+            ('usergroup.write', gettext_translator('Write'),),
+            ('usergroup.admin', gettext_translator('Admin'),)]
 
         c_obj.register_choices = [
-            ('hg.register.none', translator('Disabled')),
-            ('hg.register.manual_activate', translator('Allowed with manual account activation')),
-            ('hg.register.auto_activate', translator('Allowed with automatic account activation')),]
+            ('hg.register.none', gettext_translator('Disabled')),
+            ('hg.register.manual_activate', gettext_translator('Allowed with manual account activation')),
+            ('hg.register.auto_activate', gettext_translator('Allowed with automatic account activation')),]
 
         c_obj.password_reset_choices = [
-            ('hg.password_reset.enabled', translator('Allow password recovery')),
-            ('hg.password_reset.hidden', translator('Hide password recovery link')),
-            ('hg.password_reset.disabled', translator('Disable password recovery')),]
+            ('hg.password_reset.enabled', gettext_translator('Allow password recovery')),
+            ('hg.password_reset.hidden', gettext_translator('Hide password recovery link')),
+            ('hg.password_reset.disabled', gettext_translator('Disable password recovery')),]
 
         c_obj.extern_activate_choices = [
-            ('hg.extern_activate.manual', translator('Manual activation of external account')),
-            ('hg.extern_activate.auto', translator('Automatic activation of external account')),]
+            ('hg.extern_activate.manual', gettext_translator('Manual activation of external account')),
+            ('hg.extern_activate.auto', gettext_translator('Automatic activation of external account')),]
 
         c_obj.repo_create_choices = [
-            ('hg.create.none', translator('Disabled')),
-            ('hg.create.repository', translator('Enabled'))]
+            ('hg.create.none', gettext_translator('Disabled')),
+            ('hg.create.repository', gettext_translator('Enabled'))]
 
         c_obj.repo_create_on_write_choices = [
-            ('hg.create.write_on_repogroup.false', translator('Disabled')),
-            ('hg.create.write_on_repogroup.true', translator('Enabled'))]
+            ('hg.create.write_on_repogroup.false', gettext_translator('Disabled')),
+            ('hg.create.write_on_repogroup.true', gettext_translator('Enabled'))]
 
         c_obj.user_group_create_choices = [
-            ('hg.usergroup.create.false', translator('Disabled')),
-            ('hg.usergroup.create.true', translator('Enabled'))]
+            ('hg.usergroup.create.false', gettext_translator('Disabled')),
+            ('hg.usergroup.create.true', gettext_translator('Enabled'))]
 
         c_obj.repo_group_create_choices = [
-            ('hg.repogroup.create.false', translator('Disabled')),
-            ('hg.repogroup.create.true', translator('Enabled'))]
+            ('hg.repogroup.create.false', gettext_translator('Disabled')),
+            ('hg.repogroup.create.true', gettext_translator('Enabled'))]
 
         c_obj.fork_choices = [
-            ('hg.fork.none', translator('Disabled')),
-            ('hg.fork.repository', translator('Enabled'))]
+            ('hg.fork.none', gettext_translator('Disabled')),
+            ('hg.fork.repository', gettext_translator('Enabled'))]
 
         c_obj.inherit_default_permission_choices = [
-            ('hg.inherit_default_perms.false', translator('Disabled')),
-            ('hg.inherit_default_perms.true', translator('Enabled'))]
+            ('hg.inherit_default_perms.false', gettext_translator('Disabled')),
+            ('hg.inherit_default_perms.true', gettext_translator('Enabled'))]
 
     def get_default_perms(self, object_perms, suffix):
         defaults = {}

setup.cfg

@@ -21,6 +21,7 b' keywords ='
     lazy_ugettext
     _ngettext
     _gettext
+    gettext_translator
 
 [init_catalog]
 domain = rhodecode