Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Sep 14, 2012
  1. @pclouds @gitster

    fetch: align per-ref summary report in UTF-8 locales

    pclouds authored gitster committed
    fetch does printf("%-*s", width, "foo") where "foo" can be a utf-8
    string, but width is in bytes, not columns. For ASCII it's fine as one
    byte takes one column. For utf-8, this may result in misaligned ref
    summary table.
    Introduce gettext_width() function that returns the string length in
    columns (currently only supports utf-8 locales). Make the code use
    TRANSPORT_SUMMARY(x) where the length is compensated properly in
    non-English locales.
    Signed-off-by: Nguyễn Thái Ngọc Duy <>
    Signed-off-by: Junio C Hamano <>
Commits on Dec 6, 2011
  1. @avar @gitster

    i18n: add infrastructure for translating Git with gettext

    avar authored gitster committed
    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
    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
    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
    See <> 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
    If 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
    = 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
    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()
    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, Erik Faye-Lund, Peter Krefting, Junio C Hamano, Thomas Rast and
    [jc: squashed a small Makefile fix from Ramsay]
    Signed-off-by: Ævar Arnfjörð Bjarmason <>
    Signed-off-by: Ramsay Jones <>
    Signed-off-by: Junio C Hamano <>
Commits on Mar 8, 2011
  1. @jrn @gitster

    i18n: do not poison translations unless GIT_GETTEXT_POISON envvar is set

    jrn authored gitster committed
    Tweak the GETTEXT_POISON facility so it is activated at run time
    instead of compile time.  If the GIT_GETTEXT_POISON environment
    variable is set, _(msg) will result in gibberish as before; but if the
    GIT_GETTEXT_POISON variable is not set, it will return the message for
    human-readable output.  So the behavior of mistranslated and
    untranslated git can be compared without rebuilding git in between.
    For simplicity we always set the GIT_GETTEXT_POISON variable in tests.
    This does not affect builds without the GETTEXT_POISON compile-time
    option set, so non-i18n git will not be slowed down.
    Signed-off-by: Jonathan Nieder <>
    Signed-off-by: Junio C Hamano <>
Something went wrong with that request. Please try again.