From c2cc5c347440e48bc4d0e4ed083db2f3966a0e90 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 2 Apr 2012 02:58:37 +0300 Subject: [PATCH] NLS: Seed Language field in PO header Use msgmerge --lang option to seed the Language field, recently introduced by gettext, in the header of the new PO file. --- src/nls-global.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nls-global.mk b/src/nls-global.mk index aa60e63fc3..25899a49b4 100644 --- a/src/nls-global.mk +++ b/src/nls-global.mk @@ -136,14 +136,14 @@ endif update-po: $(ALL_LANGUAGES:%=po/%.po.new) $(AVAIL_LANGUAGES:%=po/%.po.new): po/%.po.new: po/%.po po/$(CATALOG_NAME).pot $(all_compendia) - $(MSGMERGE) $(word 1, $^) $(word 2,$^) -o $@ $(addprefix --compendium=,$(filter %/$*.po,$(wordlist 3,$(words $^),$^))) + $(MSGMERGE) --lang=$* $(word 1, $^) $(word 2,$^) -o $@ $(addprefix --compendium=,$(filter %/$*.po,$(wordlist 3,$(words $^),$^))) # For languages not yet available, merge against oneself, to pick # up translations from the compendia. (Merging against /dev/null # doesn't work so well; it inserts the headers from the first-named # compendium.) po/%.po.new: po/$(CATALOG_NAME).pot $(all_compendia) - $(MSGMERGE) $(word 1,$^) $(word 1,$^) -o $@ $(addprefix --compendium=,$(filter %/$*.po,$(wordlist 2,$(words $^),$^))) + $(MSGMERGE) --lang=$* $(word 1,$^) $(word 1,$^) -o $@ $(addprefix --compendium=,$(filter %/$*.po,$(wordlist 2,$(words $^),$^))) all: all-po