From: Jonathan Nieder <jrnieder@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"Jan Krüger" <jk@jk.gs>,
"Ramkumar Ramachandra" <artagnon@gmail.com>
Subject: Re: [PATCH 14/15] gettextize: git-revert split up "could not revert/apply" message
Date: Mon, 6 Sep 2010 13:55:47 -0500 [thread overview]
Message-ID: <20100906185547.GF25426@burratino> (raw)
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.
next prev parent reply other threads:[~2010-09-06 18:57 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-04 22:10 [PATCH 00/63] [REDO] Add gettext support to Git Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 01/63] builtin: use builtin.h for all builtin commands Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 02/63] Add infrastructure for translating Git with gettext Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 05/63] tests: locate i18n lib&data correctly under --valgrind Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 21/63] po/is.po: add Icelandic translation Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 26/63] gettext tests: add GETTEXT_POISON=YesPlease Makefile parameter Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 27/63] gettext tests: skip lib-gettext.sh tests under GETTEXT_POISON Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 28/63] gettext tests: skip breaking " Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 51/63] gettextize: git-merge basic messages Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 63/63] po/en_GB.po: add British English Translation Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 00/15] [REDO CONTINUE] Add gettext support to Git Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 01/15] gettextize: git-archive basic messages Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 02/15] gettextize: git-bundle " Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 03/15] gettextize: git-clean " Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 04/15] gettextize: git-clean clean.requireForce messages Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 05/15] gettextize: git-describe basic messages Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 06/15] gettextize: git-gc " Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 07/15] gettextize: git-gc "Auto packing the repository" message Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 08/15] gettextize: git-notes basic commands Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 09/15] gettextize: git-notes GIT_NOTES_REWRITE_MODE error message Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 10/15] gettextize: git-notes "Refusing to %s notes in %s" message Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 11/15] gettextize: git-revert basic messages Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 12/15] gettextize: git-revert mark the "me" variable for translation Ævar Arnfjörð Bjarmason
2010-09-06 18:45 ` Jonathan Nieder
2010-09-06 20:06 ` Ævar Arnfjörð Bjarmason
2010-09-06 20:08 ` Jonathan Nieder
2010-09-06 12:21 ` [PATCH 13/15] gettextize: git-revert messages using the "me" variable Ævar Arnfjörð Bjarmason
2010-09-06 18:50 ` Jonathan Nieder
2010-09-06 20:12 ` Ævar Arnfjörð Bjarmason
2010-09-07 5:39 ` Jonathan Nieder
2010-09-07 8:51 ` Ævar Arnfjörð Bjarmason
2010-09-10 0:26 ` Junio C Hamano
2010-09-06 12:21 ` [PATCH 14/15] gettextize: git-revert split up "could not revert/apply" message Ævar Arnfjörð Bjarmason
2010-09-06 18:55 ` Jonathan Nieder [this message]
2010-09-06 20:25 ` Ævar Arnfjörð Bjarmason
2010-09-07 5:34 ` Jonathan Nieder
2010-09-07 8:47 ` Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 15/15] gettextize: git-shortlog basic messages Ævar Arnfjörð Bjarmason
2010-09-06 18:41 ` Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100906185547.GF25426@burratino \
--to=jrnieder@gmail.com \
--cc=artagnon@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jk@jk.gs \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).