Mercurial > hg

diff mercurial/filemerge.py @ 32254:177742666abd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: make warning message more i18n friendly Before this patch, " specified for " part of warning messages (e.g. "couldn't find merge tool TOOL specified for PAT") isn't translatable.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 13 May 2017 03:28:36 +0900
parents 7d4ce4b567c5
children 7e35d31b41fd
line wrap: on
line diff
--- a/mercurial/filemerge.py	Sat May 13 03:28:36 2017 +0900
+++ b/mercurial/filemerge.py	Sat May 13 03:28:36 2017 +0900
@@ -133,7 +133,7 @@
     def check(tool, pat, symlink, binary, changedelete):
         tmsg = tool
         if pat:
-            tmsg += " specified for " + pat
+            tmsg = _("%s (for pattern %s)") % (tool, pat)
         if not _findtool(ui, tool):
             if pat: # explicitly requested tool deserves a warning
                 ui.warn(_("couldn't find merge tool %s\n") % tmsg)