keyword, i18n: avoid untranslated strings as message parameters
authorWagner Bruna <wbruna@yahoo.com>
Mon, 20 Apr 2009 21:16:13 -0300
changeset 8089 67efe5e3b0fb
parent 8088 bdeb380a10de
child 8090 388bb482024e
keyword, i18n: avoid untranslated strings as message parameters
hgext/keyword.py
--- a/hgext/keyword.py	Mon Apr 20 20:38:37 2009 -0300
+++ b/hgext/keyword.py	Mon Apr 20 21:16:13 2009 -0300
@@ -177,7 +177,6 @@
         candidates = [f for f in files if self.iskwfile(f, ctx.flags)]
         if candidates:
             self.restrict = True # do not expand when reading
-            action = expand and 'expanding' or 'shrinking'
             for f in candidates:
                 fp = self.repo.file(f)
                 data = fp.read(mf[f])
@@ -191,7 +190,11 @@
                 else:
                     found = self.re_kw.search(data)
                 if found:
-                    notify(_('overwriting %s %s keywords\n') % (f, action))
+                    if expand:
+                        msg = _('overwriting %s expanding keywords\n')
+                    else:
+                        msg = _('overwriting %s shrinking keywords\n')
+                    notify(msg % f)
                     self.repo.wwrite(f, data, mf.flags(f))
                     self.repo.dirstate.normal(f)
             self.restrict = False