git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jan Krüger" <jk@jk.gs>,
	"Jonathan Nieder" <jrnieder@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 00/20] [CONTINUE] Add gettext support to Git
Date: Tue,  7 Sep 2010 16:45:35 +0000	[thread overview]
Message-ID: <1283877955-19105-1-git-send-email-avarab@gmail.com> (raw)

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

             reply	other threads:[~2010-09-07 16:46 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-07 16:45 Ævar Arnfjörð Bjarmason [this message]
2010-09-07 16:45 ` [PATCH 01/20] gettextize: git-clean clean.requireForce braces Ævar Arnfjörð Bjarmason
2010-09-07 16:45 ` [PATCH 02/20] gettextize: git-clone "Cloning into" message braces Ævar Arnfjörð Bjarmason
2010-09-07 16:47 ` [PATCH 04/20] Makefile: add GNU_GETTEXT, set when we expect GNU gettext Ævar Arnfjörð Bjarmason
2010-09-07 16:47 ` [PATCH 05/20] Makefile: MSGFMT="msgfmt --check" under GNU_GETTEXT Ævar Arnfjörð Bjarmason
2010-09-07 16:47 ` [PATCH 06/20] Revert "gettextize: git-revert mark the "me" variable for translation" Ævar Arnfjörð Bjarmason
2010-09-07 16:47 ` [PATCH 07/20] gettextize: git-revert "Your local changes" message Ævar Arnfjörð Bjarmason
2010-09-07 16:47 ` [PATCH 08/20] gettextize: git-revert literal "me" messages Ævar Arnfjörð Bjarmason
2010-09-07 16:47 ` [PATCH 09/20] gettext: add GETTEXT_POISON support for shell scripts Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 10/20] gettext: add GETTEXT_POISON tests " Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 11/20] gettextize: git-am add git-sh-i18n Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 12/20] gettextize: git-am one-line gettext $msg; echo Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 13/20] gettextize: git-am multi-line getttext " Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 14/20] gettextize: git-am eval_gettext messages Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 15/20] gettextize: git-am die messages Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 16/20] gettextize: git-am cannot_fallback messages Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 17/20] gettextize: git-am clean_abort messages Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 18/20] gettextize: git-am "Apply?" message Ævar Arnfjörð Bjarmason
2010-09-07 16:48 ` [PATCH 19/20] gettextize: git-am core say messages Ævar Arnfjörð Bjarmason
2010-09-07 16:50 ` [PATCH 20/20] gettextize: git-am printf(1) message to eval_gettext Ævar Arnfjörð Bjarmason
2010-09-07 20:10   ` Jonathan Nieder
2010-09-07 20:29     ` Ævar Arnfjörð Bjarmason
2010-09-07 20:32       ` Jonathan Nieder
2010-09-07 20:46   ` [PATCH v2 " Ævar Arnfjörð Bjarmason
2010-09-07 20:45 ` [PATCH v2 19/20] gettextize: git-am core say messages Ævar Arnfjörð Bjarmason
2010-09-08 16:43 ` [PATCH 00/20] [CONTINUE] Add gettext support to Git Junio C Hamano
2010-09-08 23:32   ` Ævar Arnfjörð Bjarmason
2010-09-10 12:00     ` Ævar Arnfjörð Bjarmason
2010-09-10 16:01       ` Junio C Hamano
2010-09-10 17:17         ` Ævar Arnfjörð Bjarmason
2010-09-10 19:35           ` [PATCH 0/5] gettext docs: programmer docs in po/README Ævar Arnfjörð Bjarmason
2010-09-10 23:21             ` Ævar Arnfjörð Bjarmason
2010-09-10 19:35           ` [PATCH 1/5] gettext docs: add a "Testing your changes" section to po/README Ævar Arnfjörð Bjarmason
2010-09-10 19:35           ` [PATCH 2/5] gettext docs: add "Marking strings for translation" section in po/README Ævar Arnfjörð Bjarmason
2010-09-10 22:26             ` Junio C Hamano
2010-09-10 22:31               ` Ævar Arnfjörð Bjarmason
2010-09-10 19:35           ` [PATCH 3/5] gettext docs: the gettext.h C interface Ævar Arnfjörð Bjarmason
2010-09-10 22:30             ` Junio C Hamano
2010-09-10 22:53               ` Ævar Arnfjörð Bjarmason
2010-09-10 22:52             ` Junio C Hamano
2010-09-10 23:03               ` Ævar Arnfjörð Bjarmason
2010-09-10 23:06               ` Junio C Hamano
2010-09-10 23:16                 ` Ævar Arnfjörð Bjarmason
2010-09-10 19:35           ` [PATCH 4/5] gettext docs: the git-sh-i18n.sh Shell interface Ævar Arnfjörð Bjarmason
2010-09-10 22:54             ` Junio C Hamano
2010-09-10 22:58               ` Ævar Arnfjörð Bjarmason
2010-09-10 19:35           ` [PATCH 5/5] gettext docs: the Git::I18N Perl interface Ævar Arnfjörð Bjarmason

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=1283877955-19105-1-git-send-email-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jk@jk.gs \
    --cc=jrnieder@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).