Commits

Wagner Bruna  committed b198faa

status, i18n: revert parameterized messages introduced by 56b42d08d603

  • Participants
  • Parent commits fb198ee
  • Branches stable

Comments (0)

Files changed (1)

File tortoisehg/hgtk/status.py

             opts.git = True
             wctx = self.repo[None]
             pctx1, pctx2 = wctx.parents()
-            header = _('===== Diff to %s parent %d:%s =====\n')
-            difftext = [header % (_('first'), pctx1.rev(), str(pctx1))]
+            difftext = [_('===== Diff to first parent %d:%s =====\n') % (
+                        pctx1.rev(), str(pctx1))]
             try:
                 for s in patch.diff(self.repo, pctx1.node(), None, opts=opts):
                     difftext.extend(s.splitlines(True))
-                difftext.append('\n')
-                difftext.append(header % (_('second'), pctx2.rev(), str(pctx2)))
+                difftext.append(_('\n===== Diff to second parent %d:%s =====\n') % (
+                                pctx2.rev(), str(pctx2)))
                 for s in patch.diff(self.repo, pctx2.node(), None, opts=opts):
                     difftext.extend(s.splitlines(True))
             except (IOError, error.RepoError, error.LookupError, util.Abort), e:
         opts = patch.diffopts(self.ui, self.opts)
         opts.git = True
         difftext = []
-        header = _('===== Diff to %s parent %d:%s =====\n') 
         if self.is_merge():
             wctx = self.repo[None]
             pctx1, pctx2 = wctx.parents()
-            difftext = [header % (_('first'), pctx1.rev(), str(pctx1))]
+            difftext = [_('===== Diff to first parent %d:%s =====\n') % (
+                        pctx1.rev(), str(pctx1))]
             try:
                 for s in patch.diff(self.repo, pctx1.node(), None,
                                     match=matcher, opts=opts):
                     difftext.extend(s.splitlines(True))
-                difftext.append('\n')
-                difftext.append(header % (_('second'), pctx2.rev(), str(pctx2)))
+                difftext.append(_('\n===== Diff to second parent %d:%s =====\n') % (
+                                pctx2.rev(), str(pctx2)))
                 for s in patch.diff(self.repo, pctx2.node(), None,
                                     match=matcher, opts=opts):
                     difftext.extend(s.splitlines(True))