From: Jonathan Nieder <jrnieder@gmail.com>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH] i18n: disable i18n for shell scripts if NO_GETTEXT defined
Date: Wed, 18 Jan 2012 18:12:25 -0600 [thread overview]
Message-ID: <20120119001225.GA13975@burratino> (raw)
In-Reply-To: <20120118195438.GA18892@blimp.dmz>
Hi,
Alex Riesen wrote:
> [Subject: i18n: disable i18n for shell scripts if NO_GETTEXT define]
>
> Otherwise the i18n is used in the scripts even with NO_GETTEXT set.
> It is very unexpected.
Sounds like a good idea. Quick comments:
[...]
> --- a/git-sh-i18n.sh
> +++ b/git-sh-i18n.sh
> @@ -16,61 +16,44 @@ else
> fi
> export TEXTDOMAINDIR
>
> -if test -z "$GIT_GETTEXT_POISON"
> +GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
> +if test -n "@@NO_GETTEXT@@$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
> +then
> + : no probing necessary
> +elif test -n "$GIT_GETTEXT_POISON"
> then
> - if test -z "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" && type gettext.sh >/dev/null 2>&1
> - then
> +elif test -n type gettext.sh >/dev/null 2>&1
> +then
I like the unindenting. Alas, I get
1: test: type: unexpected operator
I suspect this should just say "elif type gettext.sh >/dev/null 2>&1".
The rest looks good. Thanks for writing it.
next prev parent reply other threads:[~2012-01-19 0:12 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-17 13:42 [PATCH] i18n: disable i18n for shell scripts if NO_GETTEXT defined Alex Riesen
2012-01-17 19:08 ` Junio C Hamano
2012-01-18 14:25 ` Alex Riesen
2012-01-18 19:54 ` Alex Riesen
2012-01-19 0:12 ` Jonathan Nieder [this message]
2012-01-19 9:15 ` Alex Riesen
2012-01-18 15:22 ` Ævar Arnfjörð Bjarmason
2012-01-18 18:57 ` Alex Riesen
2012-01-18 23:18 ` Ævar Arnfjörð Bjarmason
2012-01-19 0:15 ` Jonathan Nieder
2012-01-19 0:17 ` Junio C Hamano
2012-01-19 7:13 ` Johannes Sixt
2012-01-19 18:30 ` Junio C Hamano
2012-01-20 9:50 ` Ævar Arnfjörð Bjarmason
2012-01-20 10:40 ` Alex Riesen
2012-01-20 12:49 ` [PATCH] git-sh-i18n: detect and avoid broken gettext(1) implementation Ævar Arnfjörð Bjarmason
2012-01-20 14:02 ` Alex Riesen
2012-01-20 20:00 ` Junio C Hamano
2012-01-20 20:13 ` Alex Riesen
2012-01-20 20:21 ` Junio C Hamano
2012-01-20 20:24 ` Alex Riesen
2012-01-20 20:26 ` Junio C Hamano
2012-01-20 20:33 ` Alex Riesen
2012-01-20 19:35 ` [PATCH] i18n: disable i18n for shell scripts if NO_GETTEXT defined Junio C Hamano
2012-01-20 19:45 ` Alex Riesen
2012-01-19 9:24 ` Alex Riesen
2012-01-19 9:13 ` Alex Riesen
2012-01-19 19:52 ` [PATCH] add a Makefile switch to avoid gettext translation in shell scripts Alex Riesen
2012-01-23 22:01 ` Junio C Hamano
2012-01-23 22:02 ` [PATCH 1/2] git-sh-i18n: restructure the logic to compute gettext.sh scheme Junio C Hamano
2012-01-23 22:04 ` [PATCH 2/2] add a Makefile switch to avoid gettext translation in shell scripts Junio C Hamano
2012-01-23 22:12 ` Jonathan Nieder
2012-01-23 22:23 ` Junio C Hamano
2012-01-23 22:40 ` Jonathan Nieder
2012-01-24 0:31 ` [PATCH/RFC 3/2] i18n: do not use gettext.sh by default when NO_GETTEXT is set Jonathan Nieder
2012-01-24 20:06 ` Alex Riesen
2012-01-24 0:39 ` [PATCH 2/2] add a Makefile switch to avoid gettext translation in shell scripts Ævar Arnfjörð Bjarmason
2012-01-24 19:59 ` Alex Riesen
2012-01-24 20:00 ` Alex Riesen
2012-01-24 20:13 ` Junio C Hamano
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=20120119001225.GA13975@burratino \
--to=jrnieder@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=raa.lkml@gmail.com \
/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).