Mercurial > hg-stable
changeset 6952:3fffba1c87d0
i18n: avoid naive plural tricks
| author | Martin Geisler <mg@daimi.au.dk> |
|---|---|
| date | Sun, 31 Aug 2008 16:12:02 +0200 |
| parents | c8c9ce0ed3ee |
| children | 63b5f4c73c98 |
| files | mercurial/patch.py tests/test-mq-missingfiles.out tests/test-mq.out tests/test-transplant.out |
| diffstat | 4 files changed, 6 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/patch.py Sun Aug 31 12:05:29 2008 +0200 +++ b/mercurial/patch.py Sun Aug 31 16:12:02 2008 +0200 @@ -376,15 +376,11 @@ if not self.rej: return - if self.hunks != 1: - hunkstr = "s" - else: - hunkstr = "" fname = self.fname + ".rej" self.ui.warn( - _("%d out of %d hunk%s FAILED -- saving rejects to file %s\n") % - (len(self.rej), self.hunks, hunkstr, fname)) + _("%d out of %d hunks FAILED -- saving rejects to file %s\n") % + (len(self.rej), self.hunks, fname)) try: os.unlink(fname) except: pass
--- a/tests/test-mq-missingfiles.out Sun Aug 31 12:05:29 2008 +0200 +++ b/tests/test-mq-missingfiles.out Sun Aug 31 16:12:02 2008 +0200 @@ -30,7 +30,7 @@ % push git patch with missing target applying changeb unable to find 'b' for patching -1 out of 1 hunk FAILED -- saving rejects to file b.rej +1 out of 1 hunks FAILED -- saving rejects to file b.rej patch failed, unable to continue (try -v) b: No such file or directory b not tracked!
--- a/tests/test-mq.out Sun Aug 31 12:05:29 2008 +0200 +++ b/tests/test-mq.out Sun Aug 31 16:12:02 2008 +0200 @@ -287,7 +287,7 @@ applying foo applying bar file foo already exists -1 out of 1 hunk FAILED -- saving rejects to file foo.rej +1 out of 1 hunks FAILED -- saving rejects to file foo.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir Errors during apply, please fix and refresh bar
--- a/tests/test-transplant.out Sun Aug 31 12:05:29 2008 +0200 +++ b/tests/test-transplant.out Sun Aug 31 16:12:02 2008 +0200 @@ -110,14 +110,14 @@ applying a1e30dd1b8e7 patching file foo Hunk #1 FAILED at 0 -1 out of 1 hunk FAILED -- saving rejects to file foo.rej +1 out of 1 hunks FAILED -- saving rejects to file foo.rej patch failed to apply abort: Fix up the merge and run hg transplant --continue 1 files updated, 0 files merged, 1 files removed, 0 files unresolved applying a1e30dd1b8e7 patching file foo Hunk #1 FAILED at 0 -1 out of 1 hunk FAILED -- saving rejects to file foo.rej +1 out of 1 hunks FAILED -- saving rejects to file foo.rej patch failed to apply abort: Fix up the merge and run hg transplant --continue a1e30dd1b8e7 transplanted as f1563cf27039