diff --git a/development.ini b/development.ini --- a/development.ini +++ b/development.ini @@ -256,7 +256,7 @@ issue_prefix = # instance_id = ## alternative return HTTP header for failed authentication. Default HTTP -## response is 401 HTTPUnauthorized. Currently HG clients have troubles with +## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with ## handling that. Set this variable to 403 to return HTTPForbidden auth_ret_code = diff --git a/kallithea/bin/template.ini.mako b/kallithea/bin/template.ini.mako --- a/kallithea/bin/template.ini.mako +++ b/kallithea/bin/template.ini.mako @@ -253,7 +253,7 @@ issue_prefix = # instance_id = <%text>## alternative return HTTP header for failed authentication. Default HTTP -<%text>## response is 401 HTTPUnauthorized. Currently HG clients have troubles with +<%text>## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with <%text>## handling that. Set this variable to 403 to return HTTPForbidden auth_ret_code = diff --git a/kallithea/config/deployment.ini_tmpl b/kallithea/config/deployment.ini_tmpl --- a/kallithea/config/deployment.ini_tmpl +++ b/kallithea/config/deployment.ini_tmpl @@ -250,7 +250,7 @@ issue_prefix = # instance_id = ## alternative return HTTP header for failed authentication. Default HTTP -## response is 401 HTTPUnauthorized. Currently HG clients have troubles with +## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with ## handling that. Set this variable to 403 to return HTTPForbidden auth_ret_code = diff --git a/kallithea/controllers/search.py b/kallithea/controllers/search.py --- a/kallithea/controllers/search.py +++ b/kallithea/controllers/search.py @@ -141,7 +141,7 @@ class SearchController(BaseRepoControlle 'Please run whoosh indexer') except (Exception): log.error(traceback.format_exc()) - c.runtime = _('An error occurred during this search operation') + c.runtime = _('An error occurred during search operation.') # Return a rendered template return render('/search/search.html') diff --git a/kallithea/lib/middleware/simplegit.py b/kallithea/lib/middleware/simplegit.py --- a/kallithea/lib/middleware/simplegit.py +++ b/kallithea/lib/middleware/simplegit.py @@ -55,7 +55,7 @@ GIT_PROTO_PAT = re.compile(r'^/(.+)/(inf def is_git(environ): path_info = environ['PATH_INFO'] isgit_path = GIT_PROTO_PAT.match(path_info) - log.debug('pathinfo: %s detected as GIT %s' % ( + log.debug('pathinfo: %s detected as Git %s' % ( path_info, isgit_path is not None) ) return isgit_path @@ -200,7 +200,7 @@ class SimpleGit(BaseVCSController): try: self._handle_githooks(repo_name, action, baseui, environ) - log.info('%s action on GIT repo "%s" by "%s" from %s' % + log.info('%s action on Git repo "%s" by "%s" from %s' % (action, str_repo_name, safe_str(username), ip_addr)) app = self.__make_app(repo_name, repo_path, extras) return app(environ, start_response) diff --git a/kallithea/lib/middleware/simplehg.py b/kallithea/lib/middleware/simplehg.py --- a/kallithea/lib/middleware/simplehg.py +++ b/kallithea/lib/middleware/simplehg.py @@ -15,7 +15,7 @@ kallithea.lib.middleware.simplehg ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -SimpleHG middleware for handling mercurial protocol request +SimpleHg middleware for handling mercurial protocol request (push/clone etc.). It's implemented with basic auth function This file was forked by the Kallithea project in July 2014. @@ -60,7 +60,7 @@ def is_mercurial(environ): else: ishg_path = False - log.debug('pathinfo: %s detected as HG %s' % ( + log.debug('pathinfo: %s detected as Mercurial %s' % ( path_info, ishg_path) ) return ishg_path @@ -202,7 +202,7 @@ class SimpleHg(BaseVCSController): self.__inject_extras(repo_path, baseui, extras) try: - log.info('%s action on HG repo "%s" by "%s" from %s' % + log.info('%s action on Mercurial repo "%s" by "%s" from %s' % (action, str_repo_name, safe_str(username), ip_addr)) app = self.__make_app(repo_path, baseui, extras) return app(environ, start_response) diff --git a/kallithea/lib/utils.py b/kallithea/lib/utils.py --- a/kallithea/lib/utils.py +++ b/kallithea/lib/utils.py @@ -825,7 +825,7 @@ def check_git_version(): to_old_git = True if 'git' in BACKENDS: - log.debug('GIT executable: "%s" version detected: %s' + log.debug('Git executable: "%s" version detected: %s' % (settings.GIT_EXECUTABLE_PATH, stdout)) if stderr: log.warning('Unable to detect git version, org error was: %r' % stderr) diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css --- a/kallithea/public/css/style.css +++ b/kallithea/public/css/style.css @@ -4840,6 +4840,7 @@ span.pr-closed-tag { padding: 10px 10px 10px 0px; font-size: 16px; font-weight: bold; + text-transform: capitalize; } #perms .perm_tag { diff --git a/kallithea/public/js/base.js b/kallithea/public/js/base.js --- a/kallithea/public/js/base.js +++ b/kallithea/public/js/base.js @@ -773,7 +773,7 @@ var _placeAddButton = function($line_tr) $tr = $tr.next(); } $tr.find('.add-comment').remove(); - var label = TRANSLATION_MAP['Add another comment']; + var label = TRANSLATION_MAP['Add Another Comment']; var $html_el = $('
{0}
'.format(label)); $html_el.click(function(e) { injectInlineForm($line_tr); @@ -2168,11 +2168,11 @@ var YUI_datatable = function(data, field var $target = $('#' + $button.attr('target')); if($target.hasClass('hidden')){ $target.removeClass('hidden'); - $button.html("↑ {0} ↑".format(_TM['Collapse diff'])); + $button.html("↑ {0} ↑".format(_TM['Collapse Diff'])); } else if(!$target.hasClass('hidden')){ $target.addClass('hidden'); - $button.html("↓ {0} ↓".format(_TM['Expand diff'])); + $button.html("↓ {0} ↓".format(_TM['Expand Diff'])); } }); }); diff --git a/kallithea/templates/admin/admin.html b/kallithea/templates/admin/admin.html --- a/kallithea/templates/admin/admin.html +++ b/kallithea/templates/admin/admin.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Admin journal')} + ${_('Admin Journal')} %if c.site_name: · ${c.site_name} %endif @@ -12,8 +12,8 @@
? - - ${_('Admin journal')} - ${ungettext('%s entry', '%s entries', c.users_log.item_count) % (c.users_log.item_count)} + + ${_('Admin Journal')} - ${ungettext('%s Entry', '%s Entries', c.users_log.item_count) % (c.users_log.item_count)}
${h.end_form()} diff --git a/kallithea/templates/admin/defaults/defaults.html b/kallithea/templates/admin/defaults/defaults.html --- a/kallithea/templates/admin/defaults/defaults.html +++ b/kallithea/templates/admin/defaults/defaults.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repositories defaults')} + ${_('Repository Defaults')} %if c.site_name: · ${c.site_name} %endif @@ -25,7 +25,7 @@ ${self.breadcrumbs()} -

