Mercurial > hg
diff mercurial/patch.py @ 20869:9658a79968c6 stable
i18n: fix "% inside _()" problems
Before this patch, "contrib/check-code.py" can't detect these
problems, because the regexp pattern to detect "% inside _()" doesn't
suppose the case that format string consists of multiple string
components concatenated implicitly or explicitly,
This patch does below for that regexp pattern to detect "% inside _()"
problems in such case.
- put "+" into separator part ("[ \t\n]") for explicit concatenation
("...." + "...." style)
- enclose "component and separator" part by "(?:....)+" for
concatenation itself ("...." "...." or "...." + "....")
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Tue, 01 Apr 2014 02:46:03 +0900 |
| parents | 9f1d4323c749 |
| children | 4e2fb0ad00a9 |
line wrap: on
line diff
--- a/mercurial/patch.py Tue Apr 01 02:46:03 2014 +0900 +++ b/mercurial/patch.py Tue Apr 01 02:46:03 2014 +0900 @@ -711,7 +711,7 @@ if self.exists and self.create: if self.copysource: self.ui.warn(_("cannot create %s: destination already " - "exists\n" % self.fname)) + "exists\n") % self.fname) else: self.ui.warn(_("file %s already exists\n") % self.fname) self.rej.append(h)