From: Jiang Xin <worldhello.net@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git List" <git@vger.kernel.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Stefano Lattarini" <stefano.lattarini@gmail.com>,
"Martin von Zweigbergk" <martin.von.zweigbergk@gmail.com>,
"Jiang Xin" <worldhello.net@gmail.com>
Subject: [PATCH v6 1/7] i18n: New keywords for xgettext extraction from sh
Date: Wed, 25 Jul 2012 22:53:07 +0800 [thread overview]
Message-ID: <9f7ba1a0ce85184cc410bf7c2e8c3133f46f0237.1343227806.git.worldhello.net@gmail.com> (raw)
In-Reply-To: <cover.1343227806.git.worldhello.net@gmail.com>
In-Reply-To: <cover.1343227806.git.worldhello.net@gmail.com>
Since we have additional shell wrappers (gettextln and eval_gettextln)
for gettext, we need to take into account these wrappers when running
'make pot' to extract messages from shell scripts.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index b0b34..d3cd9 100644
--- a/Makefile
+++ b/Makefile
@@ -2387,7 +2387,8 @@ XGETTEXT_FLAGS = \
--from-code=UTF-8
XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
--keyword=_ --keyword=N_ --keyword="Q_:1,2"
-XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell
+XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
+ --keyword=gettextln --keyword=eval_gettextln
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
LOCALIZED_C := $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
LOCALIZED_SH := $(SCRIPT_SH)
--
1.7.12.rc0.16.gf4916ac
next prev parent reply other threads:[~2012-07-25 14:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-25 14:53 [PATCH v6 0/7] i18n for git-am, git-rebase and git-merge Jiang Xin
2012-07-25 14:53 ` Jiang Xin [this message]
2012-07-25 14:53 ` [PATCH v6 2/7] i18n: rebase: mark messages for translation Jiang Xin
2012-07-25 14:53 ` [PATCH v6 3/7] i18n: Rewrite gettext messages start with dash Jiang Xin
2012-07-25 14:53 ` [PATCH v6 4/7] Remove obsolete LONG_USAGE which breaks xgettext Jiang Xin
2012-07-25 14:53 ` [PATCH v6 5/7] i18n: am: mark more strings for translation Jiang Xin
2012-07-25 14:53 ` [PATCH v6 6/7] Remove dead code which contains bad gettext block Jiang Xin
2012-07-25 14:53 ` [PATCH v6 7/7] i18n: merge-recursive: mark strings for translation Jiang Xin
2012-07-25 17:18 ` [PATCH v6 5/7] i18n: am: mark more " Junio C Hamano
2012-07-25 17:13 ` [PATCH v6 4/7] Remove obsolete LONG_USAGE which breaks xgettext Junio C Hamano
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=9f7ba1a0ce85184cc410bf7c2e8c3133f46f0237.1343227806.git.worldhello.net@gmail.com \
--to=worldhello.net@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=martin.von.zweigbergk@gmail.com \
--cc=pclouds@gmail.com \
--cc=stefano.lattarini@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).