* [PATCH] Makefile: extract Q_() source strings as ngettext()
@ 2011-04-10 19:37 Ævar Arnfjörð Bjarmason
2011-04-10 19:54 ` Jonathan Nieder
0 siblings, 1 reply; 3+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2011-04-10 19:37 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Jonathan Nieder,
Ævar Arnfjörð Bjarmason
The patch adding the Q_() wrapper function around ngettext[1] didn't
contain a corresponding update to the "pot" target in the Makefile. As
a result "make pot" wouldn't extract gettext messages using the plural
form.
1. added by Jonathan Nieder in v1.7.5-rc0~54^2~2 (i18n: add stub Q_()
wrapper for ngettext).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 92c1c5e..2441d56 100644
--- a/Makefile
+++ b/Makefile
@@ -2051,7 +2051,7 @@ XGETTEXT_FLAGS = \
--add-comments \
--msgid-bugs-address="Git Mailing List <git@vger.kernel.org>" \
--from-code=UTF-8
-XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --keyword=_ --keyword=N_ --language=C
+XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --keyword=_ --keyword=N_ --keyword="Q_:1,2" --language=C
LOCALIZED_C := $(C_OBJ:o=c)
po/git.pot: $(LOCALIZED_C)
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Makefile: extract Q_() source strings as ngettext()
2011-04-10 19:37 [PATCH] Makefile: extract Q_() source strings as ngettext() Ævar Arnfjörð Bjarmason
@ 2011-04-10 19:54 ` Jonathan Nieder
2011-04-11 21:38 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Nieder @ 2011-04-10 19:54 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: git, Junio C Hamano
Ævar Arnfjörð Bjarmason wrote:
> --- a/Makefile
> +++ b/Makefile
> @@ -2051,7 +2051,7 @@ XGETTEXT_FLAGS = \
> --add-comments \
> --msgid-bugs-address="Git Mailing List <git@vger.kernel.org>" \
> --from-code=UTF-8
> -XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --keyword=_ --keyword=N_ --language=C
> +XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --keyword=_ --keyword=N_ --keyword="Q_:1,2" --language=C
> LOCALIZED_C := $(C_OBJ:o=c)
Ack. The line is getting long. Maybe it would make sense to split
it up (like this)?
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Makefile | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 2441d56..2dbe555 100644
--- a/Makefile
+++ b/Makefile
@@ -2051,7 +2051,8 @@ XGETTEXT_FLAGS = \
--add-comments \
--msgid-bugs-address="Git Mailing List <git@vger.kernel.org>" \
--from-code=UTF-8
-XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --keyword=_ --keyword=N_ --keyword="Q_:1,2" --language=C
+XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
+ --keyword=_ --keyword=N_ --keyword=Q_:1,2
LOCALIZED_C := $(C_OBJ:o=c)
po/git.pot: $(LOCALIZED_C)
--
1.7.5.rc0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Makefile: extract Q_() source strings as ngettext()
2011-04-10 19:54 ` Jonathan Nieder
@ 2011-04-11 21:38 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2011-04-11 21:38 UTC (permalink / raw)
To: Jonathan Nieder; +Cc: Ævar Arnfjörð Bjarmason, git
Jonathan Nieder <jrnieder@gmail.com> writes:
> Ack. The line is getting long. Maybe it would make sense to split
> it up (like this)?
Makes sense, thanks both.
I've re-written the commit log message, by the way. Instead of saying "X
forgot to do Y and broke Z", I prefer to say "To make sure Z happens, we
need to do Y to augment what X did, and W is how we do Y".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-04-11 21:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-10 19:37 [PATCH] Makefile: extract Q_() source strings as ngettext() Ævar Arnfjörð Bjarmason
2011-04-10 19:54 ` Jonathan Nieder
2011-04-11 21:38 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).