From fc045fe7d4fa220f19274715c936636fe0516ea3 Mon Sep 17 00:00:00 2001 From: Alexander Shopov Date: Tue, 13 Feb 2018 14:19:15 +0100 Subject: Mark messages for translations Small changes in messages to fit the style and typography of rest. Reuse already translated messages if possible. Do not translate messages aimed at developers of git. Fix unit tests depending on the original string. Use `test_i18ngrep` for tests with translatable strings. Change and verify rest of tests via `make GETTEXT_POISON=1 test`. Signed-off-by: Alexander Shopov Signed-off-by: Junio C Hamano --- t/t0002-gitfile.sh | 4 ++-- t/t0008-ignores.sh | 2 +- t/t1506-rev-parse-diagnosis.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 't') diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh index 9670e8cbe6..797dcf95b7 100755 --- a/t/t0002-gitfile.sh +++ b/t/t0002-gitfile.sh @@ -31,7 +31,7 @@ test_expect_success 'bad setup: invalid .git file format' ' echo "git rev-parse accepted an invalid .git file" false fi && - if ! grep "Invalid gitfile format" .err + if ! test_i18ngrep "invalid gitfile format" .err then echo "git rev-parse returned wrong error" false @@ -45,7 +45,7 @@ test_expect_success 'bad setup: invalid .git file path' ' echo "git rev-parse accepted an invalid .git file path" false fi && - if ! grep "Not a git repository" .err + if ! test_i18ngrep "not a git repository" .err then echo "git rev-parse returned wrong error" false diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh index d27f438bf4..5743b482f2 100755 --- a/t/t0008-ignores.sh +++ b/t/t0008-ignores.sh @@ -307,7 +307,7 @@ test_expect_success_multi 'needs work tree' '' ' cd .git && test_check_ignore "foo" 128 ) && - stderr_contains "fatal: This operation must be run in a work tree" + stderr_contains "fatal: this operation must be run in a work tree" ' ############################################################################ diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh index 79a0251efa..4ee009da66 100755 --- a/t/t1506-rev-parse-diagnosis.sh +++ b/t/t1506-rev-parse-diagnosis.sh @@ -157,7 +157,7 @@ test_expect_success 'relative path not found' ' test_expect_success 'relative path outside worktree' ' test_must_fail git rev-parse HEAD:../file.txt >output 2>error && test -z "$(cat output)" && - grep "outside repository" error + test_i18ngrep "outside repository" error ' test_expect_success 'relative path when cwd is outside worktree' ' -- cgit v1.2.3