${_('Repositories defaults')}

+

${_('Repository Defaults')}

${h.form(url('default', id='defaults'),method='put')}
diff --git a/kallithea/templates/admin/gists/index.html b/kallithea/templates/admin/gists/index.html --- a/kallithea/templates/admin/gists/index.html +++ b/kallithea/templates/admin/gists/index.html @@ -3,9 +3,9 @@ <%def name="title()"> %if c.show_private: - ${_('Private Gists for user %s') % c.authuser.username} + ${_('Private Gists for User %s') % c.authuser.username} %elif c.show_public: - ${_('Public Gists for user %s') % c.authuser.username} + ${_('Public Gists for User %s') % c.authuser.username} %else: ${_('Public Gists')} %endif @@ -16,9 +16,9 @@ <%def name="breadcrumbs_links()"> %if c.show_private: - ${_('Private Gists for user %s') % c.authuser.username} + ${_('Private Gists for User %s') % c.authuser.username} %elif c.show_public: - ${_('Public Gists for user %s') % c.authuser.username} + ${_('Public Gists for User %s') % c.authuser.username} %else: ${_('Public Gists')} %endif diff --git a/kallithea/templates/admin/my_account/my_account.html b/kallithea/templates/admin/my_account/my_account.html --- a/kallithea/templates/admin/my_account/my_account.html +++ b/kallithea/templates/admin/my_account/my_account.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('My account')} ${c.authuser.username} + ${_('My Account')} ${c.authuser.username} %if c.site_name: · ${c.site_name} %endif @@ -37,11 +37,11 @@
  • ${_('Profile')}
  • ${_('Password')}
    • -
  • ${_('API keys')}
    • +
  • ${_('API Keys')}
  • ${_('My Emails')}
  • ${_('My Repositories')}
  • ${_('Watched')}
    • -
  • ${_('My permissions')}
    • +
  • ${_('My Permissions')}
    • diff --git a/kallithea/templates/admin/my_account/my_account_emails.html b/kallithea/templates/admin/my_account/my_account_emails.html --- a/kallithea/templates/admin/my_account/my_account_emails.html +++ b/kallithea/templates/admin/my_account/my_account_emails.html @@ -23,7 +23,7 @@ %endfor %else: -
    ${_('No additional emails specified')}
    +
    ${_('No additional emails specified.')}
    %endif diff --git a/kallithea/templates/admin/my_account/my_account_password.html b/kallithea/templates/admin/my_account/my_account_password.html --- a/kallithea/templates/admin/my_account/my_account_password.html +++ b/kallithea/templates/admin/my_account/my_account_password.html @@ -1,4 +1,4 @@ -
    ${_('Change your account password')}
    +
    ${_('Change Your Account Password')}
    ${h.form(url('my_account_password'), method='post')}
    diff --git a/kallithea/templates/admin/my_account/my_account_repos.html b/kallithea/templates/admin/my_account/my_account_repos.html --- a/kallithea/templates/admin/my_account/my_account_repos.html +++ b/kallithea/templates/admin/my_account/my_account_repos.html @@ -1,4 +1,4 @@ -
    ${_('Repositories you are owner of')}
    +
    ${_('Repositories You Own')}
    diff --git a/kallithea/templates/admin/my_account/my_account_watched.html b/kallithea/templates/admin/my_account/my_account_watched.html --- a/kallithea/templates/admin/my_account/my_account_watched.html +++ b/kallithea/templates/admin/my_account/my_account_watched.html @@ -1,4 +1,4 @@ -
    ${_('Repositories you are watching')}
    +
    ${_('Repositories You are Watching')}
    diff --git a/kallithea/templates/admin/notifications/notifications.html b/kallithea/templates/admin/notifications/notifications.html --- a/kallithea/templates/admin/notifications/notifications.html +++ b/kallithea/templates/admin/notifications/notifications.html @@ -30,7 +30,7 @@
    %if c.notifications:
    - ${_('Mark all read')} + ${_('Mark All Read')}
    %endif
    diff --git a/kallithea/templates/admin/notifications/show_notification.html b/kallithea/templates/admin/notifications/show_notification.html --- a/kallithea/templates/admin/notifications/show_notification.html +++ b/kallithea/templates/admin/notifications/show_notification.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Show notification')} ${c.authuser.username} + ${_('Show Notification')} ${c.authuser.username} %if c.site_name: · ${c.site_name} %endif @@ -11,7 +11,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(_('Notifications'),h.url('notifications'))} » - ${_('Show notification')} + ${_('Show Notification')} <%def name="page_nav()"> diff --git a/kallithea/templates/admin/permissions/permissions.html b/kallithea/templates/admin/permissions/permissions.html --- a/kallithea/templates/admin/permissions/permissions.html +++ b/kallithea/templates/admin/permissions/permissions.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Permissions administration')} + ${_('Permissions Administration')} %if c.site_name: · ${c.site_name} %endif @@ -39,7 +39,7 @@
  • ${_('Global')}
    • -
  • ${_('IP whitelist')}
    • +
  • ${_('IP Whitelist')}
  • ${_('Overview')}
    • diff --git a/kallithea/templates/admin/permissions/permissions_globals.html b/kallithea/templates/admin/permissions/permissions_globals.html --- a/kallithea/templates/admin/permissions/permissions_globals.html +++ b/kallithea/templates/admin/permissions/permissions_globals.html @@ -10,7 +10,7 @@
    ${h.checkbox('anonymous',True)}
    - ${h.literal(_('Allow access to Kallithea without need to log in. Anonymous users use %s user permissions' % (h.link_to('*default*',h.url('admin_permissions_perms')))))} + ${h.literal(_('Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions.' % (h.link_to('*default*',h.url('admin_permissions_perms')))))}
    @@ -69,7 +69,7 @@
    ${h.select('create_on_write','',c.repo_create_on_write_choices)} - ${_('Write permission to repository groups allows creating repositories inside that group')} + ${_('Write permission to a repository group allows creating repositories inside that group.')}
    diff --git a/kallithea/templates/admin/permissions/permissions_ips.html b/kallithea/templates/admin/permissions/permissions_ips.html --- a/kallithea/templates/admin/permissions/permissions_ips.html +++ b/kallithea/templates/admin/permissions/permissions_ips.html @@ -1,4 +1,4 @@ -

    ${_('Default ip whitelist for all users')}

    +

    ${_('Default IP Whitelist for All Users')}

    @@ -18,7 +18,7 @@ %endfor %else: - + %endif
    ${_('All IP addresses are allowed')}
    ${_('All IP addresses are allowed.')}
    diff --git a/kallithea/templates/admin/permissions/permissions_perms.html b/kallithea/templates/admin/permissions/permissions_perms.html --- a/kallithea/templates/admin/permissions/permissions_perms.html +++ b/kallithea/templates/admin/permissions/permissions_perms.html @@ -1,4 +1,4 @@ -

    ${_('Default user permissions overview')}

    +

    ${_('Default User Permissions Overview')}

    ## permissions overview <%namespace name="p" file="/base/perms_summary.html"/> diff --git a/kallithea/templates/admin/repo_groups/repo_group_add.html b/kallithea/templates/admin/repo_groups/repo_group_add.html --- a/kallithea/templates/admin/repo_groups/repo_group_add.html +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Add repository group')} + ${_('Add Repository Group')} %if c.site_name: · ${c.site_name} %endif @@ -11,7 +11,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} » - ${h.link_to(_('Repository groups'),h.url('repos_groups'))} + ${h.link_to(_('Repository Groups'),h.url('repos_groups'))} » ${_('Add Repository Group')} diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit.html b/kallithea/templates/admin/repo_groups/repo_group_edit.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Repository group settings') % c.repo_group.name} + ${_('%s Repository Group Settings') % c.repo_group.name} %if c.site_name: · ${c.site_name} %endif diff --git a/kallithea/templates/admin/repo_groups/repo_groups.html b/kallithea/templates/admin/repo_groups/repo_groups.html --- a/kallithea/templates/admin/repo_groups/repo_groups.html +++ b/kallithea/templates/admin/repo_groups/repo_groups.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repository groups administration')} + ${_('Repository Groups Administration')} %if c.site_name: · ${c.site_name} %endif @@ -10,7 +10,7 @@ <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} » 0 ${_('repository groups')} + ${h.link_to(_('Admin'),h.url('admin_home'))} » 0 ${_('Repository Groups')} @@ -48,7 +48,7 @@ var column_defs = [ {key:"group_name",label:"${_('Name')}",sortable:true, sortOptions: { sortFunction: nameSort }}, {key:"desc",label:"${_('Description')}",sortable:true}, - {key:"repos",label:"${_('Number of toplevel repositories')}",sortable:true}, + {key:"repos",label:"${_('Number of Top-level Repositories')}",sortable:true}, {key:"owner",label:"${_('Owner')}",sortable:true}, {key:"action",label:"${_('Action')}",sortable:false} ]; diff --git a/kallithea/templates/admin/repos/repo_add.html b/kallithea/templates/admin/repos/repo_add.html --- a/kallithea/templates/admin/repos/repo_add.html +++ b/kallithea/templates/admin/repos/repo_add.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Add repository')} + ${_('Add Repository')} %if c.site_name: · ${c.site_name} %endif diff --git a/kallithea/templates/admin/repos/repo_add_base.html b/kallithea/templates/admin/repos/repo_add_base.html --- a/kallithea/templates/admin/repos/repo_add_base.html +++ b/kallithea/templates/admin/repos/repo_add_base.html @@ -42,7 +42,7 @@
    ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")} - ${_('Optionaly select a group to put this repository into.')} + ${_('Optionally select a group to put this repository into.')}
    diff --git a/kallithea/templates/admin/repos/repo_creating.html b/kallithea/templates/admin/repos/repo_creating.html --- a/kallithea/templates/admin/repos/repo_creating.html +++ b/kallithea/templates/admin/repos/repo_creating.html @@ -6,7 +6,7 @@ <%def name="title()"> - ${_('%s Creating repository') % c.repo_name} + ${_('%s Creating Repository') % c.repo_name} %if c.site_name: · ${c.site_name} %endif diff --git a/kallithea/templates/admin/repos/repo_edit.html b/kallithea/templates/admin/repos/repo_edit.html --- a/kallithea/templates/admin/repos/repo_edit.html +++ b/kallithea/templates/admin/repos/repo_edit.html @@ -5,7 +5,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s repository settings') % c.repo_info.repo_name} + ${_('%s Repository Settings') % c.repo_info.repo_name} %if c.site_name: · ${c.site_name} %endif @@ -49,7 +49,7 @@ ${_('Advanced')}
  • - ${_('Extra fields')} + ${_('Extra Fields')}
  • ${_('Caches')} diff --git a/kallithea/templates/admin/repos/repo_edit_advanced.html b/kallithea/templates/admin/repos/repo_edit_advanced.html --- a/kallithea/templates/admin/repos/repo_edit_advanced.html +++ b/kallithea/templates/admin/repos/repo_edit_advanced.html @@ -1,4 +1,4 @@ -

    ${_('Fork of')}

    +

    ${_('Parent')}

    ${h.form(url('edit_repo_advanced_fork', repo_name=c.repo_info.repo_name), method='put')}
    @@ -7,7 +7,7 @@
      -
    • ${_('''Manually set this repository as a fork of another from the list''')}
      • +
    • ${_('''Manually set this repository as a fork of another from the list.''')}
    @@ -21,7 +21,7 @@ }) -

    ${_('Public journal visibility')}

    +

    ${_('Public Journal Visibility')}

    ${h.form(url('edit_repo_advanced_journal', repo_name=c.repo_info.repo_name), method='put')}
    ${h.hidden('auth_token',str(h.get_token()))} @@ -34,43 +34,43 @@ %else: %endif
      -
    • ${_('All actions made on this repository will be accessible to everyone in public journal')}
      • +
    • ${_('All actions done in this repository will be visible to everyone in the public journal.')}
    • ${h.end_form()} -

    ${_('Change locking')}

    +

    ${_('Change Locking')}

    ${h.form(url('edit_repo_advanced_locking', repo_name=c.repo_info.repo_name), method='put')}
    %if c.repo_info.locked[0]: ${h.hidden('set_unlock', '1')} ${'Locked by %s on %s' % (h.person_by_id(c.repo_info.locked[0]),h.fmt_date(h.time_to_datetime(c.repo_info.locked[1])))} %else: ${h.hidden('set_lock', '1')} ${_('Repository is not locked')} %endif
    @@ -82,16 +82,16 @@ %if c.repo_info.forks.count(): - ${ungettext('this repository has %s fork', 'this repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()} + ${ungettext('This repository has %s fork', 'This repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()} %endif
    ${h.end_form()} diff --git a/kallithea/templates/admin/repos/repo_edit_caches.html b/kallithea/templates/admin/repos/repo_edit_caches.html --- a/kallithea/templates/admin/repos/repo_edit_caches.html +++ b/kallithea/templates/admin/repos/repo_edit_caches.html @@ -1,15 +1,15 @@ ${h.form(url('edit_repo_caches', repo_name=c.repo_name), method='put')}
    - ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate repository cache'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to invalidate repository cache')+"');")} + ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate Repository Cache'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to invalidate repository cache.')+"');")}
      -
    • ${_('Manually invalidate cache for this repository. On first access repository will be cached again')} +
    • ${_('Manually invalidate cache for this repository. On first access, the repository will be cached again.')}
    - ${_('List of cached values')} + ${_('List of Cached Values')} diff --git a/kallithea/templates/admin/repos/repo_edit_fields.html b/kallithea/templates/admin/repos/repo_edit_fields.html --- a/kallithea/templates/admin/repos/repo_edit_fields.html +++ b/kallithea/templates/admin/repos/repo_edit_fields.html @@ -63,6 +63,6 @@ ${h.end_form()} %else:
    - ${_('Extra fields are disabled')} + ${_('Extra fields are disabled.')}
    %endif diff --git a/kallithea/templates/admin/repos/repo_edit_fork.html b/kallithea/templates/admin/repos/repo_edit_fork.html --- a/kallithea/templates/admin/repos/repo_edit_fork.html +++ b/kallithea/templates/admin/repos/repo_edit_fork.html @@ -6,7 +6,7 @@
      -
    • ${_('''Manually set this repository as a fork of another from the list''')}
      • +
    • ${_('''Manually set this repository as a fork of another from the list.''')}
    diff --git a/kallithea/templates/admin/repos/repo_edit_remote.html b/kallithea/templates/admin/repos/repo_edit_remote.html --- a/kallithea/templates/admin/repos/repo_edit_remote.html +++ b/kallithea/templates/admin/repos/repo_edit_remote.html @@ -5,12 +5,12 @@ ${h.form(url('edit_repo_remote', repo_name=c.repo_name), method='put')}
    - ${h.submit('remote_pull_%s' % c.repo_info.repo_name,_('Pull changes from remote location'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to pull changes from remote side')+"');")} + ${h.submit('remote_pull_%s' % c.repo_info.repo_name,_('Pull Changes from Remote Location'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to pull changes from remote side.')+"');")}
    ${h.end_form()} %else:
    - ${_('This repository does not have any remote url set')} + ${_('This repository does not have a remote url set.')}
    %endif diff --git a/kallithea/templates/admin/repos/repo_edit_settings.html b/kallithea/templates/admin/repos/repo_edit_settings.html --- a/kallithea/templates/admin/repos/repo_edit_settings.html +++ b/kallithea/templates/admin/repos/repo_edit_settings.html @@ -8,11 +8,11 @@
    ${h.text('repo_name',class_="medium")} - ${_('Non-changeable id')}: `_${c.repo_info.repo_id}` ${_('what is that ?')} + ${_('Non-changeable id')}: `_${c.repo_info.repo_id}` ${_('What is that?')}
    @@ -43,7 +43,7 @@
    ${h.select('repo_group','',c.repo_groups,class_="medium")} - ${_('Optional select a group to put this repository into.')} + ${_('Optionally select a group to put this repository into.')}
    diff --git a/kallithea/templates/admin/repos/repo_edit_statistics.html b/kallithea/templates/admin/repos/repo_edit_statistics.html --- a/kallithea/templates/admin/repos/repo_edit_statistics.html +++ b/kallithea/templates/admin/repos/repo_edit_statistics.html @@ -7,7 +7,7 @@
  • ${_('Processed progress')}: ${c.stats_percentage}%
    • - ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset statistics'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to remove current statistics')+"');")} + ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset Statistics'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to remove current statistics.')+"');")} ${h.end_form()} diff --git a/kallithea/templates/admin/repos/repos.html b/kallithea/templates/admin/repos/repos.html --- a/kallithea/templates/admin/repos/repos.html +++ b/kallithea/templates/admin/repos/repos.html @@ -2,14 +2,14 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repositories administration')} + ${_('Repositories Administration')} %if c.site_name: · ${c.site_name} %endif <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} » 0 ${_('repositories')} + ${h.link_to(_('Admin'),h.url('admin_home'))} » 0 ${_('Repositories')} <%def name="page_nav()"> ${self.menu('admin')} diff --git a/kallithea/templates/admin/settings/settings.html b/kallithea/templates/admin/settings/settings.html --- a/kallithea/templates/admin/settings/settings.html +++ b/kallithea/templates/admin/settings/settings.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Settings administration')} + ${_('Settings Administration')} %if c.site_name: · ${c.site_name} %endif @@ -38,12 +38,12 @@
  • ${_('VCS')}
    • -
  • ${_('Remap and rescan')}
    • +
  • ${_('Remap and Rescan')}
  • ${_('Global')}
  • ${_('Visual')}
  • ${_('Email')}
  • ${_('Hooks')}
    • -
  • ${_('Full text search')}
    • +
  • ${_('Full Text Search')}
  • ${_('System Info')}
    • diff --git a/kallithea/templates/admin/settings/settings_global.html b/kallithea/templates/admin/settings/settings_global.html --- a/kallithea/templates/admin/settings/settings_global.html +++ b/kallithea/templates/admin/settings/settings_global.html @@ -48,12 +48,12 @@
    ${h.text('captcha_private_key',size=60)} - ${_('Private key for reCaptcha system. Setting this value will enable captcha on registration')} + ${_('Private key for reCaptcha system. Setting this value will enable captcha on registration.')}
    - ${h.submit('save',_('Save settings'),class_="btn")} + ${h.submit('save',_('Save Settings'),class_="btn")} ${h.reset('reset',_('Reset'),class_="btn")}
    diff --git a/kallithea/templates/admin/settings/settings_hooks.html b/kallithea/templates/admin/settings/settings_hooks.html --- a/kallithea/templates/admin/settings/settings_hooks.html +++ b/kallithea/templates/admin/settings/settings_hooks.html @@ -1,4 +1,4 @@ -

    ${_('Built in Mercurial hooks - read only')}

    +

    ${_('Built-in Mercurial Hooks (Read-Only)')}

    % for hook in c.hooks: @@ -16,7 +16,7 @@
    % if c.visual.allow_custom_hooks_settings: -

    ${_('Custom hooks')}

    +

    ${_('Custom Hooks')}

    ${h.form(url('admin_settings_hooks'), method='post')}
    diff --git a/kallithea/templates/admin/settings/settings_mapping.html b/kallithea/templates/admin/settings/settings_mapping.html --- a/kallithea/templates/admin/settings/settings_mapping.html +++ b/kallithea/templates/admin/settings/settings_mapping.html @@ -10,19 +10,19 @@ ${h.checkbox('destroy',True)}
    - ${_('In case a repository was deleted from filesystem and it still exists in the database check this option to scan obsolete data in database and remove it.')} + ${_('Check this option to remove references to repositories that no longer exist in on the filesystem.')}
    ${h.checkbox('invalidate',True)}
    - ${_('Each cache data for repositories will be cleaned with this option selected. Use this to reload data and clear cache keys.')} + ${_('Check this to reload data and clear cache keys for all repositories.')}
    ${h.checkbox('hooks',True)} - +
    - ${_('Verify if Kallitheas GIT hooks are installed for each repository. Current hooks will be updated to latest version')} + ${_("Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version.")}
    diff --git a/kallithea/templates/admin/settings/settings_search.html b/kallithea/templates/admin/settings/settings_search.html --- a/kallithea/templates/admin/settings/settings_search.html +++ b/kallithea/templates/admin/settings/settings_search.html @@ -12,7 +12,7 @@ - ${_('This option completely reindex all the files within Kallithea for proper fulltext search capabilities.')} + ${_('This option completely reindexes all of the repositories for proper fulltext search capabilities.')} diff --git a/kallithea/templates/admin/settings/settings_system.html b/kallithea/templates/admin/settings/settings_system.html --- a/kallithea/templates/admin/settings/settings_system.html +++ b/kallithea/templates/admin/settings/settings_system.html @@ -4,8 +4,8 @@ (_('Kallithea version'), h.literal('%s %s' % (c.kallithea_version, _('check for updates'))), ''), (_('Python version'), c.py_version, ''), (_('Platform'), c.platform, ''), - (_('GIT version'), c.git_version, ''), - (_('GIT path'), c.ini.get('git_path'), ''), + (_('Git version'), c.git_version, ''), + (_('Git path'), c.ini.get('git_path'), ''), (_('Upgrade info endpoint'), h.literal('%s
    %s.' % (c.update_url, _('Note: please make sure this server can access this url'))), '') ] %> @@ -19,7 +19,7 @@ %endfor -

    ${_('Python packages')}

    +

    ${_('Python Packages')}

    ${_('Prefix')}
    diff --git a/kallithea/templates/admin/settings/settings_vcs.html b/kallithea/templates/admin/settings/settings_vcs.html --- a/kallithea/templates/admin/settings/settings_vcs.html +++ b/kallithea/templates/admin/settings/settings_vcs.html @@ -10,7 +10,7 @@ ${h.checkbox('web_push_ssl', 'True')} - ${_('Activate to set Kallithea to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable.')} + ${_('Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return a HTTP Error 406: Not Acceptable.')} @@ -39,7 +39,7 @@
    - +
    @@ -50,18 +50,18 @@ ${h.checkbox('extensions_hgsubversion','True')}
    - ${_('Requires hgsubversion library to be installed. Allows cloning remote SVN repositories and migrates them to Mercurial type.')} + ${_('Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial.')} ##
    ## ${h.checkbox('extensions_hggit','True')} ## ##
    - ##${_('Requires hg-git library to be installed. Allows cloning remote git repositories and migrates them to Mercurial type.')} + ##${_('Requires hg-git library to be installed. Enables cloning of remote Git repositories while converting them to Mercurial.')}
    %if c.visual.allow_repo_location_change:
    - +
    ${h.text('paths_root_path',size=60,readonly="readonly", class_="disabled")} @@ -69,7 +69,7 @@ title="${h.tooltip(_('Click to unlock. You must restart Kallithea in order to make this setting take effect.'))}">
    - ${_('Filesystem location where repositories should be stored. After changing this value a restart and rescan of the repository folder are required.')} + ${_('Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required.')}
    %else: @@ -77,7 +77,7 @@ ${h.hidden('paths_root_path',size=30,readonly="readonly", class_="disabled")} %endif
    - ${h.submit('save',_('Save settings'),class_="btn")} + ${h.submit('save',_('Save Settings'),class_="btn")} ${h.reset('reset',_('Reset'),class_="btn")}
    diff --git a/kallithea/templates/admin/settings/settings_visual.html b/kallithea/templates/admin/settings/settings_visual.html --- a/kallithea/templates/admin/settings/settings_visual.html +++ b/kallithea/templates/admin/settings/settings_visual.html @@ -27,8 +27,8 @@
    ${h.text('gravatar_url', size=80)} - ${_('''Gravatar url allows you to use other avatar server application. - Following variables of the URL will be replaced accordingly. + ${_('''Gravatar url allows you to use another avatar server application. + The following variables of the url will be replaced accordingly. {scheme} 'http' or 'https' sent from running Kallithea server, {email} user email, {md5email} md5 hash of the user email (like at gravatar.com), @@ -39,7 +39,8 @@
    ${h.text('clone_uri_tmpl', size=80)} - ${_('''Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars: + ${_('''Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}'. + The following variables are available: {scheme} 'http' or 'https' sent from running Kallithea server, {user} current user username, {netloc} network location/server host of running Kallithea server, @@ -82,7 +83,7 @@ ${h.checkbox('show_private_icon','True')}
    - ${_('Show public/private icons next to repositories names.')} + ${_('Show public/private icons next to repository names.')}
    @@ -107,12 +108,12 @@
  • [see => URI] see => URI
    • - ${_('Parses meta tags from repository description field and turns them into colored tags.')} + ${_('Parses meta tags from the repository description field and turns them into colored tags.')}
    - ${h.submit('save',_('Save settings'),class_="btn")} + ${h.submit('save',_('Save Settings'),class_="btn")} ${h.reset('reset',_('Reset'),class_="btn")}
    diff --git a/kallithea/templates/admin/user_groups/user_group_add.html b/kallithea/templates/admin/user_groups/user_group_add.html --- a/kallithea/templates/admin/user_groups/user_group_add.html +++ b/kallithea/templates/admin/user_groups/user_group_add.html @@ -10,7 +10,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} » - ${h.link_to(_('User groups'),h.url('users_groups'))} + ${h.link_to(_('User Groups'),h.url('users_groups'))} » ${_('Add User Group')} diff --git a/kallithea/templates/admin/user_groups/user_groups.html b/kallithea/templates/admin/user_groups/user_groups.html --- a/kallithea/templates/admin/user_groups/user_groups.html +++ b/kallithea/templates/admin/user_groups/user_groups.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('User groups administration')} + ${_('User Groups Administration')} %if c.site_name: · ${c.site_name} %endif diff --git a/kallithea/templates/admin/users/user_edit.html b/kallithea/templates/admin/users/user_edit.html --- a/kallithea/templates/admin/users/user_edit.html +++ b/kallithea/templates/admin/users/user_edit.html @@ -40,11 +40,11 @@
  • ${_('Profile')}
    • -
  • ${_('API keys')}
    • +
  • ${_('API Keys')}
  • ${_('Advanced')}
    • -
  • ${_('Default permissions')}
    • +
  • ${_('Default Permissions')}
  • ${_('Emails')}
    • -
  • ${_('Ip whitelist')}
    • +
  • ${_('IP Whitelist')}
    • diff --git a/kallithea/templates/admin/users/user_edit_emails.html b/kallithea/templates/admin/users/user_edit_emails.html --- a/kallithea/templates/admin/users/user_edit_emails.html +++ b/kallithea/templates/admin/users/user_edit_emails.html @@ -23,7 +23,7 @@ %endfor %else: - + %endif
    ${_('No additional emails specified')}
    ${_('No additional emails specified.')}
    diff --git a/kallithea/templates/admin/users/user_edit_ips.html b/kallithea/templates/admin/users/user_edit_ips.html --- a/kallithea/templates/admin/users/user_edit_ips.html +++ b/kallithea/templates/admin/users/user_edit_ips.html @@ -27,7 +27,7 @@ %endfor %endif %if not c.default_user_ip_map and not c.user_ip_map: -
    ${_('All IP addresses are allowed')}
    +
    ${_('All IP addresses are allowed.')}
    %endif
    diff --git a/kallithea/templates/admin/users/users.html b/kallithea/templates/admin/users/users.html --- a/kallithea/templates/admin/users/users.html +++ b/kallithea/templates/admin/users/users.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Users administration')} + ${_('Users Administration')} %if c.site_name: · ${c.site_name} %endif @@ -10,7 +10,7 @@ <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} » 0 ${_('users')} + ${h.link_to(_('Admin'),h.url('admin_home'))} » 0 ${_('Users')} <%def name="page_nav()"> @@ -51,12 +51,12 @@ var column_defs = [ {key:"gravatar",label:"",sortable:false}, {key:"username",label:"${_('Username')}",sortable:true}, - {key:"firstname",label:"${_('Firstname')}",sortable:true}, - {key:"lastname",label:"${_('Lastname')}",sortable:true}, - {key:"last_login",label:"${_('Last login')}",sortable:true, sortOptions: { sortFunction: lastLoginSort }}, + {key:"firstname",label:"${_('First Name')}",sortable:true}, + {key:"lastname",label:"${_('Last Name')}",sortable:true}, + {key:"last_login",label:"${_('Last Login')}",sortable:true, sortOptions: { sortFunction: lastLoginSort }}, {key:"active",label:"${_('Active')}",sortable:true}, {key:"admin",label:"${_('Admin')}",sortable:true}, - {key:"extern_type",label:"${_('Auth type')}",sortable:true}, + {key:"extern_type",label:"${_('Auth Type')}",sortable:true}, {key:"action",label:"${_('Action')}",sortable:false} ]; var counter = YUD.get('user_count'); diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html --- a/kallithea/templates/base/base.html +++ b/kallithea/templates/base/base.html @@ -71,11 +71,11 @@ <%def name="admin_menu()"> @@ -134,7 +134,7 @@ ${h.repo_link(c.db_repo.groups_and_repo)} %if current == 'createfork': - - ${_('Create fork')} + - ${_('Create Fork')} %endif %if c.repo_tags: - + %endif
    <%include file='tags_data.html'/> diff --git a/kallithea/tests/functional/test_admin.py b/kallithea/tests/functional/test_admin.py --- a/kallithea/tests/functional/test_admin.py +++ b/kallithea/tests/functional/test_admin.py @@ -52,7 +52,7 @@ class TestAdminController(TestController def test_index(self): self.log_user() response = self.app.get(url(controller='admin/admin', action='index')) - response.mustcontain('Admin journal') + response.mustcontain('Admin Journal') def test_filter_all_entries(self): self.log_user() diff --git a/kallithea/tests/functional/test_files.py b/kallithea/tests/functional/test_files.py --- a/kallithea/tests/functional/test_files.py +++ b/kallithea/tests/functional/test_files.py @@ -315,7 +315,7 @@ removed extra unicode conversion in diff ) response.mustcontain("vcs/web/simplevcs/views/repository.py") - #HG - ADD FILE + # Hg - ADD FILE def test_add_file_view_hg(self): self.log_user() response = self.app.get(url('files_add_home', @@ -388,7 +388,7 @@ removed extra unicode conversion in diff finally: fixture.destroy_repo(repo.repo_name) - ##GIT - ADD FILE + # Git - add file def test_add_file_view_git(self): self.log_user() response = self.app.get(url('files_add_home', @@ -460,7 +460,7 @@ removed extra unicode conversion in diff finally: fixture.destroy_repo(repo.repo_name) - #HG - EDIT + # Hg - EDIT def test_edit_file_view_hg(self): self.log_user() response = self.app.get(url('files_edit_home', @@ -531,7 +531,7 @@ removed extra unicode conversion in diff finally: fixture.destroy_repo(repo.repo_name) - #GIT - EDIT + # Git - edit def test_edit_file_view_git(self): self.log_user() response = self.app.get(url('files_edit_home', @@ -602,7 +602,7 @@ removed extra unicode conversion in diff finally: fixture.destroy_repo(repo.repo_name) - # HG - delete + # Hg - delete def test_delete_file_view_hg(self): self.log_user() response = self.app.get(url('files_delete_home', @@ -672,7 +672,7 @@ removed extra unicode conversion in diff finally: fixture.destroy_repo(repo.repo_name) - # GIT - delete + # Git - delete def test_delete_file_view_git(self): self.log_user() response = self.app.get(url('files_delete_home', diff --git a/kallithea/tests/functional/test_login.py b/kallithea/tests/functional/test_login.py --- a/kallithea/tests/functional/test_login.py +++ b/kallithea/tests/functional/test_login.py @@ -59,7 +59,7 @@ class TestLoginController(TestController response = response.follow() self.assertEqual(response.status, '200 OK') - response.mustcontain('Users administration') + response.mustcontain('Users Administration') @parameterized.expand([ ('data:text/html,',), diff --git a/kallithea/tests/functional/test_search.py b/kallithea/tests/functional/test_search.py --- a/kallithea/tests/functional/test_search.py +++ b/kallithea/tests/functional/test_search.py @@ -92,9 +92,9 @@ class TestSearchController(TestControlle 'type': 'commit'}) response.mustcontain('2 results') - #HG + # Hg response.mustcontain('3803844fdbd3b711175fc3da9bdacfcd6d29a6fb') - #GIT + # Git response.mustcontain('ff7ca51e58c505fec0dd2491de52c622bb7a806b') def test_search_author(self): diff --git a/kallithea/tests/other/test_vcs_operations.py b/kallithea/tests/other/test_vcs_operations.py --- a/kallithea/tests/other/test_vcs_operations.py +++ b/kallithea/tests/other/test_vcs_operations.py @@ -155,7 +155,7 @@ def set_anonymous_access(enable=True): def _check_proper_git_push(stdout, stderr): - #WTF GIT stderr is output ?! + #WTF Git stderr is output ?! assert 'fatal' not in stderr assert 'rejected' not in stderr assert 'Pushing to' in stderr @@ -427,7 +427,7 @@ class TestVCSOperations(BaseTestCase): err = 'Repository `%s` locked by user `%s`' % (GIT_REPO, TEST_USER_ADMIN_LOGIN) assert err in stderr - #TODO: fix this somehow later on GIT, GIT is stupid and even if we throw + #TODO: fix this somehow later on Git, Git is stupid and even if we throw #back 423 to it, it makes ANOTHER request and we fail there with 405 :/ msg = ("""abort: HTTP Error 423: Repository `%s` locked by user `%s`""" @@ -459,7 +459,7 @@ class TestVCSOperations(BaseTestCase): r = Repository.get_by_repo_name(HG_REPO) assert r.locked == [None, None] - #TODO: fix me ! somehow during tests hooks don't get called on GIT + #TODO: fix me ! somehow during tests hooks don't get called on Git def test_push_unlocks_repository_git(self): # enable locking r = Repository.get_by_repo_name(GIT_REPO) diff --git a/production.ini b/production.ini --- a/production.ini +++ b/production.ini @@ -254,7 +254,7 @@ issue_prefix = # instance_id = ## alternative return HTTP header for failed authentication. Default HTTP -## response is 401 HTTPUnauthorized. Currently HG clients have troubles with +## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with ## handling that. Set this variable to 403 to return HTTPForbidden auth_ret_code = diff --git a/test.ini b/test.ini --- a/test.ini +++ b/test.ini @@ -256,7 +256,7 @@ issue_prefix = # instance_id = ## alternative return HTTP header for failed authentication. Default HTTP -## response is 401 HTTPUnauthorized. Currently HG clients have troubles with +## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with ## handling that. Set this variable to 403 to return HTTPForbidden auth_ret_code =