[PATCH 71/72] gettextize: git-revert split up "could not revert/apply" message
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Feb 19, 2011, 19:24 UTC
- Message-ID
- <1298143495-3681-72-git-send-email-avarab@gmail.com>
- In-Reply-To
- <1298143495-3681-1-git-send-email-avarab@gmail.com>
Split up the "could not %s %s... %s" message into "could not revert %s... %s" and "could not apply %s... %s". This makes it easier for translators to understand the message.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/revert.c | 5 +++-- t/t3507-cherry-pick-conflict.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c index b0a5ffb..98dfd4d 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -536,8 +536,9 @@ static int do_pick_commit(void) } if (res) { - error("could not %s %s... %s", - action == REVERT ? "revert" : "apply", + error(action == REVERT + ? _("could not revert %s... %s") + : _("could not apply %s... %s"), find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), msg.subject); print_advice(); diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 607bf25..bf664ec 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -38,7 +38,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' ' test "$head" = "$newhead" ' -test_expect_success 'advice from failed cherry-pick' " +test_expect_success NO_GETTEXT_POISON 'advice from failed cherry-pick' " git checkout -f initial^0 && git read-tree -u --reset HEAD && git clean -d -f -f -q -x &&
-- 1.7.2.3