Mercurial > hg
comparison hgext/fetch.py @ 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 | 868670dbc237 |
| children | 4c287332e03b 07d127e771a1 |
comparison
equal
deleted
inserted
replaced
| 9182:3a319bc8906d | 9183:d0225fa2f6c4 |
|---|---|
| 119 ui.status(_('merging with %d:%s\n') % | 119 ui.status(_('merging with %d:%s\n') % |
| 120 (repo.changelog.rev(secondparent), short(secondparent))) | 120 (repo.changelog.rev(secondparent), short(secondparent))) |
| 121 err = hg.merge(repo, secondparent, remind=False) | 121 err = hg.merge(repo, secondparent, remind=False) |
| 122 | 122 |
| 123 if not err: | 123 if not err: |
| 124 # we don't translate commit messages | |
| 124 message = (cmdutil.logmessage(opts) or | 125 message = (cmdutil.logmessage(opts) or |
| 125 (_('Automated merge with %s') % | 126 ('Automated merge with %s' % |
| 126 url.removeauth(other.url()))) | 127 url.removeauth(other.url()))) |
| 127 editor = cmdutil.commiteditor | 128 editor = cmdutil.commiteditor |
| 128 if opts.get('force_editor') or opts.get('edit'): | 129 if opts.get('force_editor') or opts.get('edit'): |
| 129 editor = cmdutil.commitforceeditor | 130 editor = cmdutil.commitforceeditor |
| 130 n = repo.commit(message, opts['user'], opts['date'], | 131 n = repo.commit(message, opts['user'], opts['date'], |