##// END OF EJS Templates
i18n: fix "% inside _()" problems...
FUJIWARA Katsunori -
r20869:9658a799 stable
parent child Browse files
Show More
@@ -198,8 +198,8 b' pypats = ['
198 (r'\s<>\s', '<> operator is not available in Python 3+, use !='),
198 (r'\s<>\s', '<> operator is not available in Python 3+, use !='),
199 (r'^\s*\t', "don't use tabs"),
199 (r'^\s*\t', "don't use tabs"),
200 (r'\S;\s*\n', "semicolon"),
200 (r'\S;\s*\n', "semicolon"),
201 (r'[^_]_\("[^"]+"[ \t\n]*%', "don't use % inside _()"),
201 (r'[^_]_\((?:"[^"]+"[ \t\n+]*)+%', "don't use % inside _()"),
202 (r"[^_]_\('[^']+'[ \t\n]*%", "don't use % inside _()"),
202 (r"[^_]_\((?:'[^']+'[ \t\n+]*)+%", "don't use % inside _()"),
203 (r'(\w|\)),\w', "missing whitespace after ,"),
203 (r'(\w|\)),\w', "missing whitespace after ,"),
204 (r'(\w|\))[+/*\-<>]\w', "missing whitespace in expression"),
204 (r'(\w|\))[+/*\-<>]\w', "missing whitespace in expression"),
205 (r'^\s+(\w|\.)+=\w[^,()\n]*$', "missing whitespace in assignment"),
205 (r'^\s+(\w|\.)+=\w[^,()\n]*$', "missing whitespace in assignment"),
@@ -344,7 +344,7 b' def reposetup(ui, repo):'
344 continue
344 continue
345 if inconsistenteol(data):
345 if inconsistenteol(data):
346 raise util.Abort(_("inconsistent newline style "
346 raise util.Abort(_("inconsistent newline style "
347 "in %s\n" % f))
347 "in %s\n") % f)
348 return super(eolrepo, self).commitctx(ctx, error)
348 return super(eolrepo, self).commitctx(ctx, error)
349 repo.__class__ = eolrepo
349 repo.__class__ = eolrepo
350 repo._hgcleardirstate()
350 repo._hgcleardirstate()
@@ -711,7 +711,7 b' class patchfile(object):'
711 if self.exists and self.create:
711 if self.exists and self.create:
712 if self.copysource:
712 if self.copysource:
713 self.ui.warn(_("cannot create %s: destination already "
713 self.ui.warn(_("cannot create %s: destination already "
714 "exists\n" % self.fname))
714 "exists\n") % self.fname)
715 else:
715 else:
716 self.ui.warn(_("file %s already exists\n") % self.fname)
716 self.ui.warn(_("file %s already exists\n") % self.fname)
717 self.rej.append(h)
717 self.rej.append(h)
@@ -1021,7 +1021,7 b' class svnsubrepo(abstractsubrepo):'
1021 def remove(self):
1021 def remove(self):
1022 if self.dirty():
1022 if self.dirty():
1023 self._ui.warn(_('not removing repo %s because '
1023 self._ui.warn(_('not removing repo %s because '
1024 'it has changes.\n' % self._path))
1024 'it has changes.\n') % self._path)
1025 return
1025 return
1026 self._ui.note(_('removing subrepo %s\n') % self._path)
1026 self._ui.note(_('removing subrepo %s\n') % self._path)
1027
1027
General Comments 0
You need to be logged in to leave comments. Login now