Mercurial > hg-stable
changeset 9183:d0225fa2f6c4
do not translate commit messages
It is not very helpful to have 'Added tag %s for changeset %s' and
similar messages translated into different languages when people work
together using different locales.
We now use English strings without support for translations. If
needed, the user can still supply a custom string for most commands.
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Wed, 22 Jul 2009 22:50:34 +0200 |
| parents | 3a319bc8906d |
| children | f6eb03027411 07d127e771a1 |
| files | hgext/fetch.py hgext/gpg.py hgext/rebase.py hgext/transplant.py mercurial/commands.py |
| diffstat | 5 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/fetch.py Tue Jul 21 12:06:32 2009 +0200 +++ b/hgext/fetch.py Wed Jul 22 22:50:34 2009 +0200 @@ -121,8 +121,9 @@ err = hg.merge(repo, secondparent, remind=False) if not err: + # we don't translate commit messages message = (cmdutil.logmessage(opts) or - (_('Automated merge with %s') % + ('Automated merge with %s' % url.removeauth(other.url()))) editor = cmdutil.commiteditor if opts.get('force_editor') or opts.get('edit'):
--- a/hgext/gpg.py Tue Jul 21 12:06:32 2009 +0200 +++ b/hgext/gpg.py Wed Jul 22 22:50:34 2009 +0200 @@ -251,7 +251,8 @@ message = opts['message'] if not message: - message = "\n".join([_("Added signature for changeset %s") + # we don't translate commit messages + message = "\n".join(["Added signature for changeset %s" % hgnode.short(n) for n in nodes]) try:
--- a/hgext/rebase.py Tue Jul 21 12:06:32 2009 +0200 +++ b/hgext/rebase.py Wed Jul 22 22:50:34 2009 +0200 @@ -163,6 +163,7 @@ newrev = nullrev try: if last: + # we don't translate commit messages commitmsg = 'Collapsed revision' for rebased in state: if rebased not in skipped:
--- a/hgext/transplant.py Tue Jul 21 12:06:32 2009 +0200 +++ b/hgext/transplant.py Wed Jul 22 22:50:34 2009 +0200 @@ -206,6 +206,7 @@ (user, date, message) = self.filter(filter, cl, patchfile) if log: + # we don't translate messages inserted into commits message += '\n(transplanted from %s)' % revlog.hex(node) self.ui.status(_('applying %s\n') % revlog.short(node))
--- a/mercurial/commands.py Tue Jul 21 12:06:32 2009 +0200 +++ b/mercurial/commands.py Wed Jul 22 22:50:34 2009 +0200 @@ -246,7 +246,8 @@ commit_opts = opts.copy() commit_opts['addremove'] = False if not commit_opts['message'] and not commit_opts['logfile']: - commit_opts['message'] = _("Backed out changeset %s") % (short(node)) + # we don't translate commit messages + commit_opts['message'] = "Backed out changeset %s" % (short(node)) commit_opts['force_editor'] = True commit(ui, repo, **commit_opts) def nice(node): @@ -2914,7 +2915,8 @@ raise util.Abort(_('tag \'%s\' is not a local tag') % n) rev_ = nullid if not message: - message = _('Removed tag %s') % ', '.join(names) + # we don't translate commit messages + message = 'Removed tag %s' % ', '.join(names) elif not opts.get('force'): for n in names: if n in repo.tags(): @@ -2926,7 +2928,8 @@ r = repo[rev_].node() if not message: - message = (_('Added tag %s for changeset %s') % + # we don't translate commit messages + message = ('Added tag %s for changeset %s' % (', '.join(names), short(r))) date = opts.get('date')