git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
	"Alex Riesen" <raa.lkml@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH/RFC 3/2] i18n: do not use gettext.sh by default when NO_GETTEXT is set
Date: Mon, 23 Jan 2012 18:31:09 -0600	[thread overview]
Message-ID: <20120124003109.GB26980@burratino> (raw)
In-Reply-To: <7vehuq6ote.fsf@alter.siamese.dyndns.org>

From: Junio C Hamano <gitster@pobox.com>

When NO_GETTEXT is set, even if a usable installed gettext.sh is
detected to be present, it can only help to use git's simple fallback
stub implementations of gettext and eval_gettext for shell scripts
instead.  That way:

 1) we avoid the complication of autodetection of gettext.sh support
    at runtime;

 2) in particular, if the operating system provides gettext.sh but
    it is unusable, we will not be tricked into trying to use it.

So this patch makes USE_GETTEXT_SCHEME default to fallthrough when
NO_GETTEXT is set.  This is only a default so the operator can set
USE_GETTEXT_SCHEME=gnu or ...=gettext_without_eval_gettext to try the
other schemes.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Junio C Hamano wrote:

> Should be easy to do so, like this?

Probably too late to be useful, but here's a patch with commit message
implementing the same.

 Makefile |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index b2b738bb..e9b4a2f9 100644
--- a/Makefile
+++ b/Makefile
@@ -1524,6 +1524,9 @@ ifdef GETTEXT_POISON
 endif
 ifdef NO_GETTEXT
 	BASIC_CFLAGS += -DNO_GETTEXT
+	ifndef USE_GETTEXT_SCHEME
+		USE_GETTEXT_SCHEME = fallthrough
+	endif
 endif
 ifdef NO_STRCASESTR
 	COMPAT_CFLAGS += -DNO_STRCASESTR
-- 
1.7.9.rc2

  parent reply	other threads:[~2012-01-24  0:31 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
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                     ` Jonathan Nieder [this message]
2012-01-24 20:06                       ` [PATCH/RFC 3/2] i18n: do not use gettext.sh by default when NO_GETTEXT is set 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=20120124003109.GB26980@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).