Mercurial > kallithea
changeset 5561:59edb20f88ad
i18n: some tweaks for i18n
| author | Takumi IINO <trot.thunder@gmail.com> |
|---|---|
| date | Sat, 24 Oct 2015 16:19:20 +0100 |
| parents | 6ed126ef71af |
| children | 21f80c6cdf0c |
| files | kallithea/controllers/files.py kallithea/model/db.py kallithea/templates/admin/repos/repo_edit_advanced.html kallithea/templates/forks/forks_data.html kallithea/templates/pullrequests/pullrequest_show_all.html |
| diffstat | 5 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/files.py Tue Oct 20 22:18:47 2015 +0900 +++ b/kallithea/controllers/files.py Sat Oct 24 16:19:20 2015 +0100 @@ -316,7 +316,7 @@ # check if revision is a branch name or branch hash if revision not in _branches.keys() + _branches.values(): h.flash(_('You can only delete files with revision ' - 'being a valid branch '), category='warning') + 'being a valid branch'), category='warning') raise HTTPFound(location=h.url('files_home', repo_name=repo_name, revision='tip', f_path=f_path)) @@ -376,7 +376,7 @@ # check if revision is a branch name or branch hash if revision not in _branches.keys() + _branches.values(): h.flash(_('You can only edit files with revision ' - 'being a valid branch '), category='warning') + 'being a valid branch'), category='warning') raise HTTPFound(location=h.url('files_home', repo_name=repo_name, revision='tip', f_path=f_path))
--- a/kallithea/model/db.py Tue Oct 20 22:18:47 2015 +0900 +++ b/kallithea/model/db.py Sat Oct 24 16:19:20 2015 +0100 @@ -1692,7 +1692,7 @@ ('hg.create.write_on_repogroup.false', _('Repository creation disabled with write permission to a repository group')), ('hg.fork.none', _('Only admins can fork repositories')), - ('hg.fork.repository', _('Non-admins can can fork repositories')), + ('hg.fork.repository', _('Non-admins can fork repositories')), ('hg.register.none', _('Registration disabled')), ('hg.register.manual_activate', _('User registration with manual account activation')),
--- a/kallithea/templates/admin/repos/repo_edit_advanced.html Tue Oct 20 22:18:47 2015 +0900 +++ b/kallithea/templates/admin/repos/repo_edit_advanced.html Sat Oct 24 16:19:20 2015 +0100 @@ -53,7 +53,7 @@ <i class="icon-lock-open-alt"></i> ${_('Unlock Repository')} </button> - ${'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])))} + ${_('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')} <button class="btn btn-small" type="submit"
--- a/kallithea/templates/forks/forks_data.html Tue Oct 20 22:18:47 2015 +0900 +++ b/kallithea/templates/forks/forks_data.html Sat Oct 24 16:19:20 2015 +0100 @@ -16,7 +16,7 @@ <div style="clear:both;padding-top: 10px"></div> <div class="follower_date">${_('Forked')} - <span class="tooltip" title="${h.fmt_date(f.created_on)}"> ${h.age(f.created_on)}</span> - <a title="${_('Compare fork with %s' % c.repo_name)}" + <a title="${_('Compare fork with %s') % c.repo_name}" href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref_name=c.db_repo.landing_rev[1], merge=1)}" class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Fork')}</a> </div>
--- a/kallithea/templates/pullrequests/pullrequest_show_all.html Tue Oct 20 22:18:47 2015 +0900 +++ b/kallithea/templates/pullrequests/pullrequest_show_all.html Sat Oct 24 16:19:20 2015 +0100 @@ -8,7 +8,7 @@ <%def name="breadcrumbs_links()"> %if c.from_: - ${_("Pull Requests from %s'") % c.repo_name} + ${_("Pull Requests from '%s'") % c.repo_name} %else: ${_("Pull Requests to '%s'") % c.repo_name} %endif