undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: mark checkout plural warning for translation

Browse Source 
Mark the "Warning: you are leaving %d commit(s) behind" message added
in v1.7.5-rc0~74^2 (commit: give final warning when reattaching HEAD
to leave commits behind) by Junio C Hamano for translation.

This message requires the use of ngettext() features, and is the first
message to use the Q_() wrapper around ngettext().

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2011-04-10 19:34:08 +00:00 committed by Junio C Hamano
parent 20fc73e3b0
commit f06f08b78c
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/checkout.c
View File

@ -648,18 +648,30 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)
if (more == 1) if (more == 1)
describe_one_orphan(&sb, last); describe_one_orphan(&sb, last);
else else
strbuf_addf(&sb, " ... and %d more.\n", more); strbuf_addf(&sb, _(" ... and %d more.\n"), more);
} }
fprintf(stderr, fprintf(stderr,
"Warning: you are leaving %d commit%s behind, " Q_(
/* The singular version */
"Warning: you are leaving %d commit behind, "
"not connected to\n"
"any of your branches:\n\n"
"%s\n"
"If you want to keep it by creating a new branch, "
"this may be a good time\nto do so with:\n\n"
" git branch new_branch_name %s\n\n",
/* The plural version */
"Warning: you are leaving %d commits behind, "
"not connected to\n" "not connected to\n"
"any of your branches:\n\n" "any of your branches:\n\n"
"%s\n" "%s\n"
"If you want to keep them by creating a new branch, " "If you want to keep them by creating a new branch, "
"this may be a good time\nto do so with:\n\n" "this may be a good time\nto do so with:\n\n"
" git branch new_branch_name %s\n\n", " git branch new_branch_name %s\n\n",
lost, ((1 < lost) ? "s" : ""), /* Give ngettext() the count */
lost),
lost,
sb.buf, sb.buf,
sha1_to_hex(commit->object.sha1)); sha1_to_hex(commit->object.sha1));
strbuf_release(&sb); strbuf_release(&sb);

15
t/t2020-checkout-detach.sh
View File

@ -108,21 +108,30 @@ test_expect_success 'checkout warns on orphan commits' '
echo content >orphan && echo content >orphan &&
git add orphan && git add orphan &&
git commit -a -m orphan && git commit -a -m orphan &&
git checkout master 2>stderr && git checkout master 2>stderr
'
test_expect_success C_LOCALE_OUTPUT 'checkout warns on orphan commits: output' '
check_orphan_warning stderr check_orphan_warning stderr
' '
test_expect_success 'checkout does not warn leaving ref tip' ' test_expect_success 'checkout does not warn leaving ref tip' '
reset && reset &&
git checkout --detach two && git checkout --detach two &&
git checkout master 2>stderr && git checkout master 2>stderr
'
test_expect_success C_LOCALE_OUTPUT 'checkout does not warn leaving ref tip' '
check_no_orphan_warning stderr check_no_orphan_warning stderr
' '
test_expect_success 'checkout does not warn leaving reachable commit' ' test_expect_success 'checkout does not warn leaving reachable commit' '
reset && reset &&
git checkout --detach HEAD^ && git checkout --detach HEAD^ &&
git checkout master 2>stderr && git checkout master 2>stderr
'
test_expect_success C_LOCALE_OUTPUT 'checkout does not warn leaving reachable commit' '
check_no_orphan_warning stderr check_no_orphan_warning stderr
' '