From: Eric Sunshine Date: Tue, 06 Feb 2018 07:32:42 GMT Subject: Re: [PATCH 1/1] Mark messages for translations Message-ID: In-Reply-To: <20180206061537.2573-2-ash@kambanaria.org> On Tue, Feb 6, 2018 at 1:15 AM, Alexander Shopov wrote: > 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 > > Signed-off-by: Alexander Shopov > --- > diff --git 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 ! grep "invalid gitfile format" .err Since these strings can now be translated, you'll probably need to use 'test_i18ngrep' rather than 'grep'. (See test_i18ngrep in t/test-lib.sh.) > 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 ! grep "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 d27f438bf..5743b482f 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" > '