kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

i18n: commit: mark message for translation 

Mark message commit_utf8_warn for translation.

Update tests to reflect changes.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Vasco Almeida 2016-09-19 13:08:16 +00:00 committed by Junio C Hamano
parent 43073f8984
commit 4fa4b31507
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
commit.c
View File

@ -1511,9 +1511,9 @@ static int verify_utf8(struct strbuf *buf)
} }


static const char commit_utf8_warn[] = static const char commit_utf8_warn[] =
"Warning: commit message did not conform to UTF-8.\n" N_("Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n" "You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"; "variable i18n.commitencoding to the encoding your project uses.\n");


int commit_tree_extended(const char *msg, size_t msg_len, int commit_tree_extended(const char *msg, size_t msg_len,
const unsigned char *tree, const unsigned char *tree,
@ -1566,7 +1566,7 @@ int commit_tree_extended(const char *msg, size_t msg_len,


/* And check the encoding */ /* And check the encoding */
if (encoding_is_utf8 && !verify_utf8(&buffer)) if (encoding_is_utf8 && !verify_utf8(&buffer))
fprintf(stderr, commit_utf8_warn); fprintf(stderr, _(commit_utf8_warn));


if (sign_commit && do_sign_commit(&buffer, sign_commit)) if (sign_commit && do_sign_commit(&buffer, sign_commit))
return -1; return -1;

8
t/t3900-i18n-commit.sh
View File

@ -45,7 +45,7 @@ test_expect_success 'UTF-8 invalid characters refused' '
printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \ printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
>"$HOME/invalid" && >"$HOME/invalid" &&
git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
grep "did not conform" "$HOME"/stderr test_i18ngrep "did not conform" "$HOME"/stderr
' '


test_expect_success 'UTF-8 overlong sequences rejected' ' test_expect_success 'UTF-8 overlong sequences rejected' '
@ -55,7 +55,7 @@ test_expect_success 'UTF-8 overlong sequences rejected' '
printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \ printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
>"$HOME/invalid" && >"$HOME/invalid" &&
git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
grep "did not conform" "$HOME"/stderr test_i18ngrep "did not conform" "$HOME"/stderr
' '


test_expect_success 'UTF-8 non-characters refused' ' test_expect_success 'UTF-8 non-characters refused' '
@ -64,7 +64,7 @@ test_expect_success 'UTF-8 non-characters refused' '
printf "Commit message\n\nNon-character:\364\217\277\276\n" \ printf "Commit message\n\nNon-character:\364\217\277\276\n" \
>"$HOME/invalid" && >"$HOME/invalid" &&
git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
grep "did not conform" "$HOME"/stderr test_i18ngrep "did not conform" "$HOME"/stderr
' '


test_expect_success 'UTF-8 non-characters refused' ' test_expect_success 'UTF-8 non-characters refused' '
@ -73,7 +73,7 @@ test_expect_success 'UTF-8 non-characters refused' '
printf "Commit message\n\nNon-character:\357\267\220\n" \ printf "Commit message\n\nNon-character:\357\267\220\n" \
>"$HOME/invalid" && >"$HOME/invalid" &&
git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr && git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
grep "did not conform" "$HOME"/stderr test_i18ngrep "did not conform" "$HOME"/stderr
' '


for H in ISO8859-1 eucJP ISO-2022-JP for H in ISO8859-1 eucJP ISO-2022-JP

2
t/t3901-i18n-patch.sh
View File

@ -295,7 +295,7 @@ test_expect_success 'am --no-utf8 (U/L)' '


# commit-tree will warn that the commit message does not contain valid UTF-8 # commit-tree will warn that the commit message does not contain valid UTF-8
# as mailinfo did not convert it # as mailinfo did not convert it
grep "did not conform" err && test_i18ngrep "did not conform" err &&


check_encoding 2 check_encoding 2
' '