Re: [PATCH v4 27/73] gettextize: git-commit formatting messages
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Feb 25, 2011, 20:01 UTC
- Message-ID
- <AANLkTi=J3C9SUm1HpnXwjOpJjQG7nCQuPkNhenyN0ZtD@mail.gmail.com>
- In-Reply-To
- <7vd3mgar5g.fsf@alter.siamese.dyndns.org>
On Fri, Feb 25, 2011 at 19:46, Junio C Hamano <gitster@pobox.com> wrote:
Show 20 quoted lines
> Jonathan Nieder <jrnieder@gmail.com> writes: > >> diff --git a/t/lib-commit-template.sh b/t/lib-commit-template.sh >> new file mode 100644 >> index 0000000..80ec50c >> --- /dev/null >> +++ b/t/lib-commit-template.sh >> @@ -0,0 +1,19 @@ >> +#!/bin/sh >> + >> +# Messages such as >> +# >> +# # It looks like you may be committing a MERGE.\n" >> +# >> +# are now translatable, even though the "# " part probably ought not >> +# to be. Expect some tests to fail when GETTEXT_POISON is enabled. > > We shouldn't mark "# " part as translatable to begin with. Perhaps the > underlying code in wt-status.c needs to be changed even before we merge > the i18n _() patches to make it easier?
Agreed, and Jonathan already implemented this:
https://github.com/avar/git/commit/394a9d1
https://github.com/avar/git/commit/da15d84Perhaps it would be better to modify that patch so it goes in ahead of the i18n series. It would simplify this going back and forth within i18n itself.