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

Commit89a67e5

Browse files
committed
When merging PO files, take into consideration translations in other PO
files of the same languages. That way, similar or equal translations indifferent programs are automatically propagated and the life of translatorsbecomes a little bit easier.
1 parent09b5271 commit89a67e5

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

‎src/nls-global.mk

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/src/nls-global.mk,v 1.11 2005/12/09 21:19:34 petere Exp $
1+
# $PostgreSQL: pgsql/src/nls-global.mk,v 1.12 2006/04/05 13:40:15 petere Exp $
22

33
# Common rules for Native Language Support (NLS)
44
#
@@ -91,19 +91,22 @@ maintainer-check-po: $(PO_FILES)
9191
init-po: po/$(CATALOG_NAME).pot
9292

9393

94+
definemerge-lang
95+
@printf 'merging$(1) '
96+
@if$(MSGMERGE)$(srcdir)/po/$(1).po$< -o po/$(1).po.new$(addprefix --compendium=,$(shell find$(top_srcdir) -name$(1).po -printf '%p ')); \
97+
then \
98+
mv$(srcdir)/po/$(1).po po/$(1).po.old; \
99+
mv po/$(1).po.new$(srcdir)/po/$(1).po; \
100+
else \
101+
echo "msgmerge for$(1) failed"; \
102+
rm -f po/$(1).po.new; \
103+
fi
104+
105+
endef
106+
94107
update-po: po/$(CATALOG_NAME).pot
95108
ifdefMSGMERGE
96-
@for lang in $(LANGUAGES); do \
97-
echo "merging $$lang:"; \
98-
if $(MSGMERGE) $(srcdir)/po/$$lang.po $< -o po/$$lang.po.new; \
99-
then \
100-
mv $(srcdir)/po/$$lang.po po/$$lang.po.old; \
101-
mv po/$$lang.po.new $(srcdir)/po/$$lang.po; \
102-
else \
103-
echo "msgmerge for $$lang failed"; \
104-
rm -f po/$$lang.po.new; \
105-
fi; \
106-
done
109+
$(foreach lang,$(LANGUAGES),$(call merge-lang,$(lang)))
107110
else
108111
@echo "You don't have 'msgmerge'." ; exit 1
109112
endif

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp