loleaflet/Makefile.am |  167 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 154 insertions(+), 13 deletions(-)

New commits:
commit 59241a2ea467992adadbacae00a15ec7fe0de2d9
Author:     Henry Castro <[email protected]>
AuthorDate: Tue Mar 5 17:59:38 2019 -0400
Commit:     Henry Castro <[email protected]>
CommitDate: Tue Mar 5 18:09:24 2019 -0400

    configure:L10n: compile message catalog to binary format
    
    Change-Id: Ia5170a70b80996623260578ece71c63db6510a25

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 7f90ca147..e220dbd62 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -1,11 +1,142 @@
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
 
-L10N_PO = $(wildcard $(srcdir)/po/*.po)
-
-if !ENABLE_MOBILEAPP
-L10N_JSON = $(patsubst 
$(srcdir)/po/%.po,$(builddir)/dist/l10n/%.json,$(L10N_PO))
-endif
+LANGUAGES = \
+       ab \
+       af \
+       am \
+       an \
+       anp \
+       ar \
+       as \
+       ast \
+       az \
+       bar \
+       be \
+       bg \
+       bm \
+       bn_IN \
+       bn \
+       bo \
+       br \
+       brx \
+       bs \
+       ca \
+       ca-valencia \
+       ce \
+       cs \
+       cy \
+       da \
+       de \
+       dgo \
+       dsb \
+       dz \
+       el \
+       en_AU \
+       en_GB \
+       en_ZA \
+       eo \
+       es \
+       et \
+       eu \
+       fa \
+       fi \
+       fr \
+       fur \
+       fy \
+       ga \
+       gbm \
+       gd \
+       gl \
+       gug \
+       gu \
+       he \
+       hi \
+       hr \
+       hsb \
+       hu \
+       hy \
+       id \
+       is \
+       it \
+       ja \
+       jv \
+       kab \
+       ka \
+       kk \
+       kl \
+       km \
+       kmr-Latn \
+       kn \
+       kok \
+       ko \
+       ks \
+       ky \
+       lb \
+       lo \
+       lt \
+       lv \
+       mai \
+       mk \
+       ml \
+       mni \
+       ml \
+       mr \
+       mt \
+       my \
+       nah \
+       nb \
+       ne \
+       nl \
+       nn \
+       nqo \
+       nr \
+       nso \
+       oc \
+       om \
+       or \
+       pa_IN \
+       pap_CW \
+       pl \
+       pt_BR \
+       pt \
+       ro \
+       ru \
+       rw \
+       sah \
+       sa_IN \
+       sat \
+       sd \
+       sid \
+       si \
+       sk \
+       sl \
+       sq \
+       ss \
+       st \
+       sv \
+       sw_TZ \
+       ta \
+       te \
+       tg \
+       th \
+       ti \
+       tn \
+       tr \
+       ts \
+       tt \
+       ug \
+       uk \
+       ur \
+       uz \
+       vec \
+       ve \
+       vi \
+       wo \
+       xh \
+       zh_CN \
+       zh_TW \
+       zu
 
 if ENABLE_IOSAPP
 L10N_IOS_ALL_JS = $(builddir)/dist/l10n-all.js
@@ -53,6 +184,11 @@ LOLEAFLET_ADMIN_SRC = $(shell find $(srcdir)/admin -name 
'*.html')
 LOLEAFLET_ADMIN_ALL = $(shell find $(srcdir)/admin -name '*')
 LOLEAFLET_ADMIN_DST = $(patsubst 
$(srcdir)/admin/%,$(builddir)/dist/admin/%,$(LOLEAFLET_ADMIN_SRC))
 
+define lang_target
+$(1):: $(2)
+
+endef
+
 define file_target
 $(1): $(2)
        @if test -z '$(ENABLE_BROWSERSYNC)'; then \
@@ -94,8 +230,15 @@ LOLEAFLET_CSS =\
 
 LOLEAFLET_CSS_DST = $(foreach file,$(LOLEAFLET_CSS),$(builddir)/dist/$(notdir 
$(file)))
 LOLEAFLET_CSS_M4 = $(strip $(foreach file,$(LOLEAFLET_CSS),$(notdir $(file))))
+LOLEAFLET_MO_DST = $(foreach 
lang,$(LANGUAGES),$(top_builddir)/locale/$(lang)/LC_MESSAGES/loolwsd.mo)
 
 $(eval $(call file_targets,$(LOLEAFLET_CSS)))
+$(eval $(foreach lang,$(LANGUAGES), \
+               $(call 
lang_target,$(top_builddir)/locale/$(lang)/LC_MESSAGES/loolwsd.mo, \
+                       $(srcdir)/po/help-$(lang).po $(srcdir)/po/ui-$(lang).po 
\
+               ) \
+       ) \
+)
 
 NODE_MODULES_JS =\
        node_modules/hammerjs/hammer.min.js \
@@ -153,8 +296,8 @@ if !ENABLE_MOBILEAPP
 ADMIN_BUNDLE = $(builddir)/dist/admin-bundle.js
 endif
 
-build-loleaflet: | $(LOLEAFLET_L10N_DST) \
-       $(L10N_JSON) \
+build-loleaflet: | \
+       $(LOLEAFLET_MO_DST) \
        $(LOLEAFLET_IMAGES_DST) \
        $(JQUERY_LIGHTNESS_DIST_IMAGES) \
        $(JQUERY_MINIFIED_DIST_IMAGES) \
@@ -336,13 +479,10 @@ $(builddir)/dist/images/%.png: 
$(JQUERY_MINIFIED_IMAGE_PATH)/%.png
        @mkdir -p $(dir $@)
        @cp $< $@
 
-$(builddir)/dist/l10n/%.json: $(srcdir)/l10n/%.json
+$(top_builddir)/locale/%/LC_MESSAGES/loolwsd.mo: $(srcdir)/po/help-%.po 
$(srcdir)/po/ui-%.po
+       @echo "INFO: compiling message catalog $@"
        @mkdir -p $(dir $@)
-if ENABLE_DEBUG
-       @cp $< $@
-else
-       @tr -d '[:space:]' <$<  >$@
-endif
+       @$(MSGCAT) $^ | $(MSGFMT) -o $@ -
 
 $(builddir)/dist/l10n/%.json: $(srcdir)/po/%.po
        @$(srcdir)/util/po2json.py $< -o $@
@@ -390,6 +530,7 @@ l10n: pot
 clean-local:
        rm -rf node_modules
        rm -rf $(builddir)/dist
+       rm -rf $(top_builddir)/locale
        rm -rf $(builddir)/build/dist
 
 spec/data/load-test:
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to