Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit26dc14b

Browse files
committed
Rewrite update-po target, so that it works less like a shell script and more
like a makefile with real dependencies.Instead of overwriting the old po file, write the new one to .po.new. This isless annoying and integrates better with the NLS web site.Also, we can now merge languages that don't have a po file yet, by mergingagainst all other po files of that language, to pick up recurring translationsautomatically. This previously only worked when a po file already existed.
1 parent1b4e729 commit26dc14b

File tree

2 files changed

+27
-23
lines changed

2 files changed

+27
-23
lines changed

‎doc/src/sgml/nls.sgml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/nls.sgml,v 1.16 2007/02/01 00:28:17 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/nls.sgml,v 1.17 2009/01/09 10:54:07 petere Exp $ -->
22

33
<chapter id="nls">
44
<chapterinfo>
@@ -200,9 +200,8 @@ gmake update-po
200200
which will create a new blank message catalog file (the pot file
201201
you started with) and will merge it with the existing PO files.
202202
If the merge algorithm is not sure about a particular message it
203-
marks it <quote>fuzzy</quote> as explained above. For the case
204-
where something went really wrong, the old PO file is saved with a
205-
<filename>.po.old</filename> extension.
203+
marks it <quote>fuzzy</quote> as explained above. The new PO file
204+
is saved with a <filename>.po.new</filename> extension.
206205
</para>
207206
</sect2>
208207

‎src/nls-global.mk

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/src/nls-global.mk,v 1.16 2009/01/02 15:15:42 petere Exp $
1+
# $PostgreSQL: pgsql/src/nls-global.mk,v 1.17 2009/01/09 10:54:08 petere Exp $
22

33
# Common rules for Native Language Support (NLS)
44
#
@@ -80,7 +80,7 @@ uninstall-po:
8080

8181
clean-po:
8282
$(if$(MO_FILES),rm -f$(MO_FILES))
83-
@$(if$(PO_FILES),rm -f$(addsuffix .old,$(PO_FILES)))
83+
@$(if$(wildcard po/*.po.new),rm -fpo/*.po.new)
8484
rm -f po/$(CATALOG_NAME).pot
8585

8686

@@ -93,26 +93,31 @@ maintainer-check-po: $(PO_FILES)
9393
init-po: po/$(CATALOG_NAME).pot
9494

9595

96-
definemerge-lang
97-
@printf 'merging$(1) '
98-
@if$(MSGMERGE)$(srcdir)/po/$(1).po$< -o po/$(1).po.new$(addprefix --compendium=,$(shell find$(top_srcdir) -name$(1).po -printf '%p ')); \
99-
then \
100-
mv$(srcdir)/po/$(1).po po/$(1).po.old; \
101-
mv po/$(1).po.new$(srcdir)/po/$(1).po; \
102-
else \
103-
echo "msgmerge for$(1) failed"; \
104-
rm -f po/$(1).po.new; \
105-
fi
106-
107-
endef
108-
109-
update-po: po/$(CATALOG_NAME).pot
110-
ifdefMSGMERGE
111-
$(foreach lang,$(LANGUAGES),$(call merge-lang,$(lang)))
96+
# For performance reasons, only calculate these when the user actually
97+
# requested update-po or a specific file.
98+
ifneq (,$(filter update-po%.po.new,$(MAKECMDGOALS)))
99+
ALL_LANGUAGES :=$(shell find$(top_srcdir) -name '*.po' -printf '%f\n' | sort -u | sed 's/\.po$$//')
100+
all_compendia :=$(shell find$(top_srcdir) -name '*.po' -printf '%p ')
112101
else
113-
@echo "You don't have 'msgmerge'." ; exit 1
102+
ALL_LANGUAGES =$(AVAIL_LANGUAGES)
103+
all_compendia = FORCE
104+
FORCE:
105+
endif
106+
107+
ifdefWANTED_LANGUAGES
108+
ALL_LANGUAGES :=$(filter$(WANTED_LANGUAGES),$(ALL_LANGUAGES))
114109
endif
115110

111+
update-po:$(ALL_LANGUAGES:%=po/%.po.new)
112+
113+
$(AVAIL_LANGUAGES:%=po/%.po.new): po/%.po.new: po/%.po po/$(CATALOG_NAME).pot$(all_compendia)
114+
$(MSGMERGE) $(word 1, $^) $(word 2,$^) -o $@ $(addprefix --compendium=,$(filter %/$*.po,$(wordlist 3,$(words $^),$^)))
115+
116+
# For languages not yet available, merge against empty file, to pick
117+
# up translations from the compendia.
118+
po/%.po.new: po/$(CATALOG_NAME).pot$(all_compendia)
119+
$(MSGMERGE) /dev/null$(word 1,$^) -o$@$(addprefix --compendium=,$(filter%/$*.po,$(wordlist 2,$(words$^),$^)))
120+
116121

117122
all: all-po
118123
install: install-po

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp