Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

stable prej, i18n: avoid parameterized messages

Changeset 410128b06198…

Parent 52ac8fe83a98…

by Wagner Bruna

Changes to one file · Browse files at 410128b06198 Showing diff from parent 52ac8fe83a98 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​util/​prej.py Stacked
 
282
283
284
 
285
286
287
 
 
 
288
 
 
289
290
291
292
293
294
295
296
297
298
 
 
 
299
300
301
 
282
283
284
285
286
 
 
287
288
289
290
291
292
293
 
 
 
 
 
 
 
 
 
294
295
296
297
298
299
@@ -282,20 +282,18 @@
  self.lines[l : l + len(old)] = newlines   self.offset += len(newlines) - len(old)   self.dirty = 1 + offset = l - orig_start - fuzzlen   if fuzzlen: - fuzzstr = "with fuzz %d " % fuzzlen - f = self.ui.warn + msg = _("Hunk #%d succeeded at %d " + "with fuzz %d " + "(offset %d lines).\n")   self.printfile(True) + self.ui.warn(msg % + (h.number, l + 1, fuzzlen, offset))   else: - fuzzstr = "" - f = self.ui.note - offset = l - orig_start - fuzzlen - if offset == 1: - linestr = "line" - else: - linestr = "lines" - f(_("Hunk #%d succeeded at %d %s(offset %d %s).\n") % - (h.number, l+1, fuzzstr, offset, linestr)) + msg = _("Hunk #%d succeeded at %d " + "(offset %d lines).\n") + self.ui.note(msg % (h.number, l + 1, offset))   return fuzzlen   self.printfile(True)   self.ui.warn(_("Hunk #%d FAILED at %d\n") % (h.number, orig_start))