Mercurial > public > mercurial-scm > hg
comparison mercurial/patch.py @ 8090:388bb482024e
patch, i18n: avoid parameterized plural
author | Wagner Bruna <wbruna@yahoo.com> |
---|---|
date | Mon, 20 Apr 2009 21:16:14 -0300 |
parents | 425a30ddfff6 |
children | a1a5a57efe90 |
comparison
equal
deleted
inserted
replaced
8089:67efe5e3b0fb | 8090:388bb482024e |
---|---|
419 else: | 419 else: |
420 fuzzstr = "" | 420 fuzzstr = "" |
421 f = self.ui.note | 421 f = self.ui.note |
422 offset = l - orig_start - fuzzlen | 422 offset = l - orig_start - fuzzlen |
423 if offset == 1: | 423 if offset == 1: |
424 linestr = "line" | 424 msg = _("Hunk #%d succeeded at %d %s" |
425 "(offset %d line).\n") | |
425 else: | 426 else: |
426 linestr = "lines" | 427 msg = _("Hunk #%d succeeded at %d %s" |
427 f(_("Hunk #%d succeeded at %d %s(offset %d %s).\n") % | 428 "(offset %d lines).\n") |
428 (h.number, l+1, fuzzstr, offset, linestr)) | 429 f(msg % (h.number, l+1, fuzzstr, offset)) |
429 return fuzzlen | 430 return fuzzlen |
430 self.printfile(True) | 431 self.printfile(True) |
431 self.ui.warn(_("Hunk #%d FAILED at %d\n") % (h.number, orig_start)) | 432 self.ui.warn(_("Hunk #%d FAILED at %d\n") % (h.number, orig_start)) |
432 self.rej.append(h) | 433 self.rej.append(h) |
433 return -1 | 434 return -1 |