git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 00/20] [CONTINUE] Add gettext support to Git

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Sep 7, 2010, 16:45 UTC
Message-ID
<1283877955-19105-1-git-send-email-avarab@gmail.com>

This series continues work where the already pulled ab/i18n series (now merged to pu) left off.

It can also be pulled from:
    git://github.com/avar/git.git ab/i18n-continue
    http://github.com/avar/git/compare/ab/i18n-in-git-2010-09-07...ab/i18n-continue
    http://github.com/avar/git/compare/ab/i18n-in-git-2010-09-07...ab/i18n-continue.patch

It includes the first translation of a mainporcelain command written in shellscript (git-am). Comments on invividual patches below.

Ævar Arnfjörð Bjarmason (20):
  gettextize: git-clean clean.requireForce braces
  gettextize: git-clone "Cloning into" message braces

Under GCC this warns under -Wall and will presumably break Junio's -Werror build. I didn't notice because I use clang which (IMO rightly) doesn't complain about this.

  po/de.po: make the German translation msgfmt --check clean

We'll see what ze Germans come up with translation wise, but meanwhile this un-breaks the translation already in ab/i18n.

  Makefile: add GNU_GETTEXT, set when we expect GNU gettext
  Makefile: MSGFMT="msgfmt --check" under GNU_GETTEXT

And these two patches make sure that a translation will never break like that again. Since msgfmt --check is a GNU-ism I needed to add support for GNU_GETTEXT=YesPlease in the Makefile.

Maybe a check for this could be added to the configure.ac script, but I couldn't find a way to do so, and for the reasons explained in the patches I don't think it was worth my time.

  Revert "gettextize: git-revert mark the "me" variable for
    translation"

Revert this as discussion on-list. Alternatively the "gettextize: git-revert mark the "me" variable for translation" patch could be ejected from the existing ab/i18n series.

  gettextize: git-revert "Your local changes" message
  gettextize: git-revert literal "me" messages
Do The Right Thing when translating the "me" messsages.
  gettext: add GETTEXT_POISON support for shell scripts
  gettext: add GETTEXT_POISON tests for shell scripts
We need poison for .sh too to ensure sanity.
  gettextize: git-am add git-sh-i18n
  gettextize: git-am one-line gettext $msg; echo
  gettextize: git-am multi-line getttext $msg; echo
  gettextize: git-am eval_gettext messages
  gettextize: git-am die messages
  gettextize: git-am cannot_fallback messages
Note: Isn't --check clean because the existing code indented with
spaces.
  gettextize: git-am clean_abort messages
  gettextize: git-am "Apply?" message
  gettextize: git-am core say messages
  gettextize: git-am printf(1) message to eval_gettext

All these git-am patches are split up like this to make it easier to review them, and to demonstrate the different sort of messages we'll have to translate in the shell scripts.

I won't sent commits quite so granular in the future (unless requested).

 Makefile                     |   16 +++++++++
 builtin/clean.c              |    3 +-
 builtin/clone.c              |    3 +-
 builtin/revert.c             |   32 +++++++++++------
 git-am.sh                    |   68 +++++++++++++++++++-----------------
 git-sh-i18n.sh               |   77 +++++++++++++++++++++++++----------------
 po/de.po                     |   11 +++---
 t/t0201-gettext-fallbacks.sh |   12 +++---
 t/t0201-gettext-poison.sh    |   36 +++++++++++++++++++
 t/t4150-am.sh                |    4 ++-
 t/t4151-am-abort.sh          |    2 +-
 t/test-lib.sh                |    9 ++++-
 12 files changed, 184 insertions(+), 89 deletions(-)
 create mode 100755 t/t0201-gettext-poison.sh
