From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon, 06 Sep 2010 18:55:47 GMT
Subject: Re: [PATCH 14/15] gettextize: git-revert split up "could not revert/apply" message
Message-ID: <20100906185547.GF25426@burratino>
In-Reply-To: <1283775704-29440-15-git-send-email-avarab@gmail.com>

(+cc: Christian)

Ævar Arnfjörð Bjarmason wrote:

> Split up the "could not %s %s... %s" message into "could not revert
> %s... %s" and "could not apply %s... %s". This makes it easier for
> translators to understand the message.

Right, parts of speech can be a pain.  So:
Acked-by: Jonathan Nieder <jrnieder@gmail.com>

> --- a/t/t3507-cherry-pick-conflict.sh
> +++ b/t/t3507-cherry-pick-conflict.sh
> @@ -38,7 +38,7 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
>  	test "$head" = "$newhead"
>  '
>  
> -test_expect_success 'advice from failed cherry-pick' "
> +test_expect_success NO_GETTEXT_POISON 'advice from failed cherry-pick' "

An idea (it may or may not be a good one ;-)): what if we made the gettext
poison into an automatically generated .po file?  Then testing poison
would be a special case of running tests with an arbitrary locale:

 $ TEST_LANGUAGE=poison prove t[0-9]*.sh

and this test prerequisite could be more intuitively named LOCALE_C or
similar.