keyword, i18n: avoid untranslated strings as message parameters
[ original upstream message ]
--- a/hgkw/keyword.py Tue Apr 07 22:58:05 2009 +0200
+++ b/hgkw/keyword.py Mon Apr 20 21:16:13 2009 -0300
@@ -179,7 +179,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])
@@ -193,7 +192,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