-- 
1.7.2.3.313.gcd15
Next: Ævar Arnfjörð Bjarmason
Message 1 of 47 in “[CONTINUE] Add gettext support to Git”
  1. 00/20 [CONTINUE] Add gettext support to GitÆvar Arnfjörð Bjarmason, Sep 7, 2010
  2. 01/20 gettextize: git-clean clean.requireForce bracesÆvar Arnfjörð Bjarmason, Sep 7, 2010
  3. 02/20 gettextize: git-clone "Cloning into" message bracesÆvar Arnfjörð Bjarmason, Sep 7, 2010
  4. 04/20 Makefile: add GNU_GETTEXT, set when we expect GNU gettextÆvar Arnfjörð Bjarmason, Sep 7, 2010
  5. 05/20 Makefile: MSGFMT="msgfmt --check" under GNU_GETTEXTÆvar Arnfjörð Bjarmason, Sep 7, 2010
  6. 06/20 Revert "gettextize: git-revert mark the "me" variable for translation"Ævar Arnfjörð Bjarmason, Sep 7, 2010
  7. 07/20 gettextize: git-revert "Your local changes" messageÆvar Arnfjörð Bjarmason, Sep 7, 2010
  8. 08/20 gettextize: git-revert literal "me" messagesÆvar Arnfjörð Bjarmason, Sep 7, 2010
  9. 09/20 gettext: add GETTEXT_POISON support for shell scriptsÆvar Arnfjörð Bjarmason, Sep 7, 2010
  10. 10/20 gettext: add GETTEXT_POISON tests for shell scriptsÆvar Arnfjörð Bjarmason, Sep 7, 2010
  11. 11/20 gettextize: git-am add git-sh-i18nÆvar Arnfjörð Bjarmason, Sep 7, 2010
  12. 12/20 gettextize: git-am one-line gettext $msg; echoÆvar Arnfjörð Bjarmason, Sep 7, 2010
  13. 13/20 gettextize: git-am multi-line getttext $msg; echoÆvar Arnfjörð Bjarmason, Sep 7, 2010
  14. 14/20 gettextize: git-am eval_gettext messagesÆvar Arnfjörð Bjarmason, Sep 7, 2010
  15. 15/20 gettextize: git-am die messagesÆvar Arnfjörð Bjarmason, Sep 7, 2010
  16. 16/20 gettextize: git-am cannot_fallback messagesÆvar Arnfjörð Bjarmason, Sep 7, 2010
  17. 17/20 gettextize: git-am clean_abort messagesÆvar Arnfjörð Bjarmason, Sep 7, 2010
  18. 18/20 gettextize: git-am "Apply?" messageÆvar Arnfjörð Bjarmason, Sep 7, 2010
  19. 19/20 gettextize: git-am core say messagesÆvar Arnfjörð Bjarmason, Sep 7, 2010
  20. 20/20 gettextize: git-am printf(1) message to eval_gettextÆvar Arnfjörð Bjarmason, Sep 7, 2010
  21. Jonathan NiederSep 7, 2010
  22. Ævar Arnfjörð BjarmasonSep 7, 2010
  23. Jonathan NiederSep 7, 2010
  24. 20/20 gettextize: git-am printf(1) message to eval_gettextÆvar Arnfjörð Bjarmason, Sep 7, 2010
  25. 19/20 gettextize: git-am core say messagesÆvar Arnfjörð Bjarmason, Sep 7, 2010
  26. Junio C HamanoSep 8, 2010
  27. Ævar Arnfjörð BjarmasonSep 8, 2010
  28. Ævar Arnfjörð BjarmasonSep 10, 2010
  29. Junio C HamanoSep 10, 2010
  30. Ævar Arnfjörð BjarmasonSep 10, 2010
  31. 0/5 gettext docs: programmer docs in po/READMEÆvar Arnfjörð Bjarmason, Sep 10, 2010
  32. Ævar Arnfjörð BjarmasonSep 10, 2010
  33. 1/5 gettext docs: add a "Testing your changes" section to po/READMEÆvar Arnfjörð Bjarmason, Sep 10, 2010
  34. 2/5 gettext docs: add "Marking strings for translation" section in po/READMEÆvar Arnfjörð Bjarmason, Sep 10, 2010
  35. Junio C HamanoSep 10, 2010
  36. Ævar Arnfjörð BjarmasonSep 10, 2010
  37. 3/5 gettext docs: the gettext.h C interfaceÆvar Arnfjörð Bjarmason, Sep 10, 2010
  38. Junio C HamanoSep 10, 2010
  39. Ævar Arnfjörð BjarmasonSep 10, 2010
  40. Junio C HamanoSep 10, 2010
  41. Ævar Arnfjörð BjarmasonSep 10, 2010
  42. Junio C HamanoSep 10, 2010
  43. Ævar Arnfjörð BjarmasonSep 10, 2010
  44. 4/5 gettext docs: the git-sh-i18n.sh Shell interfaceÆvar Arnfjörð Bjarmason, Sep 10, 2010
  45. Junio C HamanoSep 10, 2010
  46. Ævar Arnfjörð BjarmasonSep 10, 2010
  47. 5/5 gettext docs: the Git::I18N Perl interfaceÆvar Arnfjörð Bjarmason, Sep 10, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.