From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v2 1/2] Add infrastructure for translating Git with gettext Date: Mon, 7 Jun 2010 21:23:16 +0000 Message-ID: <1275945796-15973-1-git-send-email-avarab@gmail.com> References: <20100607131930.GA30673@unpythonic.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , Jeff Epler , Jakub Narebski , Jonathan Nieder , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Jun 07 23:23:50 2010 connect(): No such file or directory Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OLjnR-0007mm-7C for gcvg-git-2@lo.gmane.org; Mon, 07 Jun 2010 23:23:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753562Ab0FGVXb convert rfc822-to-quoted-printable (ORCPT ); Mon, 7 Jun 2010 17:23:31 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:57175 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752740Ab0FGVX3 (ORCPT ); Mon, 7 Jun 2010 17:23:29 -0400 Received: by fxm8 with SMTP id 8so2462834fxm.19 for ; Mon, 07 Jun 2010 14:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=+kAPhPX3NKA/2HnqXRUaJwfuH1iuJJk7BZAgWXxDbRA=; b=BqFcfjFdGSRixPkk/NgoGdalenfx4e+ann2j08rS7MMqQ2O51Ma4ZtbT/of/Fww+xa +EQi6zkRry6FWtlqZiodRuRDNJtEgwOrnREnBag4ebkaMk2netB5LwWv/LS0YCPeE5Ps 1Cpnm/AU9adKb/ZUGReORljY19zT9kd49hOWg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=RS5eOFMgioWwVog4hhpcv9gFDXOZXswR9MrMD4GWWhFoc+FceHDij1cs6oFbDq9yM0 NJkK/RWUVXBlg3xo86njA1vl+1qMHoiTiKmMRvLnSKASrbaWCwAUBk2bXsTIaEl9H1hP aHqgx9DuKDW18DkJrHZGBJO0Xt5F0iSGREqU0= Received: by 10.223.72.156 with SMTP id m28mr15748268faj.26.1275945807296; Mon, 07 Jun 2010 14:23:27 -0700 (PDT) Received: from localhost.localdomain (dslb-188-098-088-194.pools.arcor-ip.net [188.98.88.194]) by mx.google.com with ESMTPS id 2sm22072201faf.3.2010.06.07.14.23.22 (version=SSLv3 cipher=RC4-MD5); Mon, 07 Jun 2010 14:23:24 -0700 (PDT) X-Mailer: git-send-email 1.7.1.243.gda92d6.dirty In-Reply-To: <20100607131930.GA30673@unpythonic.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: All of the interface messages in Git core are currently hardcoded in English. Change that by optionally enabling translation of the core C, Shell and Perl programs via GNU gettext. If you set the appropriate LC_* variables Git will speak your language, provided that someone has submitted a translation. If gettext isn't available, or if Git is compiled with NO_GETTEXT=3DYesPlease, then Git fall back on its previous behavior of only speaking English. When using ./configure the autoconf script will auto-detect if the gettext libraries are installed and act appropriately. With NO_GETTEXT=3DYesPlease gettext support will be #defined away for C programs. For Shell and Perl programs we rely on the git message catalog not being avalalable. That's a reasonable assumption since then the message catalog won't be installed on the system during make install. The gettext wrappers that are provided in the patch are only the bare minimum required to begin translation work. In particular I haven't added wrappers for the gettext functions that enable plural support, or those that provide message context (msgctxt). Those can be added later. The intent is to start with a small subset and see what we need later, not to start with something that's unnecessarily large right away. Implementation and usage notes: * General: Gettext .mo files will be installed and looked for in the standard $(prefix)/share/locale path. GIT_TEXTDOMAINDIR can also be set to override that, but that's only intended to be used to test Git itself. * Perl: Perl code that wants to be localized should use the new Git::I18n module. It imports a __ function into the caller's package by default. Instead of using the high level Locale::TextDomain interface I've opted to use the low-level (equivalent to the C interface) Locale::Messages module, which Locale::TextDomain itself uses. Locale::TextDomain does a lot of redundant work we don't need, and some of it would potentially introduce bugs. It tries to set the $TEXTDOMAIN based on package of the caller, and has its own hardcoded paths where it'll search for messages. I found it easier just to completely avoid it rather than try to circumvent its behavior. In any case, this is an issue wholly internal Git::I18N. Its guts can be changed later if that's deemed necessary. See for a further elaboration on this topic. * Shell: Shell code that's to be localized should use the new git-sh-i18n library. It's just a wrapper for the system's gettext.sh. If gettext.sh isn't available we'll fall back on a dumb printf(1) fall-through wrapper. I originally tried to detect if the system supported `echo -n' but I found this to be a waste of time. My benchmarks on Linux, Solaris and FreeBSD reveal that printf(1) is fast enough, especially since we aren't calling gettext() from within any tight loops. This patch is based on work by Jeff Epler who did the initial Makefile / C work, and a lot of comments from the Git mailing list, including Jonathan Nieder, Jakub Narebski, Johannes Sixt, Peter Krefting and others. Signed-off-by: =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason --- On Mon, Jun 7, 2010 at 13:19, Jeff Epler wrote: > On Sun, Jun 06, 2010 at 05:47:32PM +0000, =C4=98var Arnfj=C3=B6r=C5=A1= Bjarmason wrote: >> the message catalog wont 't be installed on the system during make > > trivial typo Thanks for reviewing it. Fixed the commit message typo in this version. .gitignore | 2 + INSTALL | 8 +++ Makefile | 69 ++++++++++++++++++++++- config.mak.in | 2 + configure.ac | 12 ++++ daemon.c | 3 + fast-import.c | 3 + gettext.c | 21 +++++++ gettext.h | 18 ++++++ git-sh-i18n.sh | 47 ++++++++++++++++ git.c | 3 + http-backend.c | 3 + http-fetch.c | 3 + http-push.c | 3 + imap-send.c | 3 + perl/Git/I18N.pm | 91 ++++++++++++++++++++++++++++++ perl/Makefile | 3 +- perl/Makefile.PL | 14 ++++- po/.gitignore | 1 + po/is.po | 47 ++++++++++++++++ shell.c | 3 + show-index.c | 3 + t/t0200-gettext.sh | 126 ++++++++++++++++++++++++++++++++++= ++++++++ t/t0200/test.c | 13 ++++ t/t0200/test.perl | 14 +++++ t/t0200/test.sh | 14 +++++ t/t0201-gettext-fallbacks.sh | 42 ++++++++++++++ t/t0202-gettext-perl.sh | 20 +++++++ t/t0202/test.pl | 104 ++++++++++++++++++++++++++++++++++ t/test-lib.sh | 2 + upload-pack.c | 3 + 31 files changed, 696 insertions(+), 4 deletions(-) create mode 100644 gettext.c create mode 100644 gettext.h create mode 100644 git-sh-i18n.sh create mode 100644 perl/Git/I18N.pm create mode 100644 po/.gitignore create mode 100644 po/is.po create mode 100755 t/t0200-gettext.sh create mode 100644 t/t0200/test.c create mode 100644 t/t0200/test.perl create mode 100644 t/t0200/test.sh create mode 100755 t/t0201-gettext-fallbacks.sh create mode 100755 t/t0202-gettext-perl.sh create mode 100644 t/t0202/test.pl diff --git a/.gitignore b/.gitignore index 14e2b6b..6c2b193 100644 --- a/.gitignore +++ b/.gitignore @@ -125,6 +125,7 @@ /git-rm /git-send-email /git-send-pack +/git-sh-i18n /git-sh-setup /git-shell /git-shortlog @@ -204,3 +205,4 @@ *.pdb /Debug/ /Release/ +/share/ diff --git a/INSTALL b/INSTALL index 61086ab..f30d5bd 100644 --- a/INSTALL +++ b/INSTALL @@ -93,6 +93,14 @@ Issues of note: history graphically, and in git-gui. If you don't want gitk or git-gui, you can use NO_TCLTK. =20 + - The GNU "libintl" library is used by default for localizing + Git. It needs a gettext.h on the system for C code, gettext.sh + for shell scripts, and libintl-perl for Perl programs. + + Set NO_GETTEXT to disable localization support and make Git only + use English. Under autoconf the configure script will do this + automatically if it can't find libintl on the system. + - Some platform specific issues are dealt with Makefile rules, but depending on your specific installation, you may not have all the libraries/tools needed, or you may have diff --git a/Makefile b/Makefile index d5d6565..0ddf6e8 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,15 @@ all:: # Define NO_EXPAT if you do not have expat installed. git-http-push i= s # not built, and you cannot push using http:// and https:// transports= =2E # +# Define NO_GETTEXT if you don't want to build with Git with gettext +# support. Building it requires GNU libintl, and additionally +# libintl-perl at runtime. +# +# Define NEEDS_LIBINTL if you haven't set NO_GETTEXT and your system +# needs to be explicitly linked to -lintl. It's defined automatically +# on platforms where we don't expect glibc (Linux, Hurd, +# GNU/kFreeBSD), which includes libintl. +# # Define EXPATDIR=3D/foo/bar if your expat header and library files ar= e in # /foo/bar/include and /foo/bar/lib directories. # @@ -272,6 +281,7 @@ mandir =3D share/man infodir =3D share/info gitexecdir =3D libexec/git-core sharedir =3D $(prefix)/share +localedir =3D $(sharedir)/locale template_dir =3D share/git-core/templates htmldir =3D share/doc/git-doc ifeq ($(prefix),/usr) @@ -285,7 +295,7 @@ lib =3D lib # DESTDIR=3D pathsep =3D : =20 -export prefix bindir sharedir sysconfdir +export prefix bindir sharedir sysconfdir localedir =20 CC =3D gcc AR =3D ar @@ -297,6 +307,8 @@ RPMBUILD =3D rpmbuild TCL_PATH =3D tclsh TCLTK_PATH =3D wish PTHREAD_LIBS =3D -lpthread +XGETTEXT =3D xgettext +MSGFMT =3D msgfmt =20 export TCL_PATH TCLTK_PATH =20 @@ -358,6 +370,7 @@ SCRIPT_SH +=3D git-web--browse.sh SCRIPT_LIB +=3D git-mergetool--lib SCRIPT_LIB +=3D git-parse-remote SCRIPT_LIB +=3D git-sh-setup +SCRIPT_LIB +=3D git-sh-i18n =20 SCRIPT_PERL +=3D git-add--interactive.perl SCRIPT_PERL +=3D git-difftool.perl @@ -523,6 +536,7 @@ LIB_H +=3D userdiff.h LIB_H +=3D utf8.h LIB_H +=3D xdiff-interface.h LIB_H +=3D xdiff/xdiff.h +LIB_H +=3D gettext.h =20 LIB_OBJS +=3D abspath.o LIB_OBJS +=3D advice.o @@ -564,6 +578,9 @@ LIB_OBJS +=3D entry.o LIB_OBJS +=3D environment.o LIB_OBJS +=3D exec_cmd.o LIB_OBJS +=3D fsck.o +ifndef NO_GETTEXT +LIB_OBJS +=3D gettext.o +endif LIB_OBJS +=3D graph.o LIB_OBJS +=3D grep.o LIB_OBJS +=3D hash.o @@ -735,6 +752,14 @@ EXTLIBS =3D # Platform specific tweaks # =20 +# Platform specific defaults. Where we'd only like some feature on the +# minority of systems, e.g. if linking to a library isn't needed +# because its features are included in the GNU C library. +ifndef NO_GETTEXT + # Systems that use GNU gettext and glibc are the exception + NEEDS_LIBINTL =3D YesPlease +endif + # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If # we had "elif" things would have been much nicer... @@ -743,11 +768,13 @@ ifeq ($(uname_S),Linux) NO_STRLCPY =3D YesPlease NO_MKSTEMPS =3D YesPlease HAVE_PATHS_H =3D YesPlease + NEEDS_LIBINTL =3D endif ifeq ($(uname_S),GNU/kFreeBSD) NO_STRLCPY =3D YesPlease NO_MKSTEMPS =3D YesPlease HAVE_PATHS_H =3D YesPlease + NEEDS_LIBINTL =3D endif ifeq ($(uname_S),UnixWare) CC =3D cc @@ -917,6 +944,7 @@ ifeq ($(uname_S),GNU) NO_STRLCPY=3DYesPlease NO_MKSTEMPS =3D YesPlease HAVE_PATHS_H =3D YesPlease + NEEDS_LIBINTL =3D endif ifeq ($(uname_S),IRIX) NO_SETENV =3D YesPlease @@ -1386,6 +1414,14 @@ ifdef USE_NED_ALLOCATOR COMPAT_OBJS +=3D compat/nedmalloc/nedmalloc.o endif =20 +ifdef NO_GETTEXT + COMPAT_CFLAGS +=3D -DNO_GETTEXT +endif + +ifdef NEEDS_LIBINTL + EXTLIBS +=3D -lintl +endif + ifeq ($(TCLTK_PATH),) NO_TCLTK=3DNoThanks endif @@ -1415,6 +1451,7 @@ ifndef V QUIET_BUILT_IN =3D @echo ' ' BUILTIN $@; QUIET_GEN =3D @echo ' ' GEN $@; QUIET_LNCP =3D @echo ' ' LN/CP $@; + QUIET_MSGFMT =3D @echo ' ' MSGFMT $@; QUIET_SUBDIR0 =3D +@subdir=3D QUIET_SUBDIR1 =3D ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ $(MAKE) $(PRINT_DIR) -C $$subdir @@ -1442,7 +1479,9 @@ gitexecdir_SQ =3D $(subst ','\'',$(gitexecdir)) template_dir_SQ =3D $(subst ','\'',$(template_dir)) htmldir_SQ =3D $(subst ','\'',$(htmldir)) prefix_SQ =3D $(subst ','\'',$(prefix)) +sharedir_SQ =3D $(subst ','\'',$(sharedir)) =20 +LOCALEDIR_SQ =3D $(subst ','\'',$(localedir)) SHELL_PATH_SQ =3D $(subst ','\'',$(SHELL_PATH)) PERL_PATH_SQ =3D $(subst ','\'',$(PERL_PATH)) PYTHON_PATH_SQ =3D $(subst ','\'',$(PYTHON_PATH)) @@ -1491,7 +1530,7 @@ ifndef NO_TCLTK $(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all endif ifndef NO_PERL - $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH=3D'$(PERL_PATH_SQ)' p= refix=3D'$(prefix_SQ)' all + $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH=3D'$(PERL_PATH_SQ)' p= refix=3D'$(prefix_SQ)' localedir=3D'$(localedir_SQ)' all endif ifndef NO_PYTHON $(QUIET_SUBDIR0)git_remote_helpers $(QUIET_SUBDIR1) PYTHON_PATH=3D'$(= PYTHON_PATH_SQ)' prefix=3D'$(prefix_SQ)' all @@ -1536,6 +1575,7 @@ $(RM) $@ $@+ && \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ + -e 's|@@LOCALEDIR@@|$(LOCALEDIR_SQ)|g' \ -e 's/@@NO_CURL@@/$(NO_CURL)/g' \ -e $(BROKEN_PATH_FIX) \ $@.sh >$@+ @@ -1868,6 +1908,21 @@ cscope: $(RM) cscope* $(FIND) . -name '*.[hcS]' -print | xargs cscope -b =20 +pot: + $(XGETTEXT) --add-comments --keyword=3D_ --keyword=3DN_ --output=3Dpo= /git.pot --language=3DC $(C_OBJ:o=3Dc) t/t0200/test.c + $(XGETTEXT) --add-comments --join-existing --output=3Dpo/git.pot --la= nguage=3DShell $(SCRIPT_SH) t/t0200/test.sh + $(XGETTEXT) --add-comments --join-existing --keyword=3D__ --output=3D= po/git.pot --language=3DPerl $(SCRIPT_PERL) t/t0200/test.perl + +POFILES :=3D $(wildcard po/*.po) +MOFILES :=3D $(patsubst po/%.po,share/locale/%/LC_MESSAGES/git.mo,$(PO= =46ILES)) +MODIRS :=3D $(patsubst po/%.po,share/locale/%/LC_MESSAGES/,$(POFILES)) +ifndef NO_GETTEXT +all:: $(MOFILES) +endif +share/locale/%/LC_MESSAGES/git.mo: po/%.po + @mkdir -p $(dir $@) + $(QUIET_MSGFMT)$(MSGFMT) -o $@ $< + ### Detect prefix changes TRACK_CFLAGS =3D $(subst ','\'',$(ALL_CFLAGS)):\ $(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix= _SQ) @@ -1889,6 +1944,7 @@ GIT-BUILD-OPTIONS: FORCE @echo NO_CURL=3D\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@ @echo NO_PERL=3D\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@ @echo NO_PYTHON=3D\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' = >>$@ + @echo NO_GETTEXT=3D\''$(subst ','\'',$(subst ','\'',$(NO_GETTEXT)))'\= ' >>$@ =20 ### Detect Tck/Tk interpreter path changes ifndef NO_TCLTK @@ -1980,6 +2036,11 @@ install: all $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' $(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)' +ifndef NO_GETTEXT + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sharedir_SQ)/locale' + (cd share && tar cf - locale) | \ + (cd '$(DESTDIR_SQ)$(sharedir_SQ)' && umask 022 && tar xof -) +endif $(MAKE) -C templates DESTDIR=3D'$(DESTDIR_SQ)' install ifndef NO_PERL $(MAKE) -C perl prefix=3D'$(prefix_SQ)' DESTDIR=3D'$(DESTDIR_SQ)' ins= tall @@ -2127,6 +2188,10 @@ ifndef NO_TCLTK $(MAKE) -C git-gui clean endif $(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS GIT-BUILD-OPTIONS +ifndef NO_GETTEXT + $(RM) po/git.pot + $(RM) -r share/ +endif =20 .PHONY: all install clean strip .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_moder= n_shell diff --git a/config.mak.in b/config.mak.in index 0d4b64d..c49072c 100644 --- a/config.mak.in +++ b/config.mak.in @@ -32,9 +32,11 @@ NO_CURL=3D@NO_CURL@ NO_EXPAT=3D@NO_EXPAT@ NO_LIBGEN_H=3D@NO_LIBGEN_H@ HAVE_PATHS_H=3D@HAVE_PATHS_H@ +NO_GETTEXT=3D@NO_GETTEXT@ NEEDS_LIBICONV=3D@NEEDS_LIBICONV@ NEEDS_SOCKET=3D@NEEDS_SOCKET@ NEEDS_RESOLV=3D@NEEDS_RESOLV@ +NEEDS_LIBINTL=3D@NEEDS_LIBINTL@ NEEDS_LIBGEN=3D@NEEDS_LIBGEN@ NO_SYS_SELECT_H=3D@NO_SYS_SELECT_H@ NO_D_INO_IN_DIRENT=3D@NO_D_INO_IN_DIRENT@ diff --git a/configure.ac b/configure.ac index 71038fc..74879b4 100644 --- a/configure.ac +++ b/configure.ac @@ -559,6 +559,12 @@ AC_CHECK_LIB([c], [basename], AC_SUBST(NEEDS_LIBGEN) test -n "$NEEDS_LIBGEN" && LIBS=3D"$LIBS -lgen" =20 +AC_CHECK_LIB([c], [gettext], +[NEEDS_LIBINTL=3D], +[NEEDS_LIBINTL=3DYesPlease]) +AC_SUBST(NEEDS_LIBINTL) +test -n "$NEEDS_LIBINTL" && LIBS=3D"$LIBS -lintl" + ## Checks for header files. AC_MSG_NOTICE([CHECKS for header files]) # @@ -730,6 +736,12 @@ AC_CHECK_HEADER([paths.h], [HAVE_PATHS_H=3D]) AC_SUBST(HAVE_PATHS_H) # +# Define NO_GETTEXT if you don't have libintl.h +AC_CHECK_HEADER([libintl.h], +[NO_GETTEXT=3D], +[NO_GETTEXT=3DYesPlease]) +AC_SUBST(NO_GETTEXT) +# # Define NO_STRCASESTR if you don't have strcasestr. GIT_CHECK_FUNC(strcasestr, [NO_STRCASESTR=3D], diff --git a/daemon.c b/daemon.c index a90ab10..7f4691c 100644 --- a/daemon.c +++ b/daemon.c @@ -3,6 +3,7 @@ #include "exec_cmd.h" #include "run-command.h" #include "strbuf.h" +#include "gettext.h" =20 #include =20 @@ -974,6 +975,8 @@ int main(int argc, char **argv) gid_t gid =3D 0; int i; =20 + git_setup_gettext(); + git_extract_argv0_path(argv[0]); =20 for (i =3D 1; i < argc; i++) { diff --git a/fast-import.c b/fast-import.c index 129a786..6947f7a 100644 --- a/fast-import.c +++ b/fast-import.c @@ -156,6 +156,7 @@ Format of STDIN stream: #include "csum-file.h" #include "quote.h" #include "exec_cmd.h" +#include "gettext.h" =20 #define PACK_ID_BITS 16 #define MAX_PACK_ID ((1< +#include + +extern void git_setup_gettext(void) { + char *podir; + char *envdir =3D getenv("GIT_TEXTDOMAINDIR"); + + if (envdir) { + (void)bindtextdomain("git", envdir); + } else { + podir =3D (char *)system_path("share/locale"); + if (!podir) return; + (void)bindtextdomain("git", podir); + free(podir); + } + + (void)setlocale(LC_MESSAGES, ""); + (void)setlocale(LC_CTYPE, ""); + (void)textdomain("git"); +} diff --git a/gettext.h b/gettext.h new file mode 100644 index 0000000..e02939a --- /dev/null +++ b/gettext.h @@ -0,0 +1,18 @@ +#ifndef GETTEXT_H +#define GETTEXT_H + +#ifdef NO_GETTEXT +static inline void git_setup_gettext(void) {} +#else +extern void git_setup_gettext(void); +#endif + +#define N_(s) (s) +#ifdef NO_GETTEXT +#define _(s) (s) +#else +#include +#define _(s) gettext(s) +#endif + +#endif diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh new file mode 100644 index 0000000..d4963e9 --- /dev/null +++ b/git-sh-i18n.sh @@ -0,0 +1,47 @@ +#!/bin/sh +# +# Copyright (c) 2010 =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason +# +# This is Git's interface to gettext.sh. Use it right after +# git-sh-setup as: +# +# . git-sh-setup +# . git-sh-i18n +# +# # For constant interface messages: +# gettext "A message for the user"; echo +# +# # To interpolate variables: +# details=3D"oh noes" +# eval_gettext "An error occured: \$details"; echo +# +# See "info '(gettext)sh'" for the full manual. + +# Try to use libintl's gettext.sh, or fall back to English if we +# can't. +. gettext.sh + +if test $? -eq 0 && test -z "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" +then + TEXTDOMAIN=3Dgit + export TEXTDOMAIN + if [ -z "$GIT_TEXTDOMAINDIR" ] + then + TEXTDOMAINDIR=3D"@@LOCALEDIR@@" + else + TEXTDOMAINDIR=3D"$GIT_TEXTDOMAINDIR" + fi + export TEXTDOMAINDIR +else + # Since gettext.sh isn't available we'll have to define our own + # dummy pass-through functions. + + gettext () { + printf "%s" "$1" + } + + eval_gettext () { + gettext_eval=3D"printf '%s' \"$1\"" + printf "%s" "`eval \"$gettext_eval\"`" + } +fi diff --git a/git.c b/git.c index 99f0363..d749eab 100644 --- a/git.c +++ b/git.c @@ -3,6 +3,7 @@ #include "cache.h" #include "quote.h" #include "run-command.h" +#include "gettext.h" =20 const char git_usage_string[] =3D "git [--version] [--exec-path[=3DGIT_EXEC_PATH]] [--html-path]\n" @@ -490,6 +491,8 @@ int main(int argc, const char **argv) if (!cmd) cmd =3D "git-help"; =20 + git_setup_gettext(); + /* * "git-xxxx" is the same as "git xxxx", but we obviously: * diff --git a/http-backend.c b/http-backend.c index d1e83d0..b6d9bd5 100644 --- a/http-backend.c +++ b/http-backend.c @@ -6,6 +6,7 @@ #include "exec_cmd.h" #include "run-command.h" #include "string-list.h" +#include "gettext.h" =20 static const char content_type[] =3D "Content-Type"; static const char content_length[] =3D "Content-Length"; @@ -605,6 +606,8 @@ int main(int argc, char **argv) char *cmd_arg =3D NULL; int i; =20 + git_setup_gettext(); + git_extract_argv0_path(argv[0]); set_die_routine(die_webcgi); =20 diff --git a/http-fetch.c b/http-fetch.c index 762c750..b889c36 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -2,6 +2,7 @@ #include "exec_cmd.h" #include "http.h" #include "walker.h" +#include "gettext.h" =20 static const char http_fetch_usage[] =3D "git http-fetch " "[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url"; @@ -24,6 +25,8 @@ int main(int argc, const char **argv) int get_verbosely =3D 0; int get_recover =3D 0; =20 + git_setup_gettext(); + git_extract_argv0_path(argv[0]); =20 while (arg < argc && argv[arg][0] =3D=3D '-') { diff --git a/http-push.c b/http-push.c index 415b1ab..ba0338c 100644 --- a/http-push.c +++ b/http-push.c @@ -10,6 +10,7 @@ #include "remote.h" #include "list-objects.h" #include "sigchain.h" +#include "gettext.h" =20 #include =20 @@ -1791,6 +1792,8 @@ int main(int argc, char **argv) struct remote *remote; char *rewritten_url =3D NULL; =20 + git_setup_gettext(); + git_extract_argv0_path(argv[0]); =20 repo =3D xcalloc(sizeof(*repo), 1); diff --git a/imap-send.c b/imap-send.c index 9d0097c..4f5f269 100644 --- a/imap-send.c +++ b/imap-send.c @@ -25,6 +25,7 @@ #include "cache.h" #include "exec_cmd.h" #include "run-command.h" +#include "gettext.h" #ifdef NO_OPENSSL typedef void *SSL; #else @@ -1535,6 +1536,8 @@ int main(int argc, char **argv) =20 git_extract_argv0_path(argv[0]); =20 + git_setup_gettext(); + if (argc !=3D 1) usage(imap_send_usage); =20 diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm new file mode 100644 index 0000000..5918d68 --- /dev/null +++ b/perl/Git/I18N.pm @@ -0,0 +1,91 @@ +package Git::I18N; +use 5.006002; +use strict; +use warnings; +use Exporter; +use base 'Exporter'; + +our $VERSION =3D '0.01'; + +our @EXPORT =3D qw(__); +our @EXPORT_OK =3D @EXPORT; + +sub __bootstrap_locale_messages { + our $TEXTDOMAIN =3D 'git'; + our $TEXTDOMAINDIR =3D $ENV{GIT_TEXTDOMAINDIR} || '++LOCALEDIR++'; + + require POSIX; + POSIX->import(qw(setlocale)); + # Non-core prerequisite module + require Locale::Messages; + Locale::Messages->import(qw(:locale_h :libintl_h)); + + setlocale(LC_MESSAGES(), ''); + setlocale(LC_CTYPE(), ''); + textdomain($TEXTDOMAIN); + bindtextdomain($TEXTDOMAIN =3D> $TEXTDOMAINDIR); + + return; +} + +BEGIN +{ + # Used by our test script to see if it should test fallbacks or + # not. + our $__HAS_LIBRARY =3D 1; + + local $@; + eval { __bootstrap_locale_messages() }; + if ($@) { + # Tell test.pl that we couldn't load the gettext library. + $Git::I18N::__HAS_LIBRARY =3D 0; + + # Just a fall-through no-op + *__ =3D sub ($) { $_[0] }; + } else { + *__ =3D \&Locale::Messages::gettext; + } +} + +1; + +__END__ + +=3Dhead1 NAME + +Git::I18N - Perl interface to Git's Gettext localizations + +=3Dhead1 SYNOPSIS + + use Git::I18N; + + print __("Welcome to Git!\n"); + + printf __("The following error occured: %s\n"), $error; + +=3Dhead1 DESCRIPTION + +Git's internal Perl interface to gettext via L. If +L can't be loaded (it's not a core module) we +provide stub passthrough fallbacks. + +This is a distilled interface to gettext, see C +for the full interface. This module implements only a small part of +it. + +=3Dhead1 FUNCTIONS + +=3Dhead2 __($) + +L's gettext function if all goes well, otherwise our +passthrough fallback function. + +=3Dhead1 AUTHOR + +Evar ArnfjErE Bjarmason + +=3Dhead1 COPYRIGHT + +Copyright 2010 Evar ArnfjErE Bjarmason + +=3Dcut diff --git a/perl/Makefile b/perl/Makefile index 4ab21d6..4e624ff 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -5,6 +5,7 @@ makfile:=3Dperl.mak =20 PERL_PATH_SQ =3D $(subst ','\'',$(PERL_PATH)) prefix_SQ =3D $(subst ','\'',$(prefix)) +localedir_SQ =3D $(subst ','\'',$(localedir)) =20 ifndef V QUIET =3D @ @@ -38,7 +39,7 @@ $(makfile): ../GIT-CFLAGS Makefile echo ' echo $(instdir_SQ)' >> $@ else $(makfile): Makefile.PL ../GIT-CFLAGS - $(PERL_PATH) $< PREFIX=3D'$(prefix_SQ)' + $(PERL_PATH) $< PREFIX=3D'$(prefix_SQ)' --localedir=3D'$(localedir_SQ= )' endif =20 # this is just added comfort for calling make directly in perl dir diff --git a/perl/Makefile.PL b/perl/Makefile.PL index 0b9deca..456d45b 100644 --- a/perl/Makefile.PL +++ b/perl/Makefile.PL @@ -1,4 +1,12 @@ +use strict; +use warnings; use ExtUtils::MakeMaker; +use Getopt::Long; + +# Sanity: die at first unknown option +Getopt::Long::Configure qw/ pass_through /; + +GetOptions("localedir=3Ds" =3D> \my $localedir); =20 sub MY::postamble { return <<'MAKE_FRAG'; @@ -16,7 +24,10 @@ endif MAKE_FRAG } =20 -my %pm =3D ('Git.pm' =3D> '$(INST_LIBDIR)/Git.pm'); +my %pm =3D ( + 'Git.pm' =3D> '$(INST_LIBDIR)/Git.pm', + 'Git/I18N.pm' =3D> '$(INST_LIBDIR)/Git/I18N.pm', +); =20 # We come with our own bundled Error.pm. It's not in the set of defaul= t # Perl modules so install it if it's not available on the system yet. @@ -33,6 +44,7 @@ WriteMakefile( NAME =3D> 'Git', VERSION_FROM =3D> 'Git.pm', PM =3D> \%pm, + PM_FILTER =3D> qq[\$(PERL) -pe "s<\\Q++LOCALEDIR++\\E><$localedir>"], MAKEFILE =3D> 'perl.mak', INSTALLSITEMAN3DIR =3D> '$(SITEPREFIX)/share/man/man3' ); diff --git a/po/.gitignore b/po/.gitignore new file mode 100644 index 0000000..221000e --- /dev/null +++ b/po/.gitignore @@ -0,0 +1 @@ +/*.pot diff --git a/po/is.po b/po/is.po new file mode 100644 index 0000000..95739f1 --- /dev/null +++ b/po/is.po @@ -0,0 +1,47 @@ +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"PO-Revision-Date: 2010-06-05 19:06 +0000\n" +"Language-Team: Git Mailing List \n" +"Report-Msgid-Bugs-To: Git Mailing List \n" +"Last-Translator: =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=3DUTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: t/t0200/test.c:4 +msgid "See git help COMMAND for more information on a specific command= =2E" +msgstr "Sj=C3=A1 git help SKIPUN til a=C3=B0 sj=C3=A1 hj=C3=A1lp fyrir= tiltekna skipun." + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.c:9 +msgid "TEST: A C test string" +msgstr "TILRAUN: C tilraunastrengur" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.c:12 +#, c-format +msgid "TEST: A C test string %s" +msgstr "TILRAUN: C tilraunastrengur %s" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.sh:8 +msgid "TEST: A Shell test string" +msgstr "TILRAUN: Skeljartilraunastrengur" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.sh:11 +#, sh-format +msgid "TEST: A Shell test $variable" +msgstr "TILRAUN: Skeljartilraunastrengur me=C3=B0 breytunni $variable" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.perl:8 +msgid "TEST: A Perl test string" +msgstr "TILRAUN: Perl tilraunastrengur" + +#. TRANSLATORS: This is a test. You don't need to translate it. +#: t/t0200/test.perl:11 +#, perl-format +msgid "TEST: A Perl test variable %s" +msgstr "TILRAUN: Perl tilraunastrengur me=C3=B0 breytunni %s" diff --git a/shell.c b/shell.c index e4864e0..ba27c6b 100644 --- a/shell.c +++ b/shell.c @@ -2,6 +2,7 @@ #include "quote.h" #include "exec_cmd.h" #include "strbuf.h" +#include "gettext.h" =20 static int do_generic_cmd(const char *me, char *arg) { @@ -51,6 +52,8 @@ int main(int argc, char **argv) struct commands *cmd; int devnull_fd; =20 + git_setup_gettext(); + /* * Always open file descriptors 0/1/2 to avoid clobbering files * in die(). It also avoids not messing up when the pipes are diff --git a/show-index.c b/show-index.c index 4c0ac13..c2f5448 100644 --- a/show-index.c +++ b/show-index.c @@ -1,5 +1,6 @@ #include "cache.h" #include "pack.h" +#include "gettext.h" =20 static const char show_index_usage[] =3D "git show-index < "; @@ -11,6 +12,8 @@ int main(int argc, char **argv) unsigned int version; static unsigned int top_index[256]; =20 + git_setup_gettext(); + if (argc !=3D 1) usage(show_index_usage); if (fread(top_index, 2 * 4, 1, stdin) !=3D 1) diff --git a/t/t0200-gettext.sh b/t/t0200-gettext.sh new file mode 100755 index 0000000..b54e062 --- /dev/null +++ b/t/t0200-gettext.sh @@ -0,0 +1,126 @@ +#!/bin/sh + +test_description=3D'Gettext support for Git' + +. ./test-lib.sh + +GIT_TEXTDOMAINDIR=3D"$GIT_EXEC_PATH/share/locale" +GIT_PO_PATH=3D"$GIT_EXEC_PATH/po" +export GIT_TEXTDOMAINDIR GIT_PO_PATH + +. "$GIT_EXEC_PATH"/git-sh-i18n + +test_expect_success 'sanity: $TEXTDOMAIN is git' ' + test $TEXTDOMAIN =3D "git" +' + +if test_have_prereq GETTEXT; then + test_expect_success 'sanity: $TEXTDOMAINDIR exists without NO_GETTEXT= =3DYesPlease' ' + test -d "$TEXTDOMAINDIR" && + test "$TEXTDOMAINDIR" =3D "$GIT_TEXTDOMAINDIR" +' + + test_expect_success 'sanity: Icelandic locale was compiled' ' + test -f "$TEXTDOMAINDIR/is/LC_MESSAGES/git.mo" +' +else + test_expect_success "sanity: \$TEXTDOMAINDIR doesn't exists with NO_G= ETTEXT=3DYesPlease" ' + test_expect_failure test -d "$TEXTDOMAINDIR" && + test "$TEXTDOMAINDIR" =3D "$GIT_TEXTDOMAINDIR" +' +fi + +# Basic xgettext() extraction tests on po/*.po. Doesn't need gettext s= upport +test_expect_success 'xgettext: Perl _() strings are not extracted' ' + test_expect_failure grep "A Perl string xgettext will not get" "$G= IT_PO_PATH"/is.po +' + +test_expect_success 'xgettext: Comment extraction with --add-comments'= ' + grep "TRANSLATORS: This is a test" "$TEST_DIRECTORY"/t0200/* | wc = -l > expect && + grep "TRANSLATORS: This is a test" "$GIT_PO_PATH"/is.po | wc -l >= actual && + test_cmp expect actual +' + +test_expect_success 'xgettext: Comment extraction with --add-comments = stops at statements' ' + test_expect_failure grep "This is a phony" "$GIT_PO_PATH"/is.po && + test_expect_failure grep "the above comment" "$GIT_PO_PATH"/is.po +' + +# We can go no further without actual gettext support +if ! test_have_prereq GETTEXT; then + say "Skipping the rest of the gettext tests, Git was compiled with NO= _GETTEXT=3DYesPlease" + test_done +fi + +test_expect_success 'sanity: No gettext("") data for fantasy locale' ' + LANGUAGE=3Dis LC_ALL=3Dtlh_TLH.UTF-8 gettext "" > real-locale && + test_expect_failure test -s real-locale +' + +test_expect_success 'sanity: Some gettext("") data for real locale' ' + LANGUAGE=3Dis LC_ALL=3Dis_IS.UTF-8 gettext "" > fantasy-locale && + test -s fantasy-locale +' + +# TODO: When we have more locales, generalize this to test them +# all. Maybe we'll need a dir->locale map for that. +test_expect_success 'sanity: gettext("") metadata is OK' ' + # Return value may be non-zero + LANGUAGE=3Dis LC_ALL=3Dis_IS.UTF-8 gettext "" > zero-expect && + grep "Project-Id-Version: Git" zero-expect && + grep "Git Mailing List " zero-expect && + grep "Content-Type: text/plain; charset=3DUTF-8" zero-expect && + grep "Content-Transfer-Encoding: 8bit" zero-expect +' + +test_expect_success 'sanity: gettext(unknown) is passed through' ' + printf "This is not a translation string" > expect && + gettext "This is not a translation string" > actual && + eval_gettext "This is not a translation string" > actual && + test_cmp expect actual +' + +# xgettext from C +test_expect_success 'xgettext: C extraction of _() and N_() strings' ' + printf "TILRAUN: C tilraunastrengur" > expect && + printf "\n" >> expect && + printf "Sj=C3=A1 git help SKIPUN til a=C3=B0 sj=C3=A1 hj=C3=A1lp f= yrir tiltekna skipun." >> expect && + LANGUAGE=3Dis LC_ALL=3Dis_IS.UTF-8 gettext "TEST: A C test string"= > actual && + printf "\n" >> actual && + LANGUAGE=3Dis LC_ALL=3Dis_IS.UTF-8 gettext "See git help COMMAND f= or more information on a specific command." >> actual && + test_cmp expect actual +' + +test_expect_success 'xgettext: C extraction with %s' ' + printf "TILRAUN: C tilraunastrengur %%s" > expect && + LANGUAGE=3Dis LC_ALL=3Dis_IS.UTF-8 gettext "TEST: A C test string = %s" > actual && + test_cmp expect actual +' + +# xgettext from Shell +test_expect_success 'xgettext: Shell extraction' ' + printf "TILRAUN: Skeljartilraunastrengur" > expect && + LANGUAGE=3Dis LC_ALL=3Dis_IS.UTF-8 gettext "TEST: A Shell test str= ing" > actual && + test_cmp expect actual +' + +test_expect_success 'xgettext: Shell extraction with $variable' ' + printf "TILRAUN: Skeljartilraunastrengur me=C3=B0 breytunni a var = i able" > x-expect && + LANGUAGE=3Dis LC_ALL=3Dis_IS.UTF-8 variable=3D"a var i able" eval_= gettext "TEST: A Shell test \$variable" > x-actual && + test_cmp x-expect x-actual +' + +# xgettext from Perl +test_expect_success 'xgettext: Perl extraction' ' + printf "TILRAUN: Perl tilraunastrengur" > expect && + LANGUAGE=3Dis LC_ALL=3Dis_IS.UTF-8 gettext "TEST: A Perl test stri= ng" > actual && + test_cmp expect actual +' + +test_expect_success 'xgettext: Perl extraction with %s' ' + printf "TILRAUN: Perl tilraunastrengur me=C3=B0 breytunni %%s" > e= xpect && + LANGUAGE=3Dis LC_ALL=3Dis_IS.UTF-8 gettext "TEST: A Perl test vari= able %s" > actual && + test_cmp expect actual +' + +test_done diff --git a/t/t0200/test.c b/t/t0200/test.c new file mode 100644 index 0000000..93373b3 --- /dev/null +++ b/t/t0200/test.c @@ -0,0 +1,13 @@ +/* This is a phony C program that's only here to test xgettext message= extraction */ + +const char help[] =3D + N_("See 'git help COMMAND' for more information on a specific command= =2E"); + +int main(void) +{ + /* TRANSLATORS: This is a test. You don't need to translate it. */ + puts(_("TEST: A C test string")); + + /* TRANSLATORS: This is a test. You don't need to translate it. */ + printf(_("TEST: A C test string %s"), "variable"); +} diff --git a/t/t0200/test.perl b/t/t0200/test.perl new file mode 100644 index 0000000..36fba34 --- /dev/null +++ b/t/t0200/test.perl @@ -0,0 +1,14 @@ +# This is a phony Perl program that's only here to test xgettext +# message extraction + +# so the above comment won't be folded into the next one by xgettext +1; + +# TRANSLATORS: This is a test. You don't need to translate it. +print __("TEST: A Perl test string"); + +# TRANSLATORS: This is a test. You don't need to translate it. +printf __("TEST: A Perl test variable %s"), "moo"; + +# TRANSLATORS: If you see this, Git has a bug +print _"TEST: A Perl string xgettext will not get"; diff --git a/t/t0200/test.sh b/t/t0200/test.sh new file mode 100644 index 0000000..022d607 --- /dev/null +++ b/t/t0200/test.sh @@ -0,0 +1,14 @@ +# This is a phony Shell program that's only here to test xgettext +# message extraction + +# so the above comment won't be folded into the next one by xgettext +echo + +# TRANSLATORS: This is a test. You don't need to translate it. +gettext "TEST: A Shell test string" + +# TRANSLATORS: This is a test. You don't need to translate it. +eval_gettext "TEST: A Shell test \$variable" + +# TRANSLATORS: If you see this, Git has a bug +_("TEST: A Shell string xgettext won't get") diff --git a/t/t0201-gettext-fallbacks.sh b/t/t0201-gettext-fallbacks.s= h new file mode 100755 index 0000000..b4bc1df --- /dev/null +++ b/t/t0201-gettext-fallbacks.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +test_description=3D'Gettext Shell fallbacks' + +. ./test-lib.sh + +GIT_TEXTDOMAINDIR=3D"$GIT_EXEC_PATH/share/locale" +GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=3DYesPlease + +export GIT_TEXTDOMAINDIR GIT_INTERNAL_GETTEXT_TEST_FALLBACKS + +. "$GIT_EXEC_PATH"/git-sh-i18n + +test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is s= et' ' + test_expect_failure test -z "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" +' + +test_expect_success 'gettext: our gettext() fallback has pass-through = semantics' ' + printf "test" > expect && + gettext "test" > actual && + test_cmp expect actual && + printf "test more words" > expect && + gettext "test more words" > actual && + test_cmp expect actual +' + +test_expect_success 'eval_gettext: our eval_gettext() fallback has pas= s-through semantics' ' + printf "test" > expect && + eval_gettext "test" > actual && + test_cmp expect actual && + printf "test more words" > expect && + eval_gettext "test more words" > actual && + test_cmp expect actual +' + +test_expect_success 'eval_gettext: our eval_gettext() fallback can int= erpolate variables' ' + printf "test YesPlease" > expect && + eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" > actual= && + test_cmp expect actual +' + +test_done diff --git a/t/t0202-gettext-perl.sh b/t/t0202-gettext-perl.sh new file mode 100755 index 0000000..9b075b1 --- /dev/null +++ b/t/t0202-gettext-perl.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +test_description=3D'Perl gettext interface (Git::I18N)' +. ./test-lib.sh + +if ! test_have_prereq PERL; then + say 'skipping perl interface tests, perl not available' + test_done +fi + +"$PERL_PATH" -MTest::More -e 0 2>/dev/null || { + say "Perl Test::More unavailable, skipping test" + test_done +} + +test_external_without_stderr \ + 'Perl Git::I18N API' \ + "$PERL_PATH" "$TEST_DIRECTORY"/t0202/test.pl + +test_done diff --git a/t/t0202/test.pl b/t/t0202/test.pl new file mode 100644 index 0000000..4e9a0dc --- /dev/null +++ b/t/t0202/test.pl @@ -0,0 +1,104 @@ +#!/usr/bin/perl +use 5.006002; +use lib (split(/:/, $ENV{GITPERLLIB})); +use warnings; +use strict; +use Test::More tests =3D> 9; +use Git::I18N; +use POSIX qw(:locale_h); + +my $has_gettext_library =3D $Git::I18N::__HAS_LIBRARY; + +ok(1, "Testing Git::I18N version $Git::I18N::VERSION with " . + ($has_gettext_library + ? "Locale::Messages version $Locale::Messages::VERSION" + : "NO Perl gettext library")); +ok(1, "Git::I18N is located at $INC{'Git/I18N.pm'}"); + +ok($Git::I18N::VERSION, 'sanity: Git::I18N defines a $VERSION'); +{ + my $exports =3D @Git::I18N::EXPORT; + ok($exports, "sanity: Git::I18N has $exports export(s)"); +} +is_deeply(\@Git::I18N::EXPORT, \@Git::I18N::EXPORT_OK, "sanity: Git::I= 18N exports everything by default"); + +# prototypes +{ + # Add prototypes here when modifying the public interface to add + # more gettext wrapper functions. + my %prototypes =3D (qw( + __ $ + )); + while (my ($sub, $proto) =3D each %prototypes) { + is(prototype(\&{"Git::I18N::$sub"}), $proto, "sanity: $sub has a $pr= oto prototype"); + } +} + +# Test basic passthrough in the C locale +{ + local $ENV{LANGUAGE} =3D 'C'; + local $ENV{LC_ALL} =3D 'C'; + local $ENV{LANG} =3D 'C'; + + my ($got, $expect) =3D (('TEST: A Perl test string') x 2); + + is(__($got), $expect, "Passing a string through __() in the C locale = works"); +} + +# Test a basic message on different locales +SKIP: { + unless ($ENV{TEST_GIT_I18N_EXHAUSTIVE}) { + # Can't reliably test __() with a non-C locales because the + # required locales may not be installed on the system. + # + # We test for these anyway as part of the shell + # tests. Skipping these here will eliminate failures on odd + # platforms with incomplete locale data. + + skip "Set TEST_GIT_I18N_EXHAUSTIVE=3D1 to enable exhaustive Gi= t::I18N locale tests", 2; + } + + my $test =3D sub { + my ($got, $expect, $msg, $locale) =3D @_; + # Maybe this system doesn't have the locale we're trying to + # test. + my $locale_ok =3D setlocale(LC_ALL, $locale); + is(__($got), $expect, "$msg a gettext library + <$locale> locale <$g= ot> turns into <$expect>"); + }; + + my $env_C =3D sub { + $ENV{LANGUAGE} =3D 'C'; + $ENV{LC_ALL} =3D 'C'; + }; + + my $env_is =3D sub { + $ENV{LANGUAGE} =3D 'is'; + $ENV{LC_ALL} =3D 'is_IS.UTF-8'; + }; + + # Translation's the same as the original + my ($got, $expect) =3D (('TEST: A Perl test string') x 2); + + if ($has_gettext_library) { + { + local %ENV; $env_C->(); + $test->($got, $expect, "With", 'C'); + } + + { + my ($got, $expect) =3D ($got, 'TILRAUN: Perl tilraunastrengur'); + local %ENV; $env_is->(); + $test->($got, $expect, "With", 'is_IS.UTF-8'); + } + } else { + { + local %ENV; $env_C->(); + $test->($got, $expect, "Without", 'C'); + } + + { + local %ENV; $env_is->(); + $test->($got, $expect, "Without", 'is'); + } + } +} diff --git a/t/test-lib.sh b/t/test-lib.sh index 454880a..ae63316 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -37,6 +37,7 @@ ORIGINAL_TERM=3D$TERM # For repeatability, reset the environment to known value. LANG=3DC LC_ALL=3DC +LANGUAGE=3DC PAGER=3Dcat TZ=3DUTC TERM=3Ddumb @@ -845,6 +846,7 @@ esac =20 test -z "$NO_PERL" && test_set_prereq PERL test -z "$NO_PYTHON" && test_set_prereq PYTHON +test -z "$NO_GETTEXT" && test_set_prereq GETTEXT =20 # test whether the filesystem supports symbolic links ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYML= INKS diff --git a/upload-pack.c b/upload-pack.c index dc464d7..ece9a4b 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -10,6 +10,7 @@ #include "revision.h" #include "list-objects.h" #include "run-command.h" +#include "gettext.h" =20 static const char upload_pack_usage[] =3D "git upload-pack [--strict] = [--timeout=3Dnn] "; =20 @@ -686,6 +687,8 @@ int main(int argc, char **argv) int i; int strict =3D 0; =20 + git_setup_gettext(); + git_extract_argv0_path(argv[0]); read_replace_refs =3D 0; =20 --=20 1.7.1.243.gda92d6.dirty