Junio C Hamano <gitster@xxxxxxxxx> writes:
> Jeff King <peff@xxxxxxxx> writes:
>
>> Also, most of the rest of the merge output has been gettext-ized, but
>> not this message. If we are going to declare it not parseable, should we
>> also be internationalizing it?
>
> Heh, great minds think alike. I was wondering about that while I took a
> brief walk after sending it out.
I am reluctant to do this (including the rewording of the end-user facing
message) until we decide what to do with the reflog. Right now, I think no
tool looks at the reflog, but contaminating the reflog with translatable
messages mean that we will never be able to support "3 merges ago" just
like we support "the previous branch".
Either we split the messages into two, one translatable and given to the
end user and the other untranslatable and sent to the reflog, or find a
place in reflog entry where we can hide machine readable and stable
representation of what happened and store both the end-user facing message
and the machine readable one separately. In the longer term I would prefer
the latter.
-- >8 --
Subject: [PATCH] merge: mark the final "Merge made by..." message for l10n
The final "Merge made by ... strategy" message is an end-user facing
message and can be localized. And mark the test that depends on the exact
wording with test_i18ncmp.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
builtin/merge.c | 2 +-
t/t7602-merge-octopus-many.sh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 8bc453d..4083b9b 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -902,7 +902,7 @@ static int finish_automerge(struct commit_list *common,
strbuf_addch(&merge_msg, '\n');
run_prepare_commit_msg();
commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL);
- strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy);
+ strbuf_addf(&buf, _("Merge made by the '%s' strategy."), wt_strategy);
finish(result_commit, buf.buf);
strbuf_release(&buf);
drop_save();
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 61f36ba..3f893de 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -66,7 +66,7 @@ EOF
test_expect_success 'merge output uses pretty names' '
git reset --hard c1 &&
git merge c2 c3 c4 >actual &&
- test_cmp actual expected
+ test_i18ncmp actual expected
'
cat >expected <<\EOF
@@ -80,7 +80,7 @@ EOF
test_expect_success 'merge up-to-date output uses pretty names' '
git merge c4 c5 >actual &&
- test_cmp actual expected
+ test_i18ncmp actual expected
'
cat >expected <<\EOF
@@ -97,7 +97,7 @@ EOF
test_expect_success 'merge fast-forward output uses pretty names' '
git reset --hard c0 &&
git merge c1 c2 >actual &&
- test_cmp actual expected
+ test_i18ncmp actual expected
'
test_done
--
1.7.5.2.483.gc61ca
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html