[taler-anastasis-www] branch master updated: use i18n logic from site generator

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository anastasis-www.

The following commit(s) were added to refs/heads/master by this push:
     new df3a1a4  use i18n logic from site generator
df3a1a4 is described below

commit df3a1a453a4e234d633a15fc9311eda7a9fe16f2
Author: Florian Dold <florian@dold.me>
AuthorDate: Fri May 7 18:06:38 2021 +0200

    use i18n logic from site generator
---
 Makefile                  | 35 +++--------------------------------
 build-system/configure.py |  6 +++---
 inc                       |  2 +-
 locale/messages.pot       |  2 +-
 4 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/Makefile b/Makefile
index a348dce..3b89192 100644
--- a/Makefile
+++ b/Makefile
@@ -2,40 +2,11 @@
 
 include build-system/config.mk
 
-# List of all supported languages, add new languages here!
-LANGUAGES="de en es fr it pt ru"
-
 # All: build HTML pages in all languages and compile the
 .PHONY: all
-all: locale template
-       env BASEURL=$(opt_baseurl) ./inc/make_site.py
-
-# Extract translateable strings from jinja2 templates.
-locale/messages.pot: template/*.j2 template/news/*.j2 common/*.j2 
common/*.j2.inc
-       env PYTHONPATH=$$PWD/inc:$$PYTHONPATH $(pybabel) extract -F 
locale/babel.map -o locale/messages.pot .
-
-# Update translation (.po) files with new strings.
-.PHONY: locale-update
-locale-update: locale/messages.pot
-       for lang in `echo $(LANGUAGES)`; do \
-               $(msgmerge) -q -U -m --previous 
locale/$$lang/LC_MESSAGES/messages.po locale/messages.pot ; \
-       done
-       if $(grep) -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then \
-               $(echo) -e "\nERROR: Conflicts encountered in PO files.\n"; \
-               exit 1; \
-       fi
-
-# Compile translation files for use.
-.PHONY: locale-compile
-locale-compile:
-       for lang in `echo $(LANGUAGES)`; do \
-               echo compiling $$lang; \
-               $(pybabel) -q compile -d locale -l $$lang --use-fuzzy ; \
-       done
-
-# Process everything related to gettext translations.
-.PHONY: locale
-locale: locale-update locale-compile
+all:
+       ./inc/update-messages
+       env "BASEURL=$(opt_baseurl)" ./inc/build-site
 
 .PHONY: run
 run: all
diff --git a/build-system/configure.py b/build-system/configure.py
index dd7b18e..fe792dd 100755
--- a/build-system/configure.py
+++ b/build-system/configure.py
@@ -7,9 +7,9 @@ b = BuildConfig()
 b.enable_prefix()
 b.enable_configmk()
 
-# Base URL for the site.  Per default, the URL is the protocol-relative
-# root path.
-b.use(Option("baseurl", "Base URL that the site will run on", default="//", 
required=False))
+# Base URL override for the site.
+# If not set, use value from www.yml
+b.use(Option("baseurl", "Override base URL that the site will run on", 
default="", required=False))
 
 b.add_tool(PythonTool())
 b.add_tool(PyBabelTool())
diff --git a/inc b/inc
index 20d3bab..32efd06 160000
--- a/inc
+++ b/inc
@@ -1 +1 @@
-Subproject commit 20d3bab14bc313c3b383f5b447d5d07029400b12
+Subproject commit 32efd06d974ba447d631363a62c4e551c44a17d3
diff --git a/locale/messages.pot b/locale/messages.pot
index 5863a52..2b4c0b3 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-07 14:38+0200\n"
+"POT-Creation-Date: 2021-05-07 18:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.