inline: change default sort order from age to "age title" for determinism

[git.ikiwiki.info.git] / po / Makefile

diff --git a/po/Makefile b/po/Makefile
index 084d011f07111bf446ffbb1683fab6c509cdf656..b71bb8b91bd1d2d68dce77fe2f2a44339ef3fd70 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -5,40 +5,58 @@ POTFILES=$(sort $(shell find ../IkiWiki -type f -name \*.pm)) \
 POFILES=$(wildcard *.po)
 MOFILES=$(POFILES:.po=.mo)
 
-all: ikiwiki.pot mo
+# Translated underlays can only be generated if po4a is available.
+TRANSLATED_UNDERLAYS=$(shell if perl -e 'use Locale::Po4a::Common' 2>/dev/null; then echo ../underlays/locale; fi)
+
+all: ikiwiki.pot mo $(TRANSLATED_UNDERLAYS)
 
 mo: $(MOFILES)
 
 install: all
+       # Normal mo files for program translation.
        for file in $(MOFILES); do \
                lang=`echo $$file | sed 's/\.mo//'`; \
                install -d $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES/; \
                install -m 0644 $$file $(DESTDIR)$(PREFIX)/share/locale/$$lang/LC_MESSAGES/ikiwiki.mo; \
        done
+       
+       # Underlay translation via po files that go in special per-language
+       # underlays.
+       for file in `cd underlays && find . -type f -name \*.po`; do \
+               lang=`echo $$file | sed -e 's/.po$$//' -e 's/.*\\.//'`; \
+               dir=`dirname "$(DESTDIR)$(PREFIX)/share/ikiwiki/po/$$lang/$$file"`; \
+               install -d $$dir; \
+               install -m 0644 underlays/$$file $$dir; \
+       done
 
 ikiwiki.pot: $(POTFILES)
        @if perl -e '($$ver)=`xgettext -V | head -n 1`=~/.*\s+([0-9]+\.[0-9]+)/; die "gettext $$ver too old, not updating the pot file\n" if $$ver < 0.16'; then \
                echo "Rebuilding the pot file"; \
-               xgettext $(POTFILES) -o ikiwiki.pot -Lperl --add-comments=translators; \
+               xgettext --from-code=UTF-8 $(POTFILES) -o ikiwiki.pot -Lperl --add-comments=translators; \
        fi
 
 clean:
-       rm -f $(MOFILES) messages messages.mo
+       rm -f $(MOFILES) messages messages.mo *_stamp
+       rm -rf html underlays/.ikiwiki $(TRANSLATED_UNDERLAYS)
+       find underlays -name \*.mdwn -or -name \*.pot | xargs rm -f
 
 %.mo: %.po
-       msgfmt -o $@ $<
+       @if ! msgfmt -o $@ $<; then echo "unable to run msgfmt"; fi
 
-%.po:
+%.po: ikiwiki.pot
        @echo -n "Merging ikiwiki.pot and $@"
-       @msgmerge $@ ikiwiki.pot -o $@.new 2>&1
-# Typically all that changes was a date or line number. I'd prefer not to
+# Typically all that changes is a date or line number. I'd prefer not to
 # commit such changes, so detect and ignore them.
-       @if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \
-               mv -f $@.new $@; \
+       @if ! msgmerge $@ ikiwiki.pot -o $@.new 2>&1; then \
+               echo "unable to run msgmerge"; \
        else \
-               rm -f $@.new; \
+               if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \
+                       mv -f $@.new $@; \
+               else \
+                       rm -f $@.new; \
+               fi; \
+               msgfmt --statistics $@ 2>&1; \
        fi
-       @msgfmt --statistics $@ 2>&1
 
 check:
        @for file in $(POFILES); do \
@@ -46,3 +64,34 @@ check:
                printf "$$lang: "; \
                msgfmt -o /dev/null -c -v --statistics $$lang.po;\
        done
+
+underlays_copy_stamp:
+       # copy all the files we want to translate into a srcdir
+       for file in `cd ..; find underlays -follow -name \*.mdwn`; do \
+               install -d $$(dirname $$file); \
+               cp -aL ../$$file $$file 2>/dev/null || \
+               install -m 644 ../$$file $$file; \
+       done
+       install -d underlays/directives/ikiwiki/directive
+       for file in `cd ..; find doc/ikiwiki/directive/ -maxdepth 1 -type f`; do \
+               cp -a ../$$file underlays/directives/ikiwiki/directive ||  \
+               install -m 644 ../$$file underlays/directives/ikiwiki/directive; \
+       done
+       install -d underlays/empty
+       touch $@
+
+underlays: ../ikiwiki.out underlays_copy_stamp
+       ../ikiwiki.out --libdir .. --setup underlay.setup --refresh
+
+../ikiwiki.out: ../Makefile
+       $(MAKE) -C .. ikiwiki.out
+
+../Makefile: ../Makefile.PL
+       cd .. && ./Makefile.PL
+
+$(TRANSLATED_UNDERLAYS): po2wiki_stamp
+po2wiki_stamp: po2wiki underlays_copy_stamp
+       PERL5LIB=.. ./po2wiki underlay.setup
+       touch $@
+
+.PHONY: underlays