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>,
"Jiang Xin" <worldhello.net@gmail.com>
Subject: [PATCH 1/7] i18n: New keywords for xgettext extraction from sh
Date: Sat, 21 Jul 2012 23:50:50 +0800 [thread overview]
Message-ID: <a7d2248051ddc62e38e67d9efbb41c01498c7a4c.1342884459.git.worldhello.net@gmail.com> (raw)
In-Reply-To: <cover.1342884458.git.worldhello.net@gmail.com>
In-Reply-To: <cover.1342884458.git.worldhello.net@gmail.com>
Since we have additional shell wrappers (gettextln and eval_gettextln)
for gettext, we need to take into account these wrapers when run
'make pot' to extract messages from shell scripts.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 285c66..e1692 100644
--- a/Makefile
+++ b/Makefile
@@ -2376,7 +2376,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.11.2.259.g37fc0e1
next prev parent reply other threads:[~2012-07-21 15:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-21 15:50 [PATCH 0/7] i18n for git-am, git-rebase and git-merge Jiang Xin
2012-07-21 15:50 ` Jiang Xin [this message]
2012-07-21 15:50 ` [PATCH 2/7] i18n: rebase: mark strings for translation Jiang Xin
2012-07-21 15:50 ` [PATCH 3/7] i18n: Rewrite gettext messages start with dash Jiang Xin
2012-07-21 15:50 ` [PATCH 4/7] Remove obsolete LONG_USAGE which breaks xgettext Jiang Xin
2012-07-21 15:50 ` [PATCH 5/7] i18n: am: mark more strings for translation Jiang Xin
2012-07-21 15:50 ` [PATCH 6/7] Remove unused and bad gettext block from git-am Jiang Xin
2012-07-21 15:50 ` [PATCH 7/7] i18n: merge-recursive: mark strings for translation Jiang Xin
2012-07-21 16:29 ` [PATCH 6/7] Remove unused and bad gettext block from git-am Stefano Lattarini
2012-07-22 1:33 ` Jiang Xin
2012-07-21 16:27 ` [PATCH 5/7] i18n: am: mark more strings for translation Stefano Lattarini
2012-07-21 16:26 ` [PATCH 4/7] Remove obsolete LONG_USAGE which breaks xgettext Stefano Lattarini
2012-07-21 16:23 ` [PATCH 3/7] i18n: Rewrite gettext messages start with dash Stefano Lattarini
2012-07-21 16:20 ` [PATCH 1/7] i18n: New keywords for xgettext extraction from sh Stefano Lattarini
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=a7d2248051ddc62e38e67d9efbb41c01498c7a4c.1342884459.git.worldhello.net@gmail.com \
--to=worldhello.net@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@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).