Mercurial > kallithea
changeset 2570:94ae02ca5f00 beta
i18n improve
| author | Takumi IINO <trot.thunder@gmail.com> |
|---|---|
| date | Sat, 07 Jul 2012 17:13:31 +0000 |
| parents | b98fd6fc67f9 |
| children | 94a92bd832c5 |
| files | rhodecode/controllers/admin/repos.py rhodecode/controllers/admin/repos_groups.py rhodecode/controllers/admin/users.py rhodecode/controllers/files.py rhodecode/controllers/pullrequests.py rhodecode/controllers/settings.py rhodecode/templates/admin/repos/repo_edit.html |
| diffstat | 7 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/repos.py Sat Jul 07 13:54:37 2012 +0200 +++ b/rhodecode/controllers/admin/repos.py Sat Jul 07 17:13:31 2012 +0000 @@ -218,7 +218,7 @@ form_result = _form.to_python(dict(request.POST)) repo = repo_model.update(repo_name, form_result) invalidate_cache('get_repo_cached_%s' % repo_name) - h.flash(_('Repository %s updated successfully' % repo_name), + h.flash(_('Repository %s updated successfully') % repo_name, category='success') changed_name = repo.repo_name action_logger(self.rhodecode_user, 'admin_updated_repo', @@ -414,7 +414,7 @@ self.rhodecode_user.username) fork = repo.fork.repo_name if repo.fork else _('Nothing') Session.commit() - h.flash(_('Marked repo %s as fork of %s' % (repo_name,fork)), + h.flash(_('Marked repo %s as fork of %s') % (repo_name,fork), category='success') except Exception, e: raise
--- a/rhodecode/controllers/admin/repos_groups.py Sat Jul 07 13:54:37 2012 +0200 +++ b/rhodecode/controllers/admin/repos_groups.py Sat Jul 07 17:13:31 2012 +0000 @@ -195,14 +195,14 @@ repos = gr.repositories.all() if repos: h.flash(_('This group contains %s repositores and cannot be ' - 'deleted' % len(repos)), + 'deleted') % len(repos), category='error') return redirect(url('repos_groups')) try: ReposGroupModel().delete(id) Session.commit() - h.flash(_('removed repos group %s' % gr.group_name), category='success') + h.flash(_('removed repos group %s') % gr.group_name, category='success') #TODO: in future action_logger(, '', '', '', self.sa) except IntegrityError, e: if e.message.find('groups_group_parent_id_fkey') != -1: @@ -213,12 +213,12 @@ else: log.error(traceback.format_exc()) h.flash(_('error occurred during deletion of repos ' - 'group %s' % gr.group_name), category='error') + 'group %s') % gr.group_name, category='error') except Exception: log.error(traceback.format_exc()) h.flash(_('error occurred during deletion of repos ' - 'group %s' % gr.group_name), category='error') + 'group %s') % gr.group_name, category='error') return redirect(url('repos_groups'))
--- a/rhodecode/controllers/admin/users.py Sat Jul 07 13:54:37 2012 +0200 +++ b/rhodecode/controllers/admin/users.py Sat Jul 07 17:13:31 2012 +0000 @@ -232,7 +232,7 @@ try: user_model.add_extra_email(id, email) Session.commit() - h.flash(_("Added email %s to user" % email), category='success') + h.flash(_("Added email %s to user") % email, category='success') except formencode.Invalid, error: msg = error.error_dict['email'] h.flash(msg, category='error')
--- a/rhodecode/controllers/files.py Sat Jul 07 13:54:37 2012 +0200 +++ b/rhodecode/controllers/files.py Sat Jul 07 17:13:31 2012 +0000 @@ -82,7 +82,7 @@ repo_name=c.repo_name, revision=0, f_path='') add_new = '<a href="%s">[%s]</a>' % (url_, _('add new')) - h.flash(h.literal(_('There are no files yet %s' % add_new)), + h.flash(h.literal(_('There are no files yet %s') % add_new), category='warning') redirect(h.url('summary_home', repo_name=repo_name)) @@ -267,7 +267,7 @@ user=self.rhodecode_user, author=author, message=message, content=content, f_path=f_path) - h.flash(_('Successfully committed to %s' % f_path), + h.flash(_('Successfully committed to %s') % f_path, category='success') except Exception: @@ -321,7 +321,7 @@ user=self.rhodecode_user, author=author, message=message, content=content, f_path=node_path) - h.flash(_('Successfully committed to %s' % node_path), + h.flash(_('Successfully committed to %s') % node_path, category='success') except NodeAlreadyExistsError, e: h.flash(_(e), category='error')
--- a/rhodecode/controllers/pullrequests.py Sat Jul 07 13:54:37 2012 +0200 +++ b/rhodecode/controllers/pullrequests.py Sat Jul 07 17:13:31 2012 +0000 @@ -133,7 +133,7 @@ for u in User.query().filter(User.username != 'default').all(): uname = u.username if org_repo.user == u: - uname = _('%s (owner)' % u.username) + uname = _('%s (owner)') % u.username # auto add owner to pull-request recipients c.review_members.append([u.user_id, uname]) c.available_members.append([u.user_id, uname])
--- a/rhodecode/controllers/settings.py Sat Jul 07 13:54:37 2012 +0200 +++ b/rhodecode/controllers/settings.py Sat Jul 07 17:13:31 2012 +0000 @@ -104,7 +104,7 @@ repo_model.update(repo_name, form_result) invalidate_cache('get_repo_cached_%s' % repo_name) - h.flash(_('Repository %s updated successfully' % repo_name), + h.flash(_('Repository %s updated successfully') % repo_name, category='success') changed_name = form_result['repo_name_full'] action_logger(self.rhodecode_user, 'user_updated_repo',
--- a/rhodecode/templates/admin/repos/repo_edit.html Sat Jul 07 13:54:37 2012 +0200 +++ b/rhodecode/templates/admin/repos/repo_edit.html Sat Jul 07 17:13:31 2012 +0000 @@ -129,8 +129,8 @@ </div> <div class="buttons"> - ${h.submit('save','Save',class_="ui-button")} - ${h.reset('reset','Reset',class_="ui-button")} + ${h.submit('save',_('Save'),class_="ui-button")} + ${h.reset('reset',_('Reset'),class_="ui-button")} </div> </div> </div>