kallithea Changeset - f569f44a8a89

Changeset - f569f44a8a89

Parent rev.

Child rev.

[Not reviewed]

stable

0 5 0

Takumi IINO - 10 years ago 2015-10-24 17:19:20
trot.thunder@gmail.com

Grafted from: 59edb20f88ad

i18n: some tweaks for i18n

5 files changed with 6 insertions and 6 deletions:

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

0 comments (0 inline, 0 general)

kallithea/controllers/files.py

➞

Show inline comments

@@ @@ -315,7 +315,7 @@ class FilesController(BaseRepoController @@
         # 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')
             return redirect(h.url('files_home',
                                   repo_name=repo_name, revision='tip',
                                   f_path=f_path))
@@ @@ -375,7 +375,7 @@ class FilesController(BaseRepoController @@
         # 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')
             return redirect(h.url('files_home',
                                   repo_name=repo_name, revision='tip',
                                   f_path=f_path))

kallithea/model/db.py

➞

Show inline comments

@@ @@ -1692,7 +1692,7 @@ class Permission(Base, BaseModel): @@
         ('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')),

kallithea/templates/admin/repos/repo_edit_advanced.html

➞

Show inline comments

@@ @@ -53,7 +53,7 @@ ${h.form(url('edit_repo_advanced_locking @@
             <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"

kallithea/templates/forks/forks_data.html

➞

Show inline comments

@@ @@ -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>

kallithea/templates/pullrequests/pullrequest_show_all.html

➞

Show inline comments

@@ @@ -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

0 comments (0 inline, 0 general)