i18n: git-merge "Wonderful" message
Gettextize the "Wonderful" message. A test in t7600-merge.sh explicitly checked for this message. Change it to skip under GETTEXT_POISON=YesPlease. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Feb 22, 2011 at 23:42 UTC
157efde10f34344f0970ca71f33dd5ae1c29b6f5
2 files changed
+2
-2
builtin/merge.c
+1
-1
@@ -803,7 +803,7 @@ static int merge_trivial(void)
803
struct commit_list *parent = xmalloc(sizeof(*parent));
804
805
write_tree_trivial(result_tree);
806
- printf("Wonderful.\n");
806
+ printf(_("Wonderful.\n"));
807
parent->item = lookup_commit(head);
808
parent->next = xmalloc(sizeof(*parent->next));
809
parent->next->item = remoteheads->item;
t/t7600-merge.sh
+1
-1
@@ -495,7 +495,7 @@ test_expect_success 'merge fast-forward in a dirty tree' '
495
496
test_debug 'git log --graph --decorate --oneline --all'
497
498
-test_expect_success 'in-index merge' '
498
+test_expect_success C_LOCALE_OUTPUT 'in-index merge' '
499
git reset --hard c0 &&
500
git merge --no-ff -s resolve c1 >out &&
501
grep "Wonderful." out &&