[PATCH] commands, i18n: avoid untranslated strings as message parameters

Wagner Bruna wagner.bruna at gmail.com
Sun Apr 5 03:17:41 CDT 2009


# HG changeset patch
# User Wagner Bruna <wbruna at yahoo.com>
# Date 1238919106 10800
# Node ID 3d77e9c5a4d75d02c29aed5602d7231cf41f1874
# Parent  7b813bdbd5d072285af45e15cb95b80fd29268fa
commands, i18n: avoid untranslated strings as message parameters

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2817,8 +2817,10 @@
             if not repo.tagtype(n):
                 raise util.Abort(_('tag \'%s\' does not exist') % n)
             if repo.tagtype(n) != expectedtype:
-                raise util.Abort(_('tag \'%s\' is not a %s tag') %
-                                 (n, expectedtype))
+                if expectedtype == 'global':
+                    raise util.Abort(_('tag \'%s\' is not a global tag') % n)
+                else:
+                    raise util.Abort(_('tag \'%s\' is not a local tag') % n)
         rev_ = nullid
         if not message:
             message = _('Removed tag %s') % ', '.join(names)


More information about the Mercurial-devel mailing list