fixes #20
* message catalogs for PHP and JavaScript have been joined to davadmin.pot * textdomain selection has been unified in admin/i18n.inc.php
This commit is contained in:
parent
379fffa19b
commit
0993d2be3a
11 changed files with 291 additions and 377 deletions
42
Makefile
42
Makefile
|
@ -44,9 +44,9 @@ JSPOT=$(POSRC)/$(PROJECT)js.pot
|
|||
JSTRANS=$(POSRC)/transjs.txt
|
||||
|
||||
.PHONY: all
|
||||
all: $(POT) $(JSPOT) $(JSTRANS) $(MOFILES) $(JSMOFILES) $(TEMPDIR)/delete
|
||||
all: $(POT) $(JSTRANS) $(MOFILES) $(TEMPDIR)/delete
|
||||
|
||||
$(MOFILES) $(JSMOFILES): %.mo: %.po
|
||||
$(MOFILES): %.mo: %.po
|
||||
@echo "msgfmt: $@"
|
||||
msgfmt -o$@ $<
|
||||
|
||||
|
@ -55,34 +55,19 @@ $(POFILES): %: $(POT)
|
|||
msgmerge -U $@ $(POT)
|
||||
touch $@
|
||||
|
||||
$(JSPOFILES): %: $(JSPOT)
|
||||
@echo "msgmerge: $@"
|
||||
msgmerge -U $@ $(JSPOT)
|
||||
touch $@
|
||||
|
||||
$(POT): $(XSRCFILES) po/pot.sed
|
||||
$(POT): $(XSRCFILES) $(XJSFILES) po/pot.sed
|
||||
@echo "xgettext: $@"
|
||||
cd $(TEMPDIR) && \
|
||||
xgettext --default-domain=$(PROJECT) --language=php \
|
||||
--from-code=UTF-8 \
|
||||
--msgid-bugs-address="jan@dittberner.info" -o- $(SRCFILES) \
|
||||
| sed -f $(CURDIR)/po/pot.sed \
|
||||
> $(CURDIR)/$@
|
||||
for pofile in $(POFILES); do \
|
||||
if test ! -f $(CURDIR)/$${pofile}; then \
|
||||
cp $(CURDIR)/$@ $(CURDIR)/$${pofile}; \
|
||||
fi; \
|
||||
done
|
||||
|
||||
$(JSPOT): $(XJSFILES) po/jspot.sed
|
||||
@echo "xgettext: $@"
|
||||
cd $(TEMPDIR) && \
|
||||
xgettext --default-domain=$(PROJECT)js --language=Java \
|
||||
--msgid-bugs-address="jan@dittberner.info" -o $(CURDIR)/$@ $(SRCFILES)
|
||||
xgettext --default-domain=$(PROJECT) --language=Java \
|
||||
--from-code=UTF-8 --keyword="intl.translate" \
|
||||
--msgid-bugs-address="jan@dittberner.info" -o- $(JSFILES) \
|
||||
| sed -f $(CURDIR)/po/jspot.sed \
|
||||
> $(CURDIR)/$@
|
||||
for pofile in $(JSPOFILES); do \
|
||||
--join-existing \
|
||||
--msgid-bugs-address="jan@dittberner.info" -o $(CURDIR)/$@ $(JSFILES)
|
||||
sed -f $(CURDIR)/po/pot.sed < $(CURDIR)/$@ > $(CURDIR)/$@.tmp && \
|
||||
rm -f $(CURDIR)/$@ && mv $(CURDIR)/$@.tmp $(CURDIR)/$@
|
||||
for pofile in $(POFILES); do \
|
||||
if test ! -f $(CURDIR)/$${pofile}; then \
|
||||
cp $(CURDIR)/$@ $(CURDIR)/$${pofile}; \
|
||||
fi; \
|
||||
|
@ -100,12 +85,7 @@ $(JSTRANS): $(XJSFILES)
|
|||
> $(CURDIR)/$@
|
||||
|
||||
.INTERMEDIATE: $(XSRCFILES) $(XJSFILES)
|
||||
$(XSRCFILES): $(TEMPDIR)/%: %
|
||||
@echo "processing: $<"
|
||||
mkdir -p $(@D)
|
||||
cp $< $@
|
||||
|
||||
$(XJSFILES): $(TEMPDIR)/%: %
|
||||
$(XSRCFILES) $(XJSFILES): $(TEMPDIR)/%: %
|
||||
@echo "processing: $<"
|
||||
mkdir -p $(@D)
|
||||
cp $< $@
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue