mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
5e9637c629
Change the skeleton implementation of i18n in Git to one that can show localized strings to users for our C, Shell and Perl programs using either GNU libintl or the Solaris gettext implementation. This new internationalization support is enabled by default. If gettext isn't available, or if Git is compiled with NO_GETTEXT=YesPlease, Git falls back on its current behavior of showing interface messages in English. When using the autoconf script we'll auto-detect if the gettext libraries are installed and act appropriately. This change is somewhat large because as well as adding a C, Shell and Perl i18n interface we're adding a lot of tests for them, and for those tests to work we need a skeleton PO file to actually test translations. A minimal Icelandic translation is included for this purpose. Icelandic includes multi-byte characters which makes it easy to test various edge cases, and it's a language I happen to understand. The rest of the commit message goes into detail about various sub-parts of this commit. = Installation 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's 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 <AANLkTilYD_NyIZMyj9dHtVk-ylVBfvyxpCC7982LWnVd@mail.gmail.com> for a further elaboration on this topic. = Shell Shell code that's to be localized should use the git-sh-i18n library. It's basically just a wrapper for the system's gettext.sh. If gettext.sh isn't available we'll fall back on gettext(1) if it's available. The latter is available without the former on Solaris, which has its own non-GNU gettext implementation. We also need to emulate eval_gettext() there. If neither are present we'll use a dumb printf(1) fall-through wrapper. = About libcharset.h and langinfo.h We use libcharset to query the character set of the current locale if it's available. I.e. we'll use it instead of nl_langinfo if HAVE_LIBCHARSET_H is set. The GNU gettext manual recommends using langinfo.h's nl_langinfo(CODESET) to acquire the current character set, but on systems that have libcharset.h's locale_charset() using the latter is either saner, or the only option on those systems. GNU and Solaris have a nl_langinfo(CODESET), FreeBSD can use either, but MinGW and some others need to use libcharset.h's locale_charset() instead. =Credits This patch is based on work by Jeff Epler <jepler@unpythonic.net> who did the initial Makefile / C work, and a lot of comments from the Git mailing list, including Jonathan Nieder, Jakub Narebski, Johannes Sixt, Erik Faye-Lund, Peter Krefting, Junio C Hamano, Thomas Rast and others. [jc: squashed a small Makefile fix from Ramsay] Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> |
||
---|---|---|
.. | ||
.gitignore | ||
is.po | ||
README |
Core GIT Translations ===================== This directory holds the translations for the core of Git. This document describes how to add to and maintain these translations, and how to mark source strings for translation. Generating a .pot file ---------------------- The po/git.pot file contains a message catalog extracted from Git's sources. You need to generate it to add new translations with msginit(1), or update existing ones with msgmerge(1). Since the file can be automatically generated it's not checked into git.git. To generate it do, at the top-level: make pot Initializing a .po file ----------------------- To add a new translation first generate git.pot (see above) and then in the po/ directory do: msginit --locale=XX Where XX is your locale, e.g. "is", "de" or "pt_BR". Then edit the automatically generated copyright info in your new XX.po to be correct, e.g. for Icelandic: @@ -1,6 +1,6 @@ -# Icelandic translations for PACKAGE package. -# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Icelandic translations for Git. +# Copyright (C) 2010 Ævar Arnfjörð Bjarmason <avarab@gmail.com> +# This file is distributed under the same license as the Git package. # Ævar Arnfjörð Bjarmason <avarab@gmail.com>, 2010. And change references to PACKAGE VERSION in the PO Header Entry to just "Git": perl -pi -e 's/(?<="Project-Id-Version: )PACKAGE VERSION/Git/' XX.po Updating a .po file ------------------- If there's an existing *.po file for your language but you need to update the translation you first need to generate git.pot (see above) and then in the po/ directory do: msgmerge --add-location --backup=off -U XX.po git.pot Where XX.po is the file you want to update. Testing your changes -------------------- Before you submit your changes go back to the top-level and do: make On systems with GNU gettext (i.e. not Solaris) this will compile your changed PO file with `msgfmt --check`, the --check option flags many common errors, e.g. missing printf format strings, or translated messages that deviate from the originals in whether they begin/end with a newline or not. Marking strings for translation ------------------------------- Before strings can be translated they first have to be marked for translation. Git uses an internationalization interface that wraps the system's gettext library, so most of the advice in your gettext documentation (on GNU systems `info gettext` in a terminal) applies. General advice: - Don't mark everything for translation, only strings which will be read by humans (the porcelain interface) should be translated. The output from Git's plumbing utilities will primarily be read by programs and would break scripts under non-C locales if it was translated. Plumbing strings should not be translated, since they're part of Git's API. - Adjust the strings so that they're easy to translate. Most of the advice in `info '(gettext)Preparing Strings'` applies here. - If something is unclear or ambiguous you can use a "TRANSLATORS" comment to tell the translators what to make of it. These will be extracted by xgettext(1) and put in the po/*.po files, e.g. from git-am.sh: # TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] # in your translation. The program will only accept English # input at this point. gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " Or in C, from builtin/revert.c: /* TRANSLATORS: %s will be "revert" or "cherry-pick" */ die(_("%s: Unable to write new index file"), action_name(opts)); We provide wrappers for C, Shell and Perl programs. Here's how they're used: C: - Include builtin.h at the top, it'll pull in in gettext.h, which defines the gettext interface. Consult with the list if you need to use gettext.h directly. - The C interface is a subset of the normal GNU gettext interface. We currently export these functions: - _() Mark and translate a string. E.g.: printf(_("HEAD is now at %s"), hex); - Q_() Mark and translate a plural string. E.g.: printf(Q_("%d commit", "%d commits", number_of_commits)); This is just a wrapper for the ngettext() function. - N_() A no-op pass-through macro for marking strings inside static initializations, e.g.: static const char *reset_type_names[] = { N_("mixed"), N_("soft"), N_("hard"), N_("merge"), N_("keep"), NULL }; And then, later: die(_("%s reset is not allowed in a bare repository"), _(reset_type_names[reset_type])); Here _() couldn't have statically determined what the translation string will be, but since it was already marked for translation with N_() the look-up in the message catalog will succeed. Shell: - The Git gettext shell interface is just a wrapper for gettext.sh. Import it right after git-sh-setup like this: . git-sh-setup . git-sh-i18n And then use the gettext or eval_gettext functions: # For constant interface messages: gettext "A message for the user"; echo # To interpolate variables: details="oh noes" eval_gettext "An error occured: \$details"; echo In addition we have wrappers for messages that end with a trailing newline. I.e. you could write the above as: # For constant interface messages: gettextln "A message for the user" # To interpolate variables: details="oh noes" eval_gettextln "An error occured: \$details" More documentation about the interface is available in the GNU info page: `info '(gettext)sh'`. Looking at git-am.sh (the first shell command to be translated) for examples is also useful: git log --reverse -p --grep=i18n git-am.sh Perl: - The Git::I18N module provides a limited subset of the Locale::Messages functionality, e.g.: use Git::I18N; print __("Welcome to Git!\n"); printf __("The following error occured: %s\n"), $error; Run `perldoc perl/Git/I18N.pm` for more info. Testing marked strings ---------------------- Even if you've correctly marked porcelain strings for translation something in the test suite might still depend on the US English version of the strings, e.g. to grep some error message or other output. To smoke out issues like these Git can be compiled with gettext poison support, at the top-level: make GETTEXT_POISON=YesPlease That'll give you a git which emits gibberish on every call to gettext. It's obviously not meant to be installed, but you should run the test suite with it: cd t && prove -j 9 ./t[0-9]*.sh If tests break with it you should inspect them manually and see if what you're translating is sane, i.e. that you're not translating plumbing output. If not you should replace calls to grep with test_i18ngrep, or test_cmp calls with test_i18ncmp. If that's not enough you can skip the whole test by making it depend on the C_LOCALE_OUTPUT prerequisite. See existing test files with this prerequisite for examples.