# [PATCH] Makefile: extract Q_() source strings as ngettext() 3 messages from 2011-04-10 to 2011-04-11. Participants: Ævar Arnfjörð Bjarmason, Jonathan Nieder, Junio C Hamano. Thread: https://gitlist.dev/t/27054 ## Ævar Arnfjörð Bjarmason, 2011-04-10 19:37 Subject: [PATCH] Makefile: extract Q_() source strings as ngettext() Message-ID: <1302464221-23381-1-git-send-email-avarab@gmail.com> URL: https://gitlist.dev/e/1302464221-23381-1-git-send-email-avarab%40gmail.com ``` 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 --- 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 " \ --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 ``` ## Jonathan Nieder, 2011-04-10 19:54 Subject: Re: [PATCH] Makefile: extract Q_() source strings as ngettext() Message-ID: <20110410195436.GD28163@elie> URL: https://gitlist.dev/e/20110410195436.GD28163%40elie In-Reply-To: <1302464221-23381-1-git-send-email-avarab@gmail.com> ``` Ævar Arnfjörð Bjarmason wrote: > --- a/Makefile > +++ b/Makefile > @@ -2051,7 +2051,7 @@ XGETTEXT_FLAGS = \ > --add-comments \ > --msgid-bugs-address="Git Mailing List " \ > --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 --- 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 " \ --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 ``` ## Junio C Hamano, 2011-04-11 21:38 Subject: Re: [PATCH] Makefile: extract Q_() source strings as ngettext() Message-ID: <7v1v18v57g.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v1v18v57g.fsf%40alter.siamese.dyndns.org In-Reply-To: <20110410195436.GD28163@elie> ``` Jonathan Nieder 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". ```