gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-www] branch stable updated: restructure


From: gnunet
Subject: [taler-www] branch stable updated: restructure
Date: Thu, 06 May 2021 19:07:05 +0200

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

dold pushed a commit to branch stable
in repository www.

The following commit(s) were added to refs/heads/stable by this push:
     new 7199342  restructure
7199342 is described below

commit 719934275f3c55e958f48ea165280542b49b8f0b
Author: Florian Dold <florian@dold.me>
AuthorDate: Thu May 6 19:06:56 2021 +0200

    restructure
---
 INSTALL                                            |   8 ++--
 Makefile                                           |  37 +---------------
 README                                             |  13 ++----
 inc                                                |   2 +-
 locale/ar/LC_MESSAGES/messages.po                  |  35 +++++++--------
 locale/de/LC_MESSAGES/messages.po                  |  35 +++++++--------
 locale/en/LC_MESSAGES/messages.po                  |  31 ++++++-------
 locale/es/LC_MESSAGES/messages.po                  |  35 +++++++--------
 locale/fr/LC_MESSAGES/messages.po                  |  35 +++++++--------
 locale/hi/LC_MESSAGES/messages.po                  |  31 ++++++-------
 locale/it/LC_MESSAGES/messages.po                  |  35 +++++++--------
 locale/ja/LC_MESSAGES/messages.po                  |  31 ++++++-------
 locale/ko/LC_MESSAGES/messages.po                  |  31 ++++++-------
 locale/messages.pot                                |  29 +++++++------
 locale/pt/LC_MESSAGES/messages.po                  |  35 +++++++--------
 locale/pt_BR/LC_MESSAGES/messages.po               |  41 +++++++++---------
 locale/ru/LC_MESSAGES/messages.po                  |  31 ++++++-------
 locale/sv/LC_MESSAGES/messages.po                  |  35 +++++++--------
 locale/tr/LC_MESSAGES/messages.po                  |  35 +++++++--------
 locale/zh_Hant/LC_MESSAGES/messages.po             |  33 +++++++-------
 make_site.py                                       |  22 +++-------
 {.well-known => static/.well-known}/security.txt   |   0
 .../dist}/bootstrap@4.6.0/bootstrap.bundle.min.js  |   0
 .../bootstrap@4.6.0/bootstrap.bundle.min.js.map    |   0
 .../dist}/bootstrap@4.6.0/bootstrap.min.css        |   0
 .../dist}/bootstrap@4.6.0/bootstrap.min.css.map    |   0
 .../dist}/bootstrap@4.6.0/jquery-3.5.1.slim.min.js |   0
 {icons => static/icons}/buildbot.svg               |   0
 {icons => static/icons}/icon-api.svg               |   0
 {icons => static/icons}/icon-backend.svg           |   0
 {icons => static/icons}/icon-backoffice.svg        |   0
 {icons => static/icons}/icon-bank.svg              |   0
 {icons => static/icons}/icon-cashier.svg           |   0
 {icons => static/icons}/icon-code.svg              |   0
 {icons => static/icons}/icon-developers.svg        |   0
 {icons => static/icons}/icon-exchange.svg          |   0
 {icons => static/icons}/icon-lcov.svg              |   0
 {icons => static/icons}/icon-market.svg            |   0
 {icons => static/icons}/icon-share.svg             |   0
 {icons => static/icons}/icon-wallet.svg            |   0
 {images => static/images}/1-libre.png              | Bin
 {images => static/images}/1-libre.svg              |   0
 {images => static/images}/2-buyer-privacy.png      | Bin
 {images => static/images}/2-buyer-privacy.svg      |   0
 {images => static/images}/3-taxable.png            | Bin
 {images => static/images}/3-taxable.svg            |   0
 {images => static/images}/4-fraud.png              | Bin
 {images => static/images}/4-fraud.svg              |   0
 {images => static/images}/5-data-minimization.png  | Bin
 {images => static/images}/5-data-minimization.svg  |   0
 {images => static/images}/6-usable.png             | Bin
 {images => static/images}/6-usable.svg             |   0
 {images => static/images}/7-efficient.png          | Bin
 {images => static/images}/7-efficient.svg          |   0
 {images => static/images}/8-fault-tolerant.png     | Bin
 {images => static/images}/8-fault-tolerant.svg     |   0
 {images => static/images}/9-competition.png        | Bin
 {images => static/images}/9-competition.svg        |   0
 {images => static/images}/UseCaseDiagram.png       | Bin
 {images => static/images}/anonymous.jpg            | Bin
 {images => static/images}/anonymous.medium.jpg     | Bin
 {images => static/images}/anonymous.png            | Bin
 {images => static/images}/backend.svg              |   0
 {images => static/images}/buy.jpg                  | Bin
 {images => static/images}/buy.medium.jpg           | Bin
 {images => static/images}/ccby.png                 | Bin
 {images => static/images}/checkmark.png            | Bin
 {images => static/images}/citizen.svg              |   0
 {images => static/images}/de.png                   | Bin
 {images => static/images}/dependencies.dot         |   0
 {images => static/images}/diagram-complex.png      | Bin
 {images => static/images}/diagram-simple.png       | Bin
 {images => static/images}/efficient.png            | Bin
 {images => static/images}/en.png                   | Bin
 {images => static/images}/es.png                   | Bin
 {images => static/images}/fossa2014.png            | Bin
 {images => static/images}/fr.png                   | Bin
 {images => static/images}/fraud.jpg                | Bin
 {images => static/images}/fraud.medium.jpg         | Bin
 {images => static/images}/gb.png                   | Bin
 {images => static/images}/gdpr.jpg                 | Bin
 {images => static/images}/gdpr.medium.jpg          | Bin
 {images => static/images}/home.png                 | Bin
 {images => static/images}/html.svg                 |   0
 {images => static/images}/it.png                   | Bin
 {images => static/images}/languageicon.svg         |   0
 {images => static/images}/life-safer.jpg           | Bin
 {images => static/images}/life-safer.medium.jpg    | Bin
 {images => static/images}/logo-2017.es.svg         |   0
 {images => static/images}/logo-2017.fr.svg         |   0
 {images => static/images}/logo-2017.svg            |   0
 {images => static/images}/logo-2018-dold.raw.svg   |   0
 {images => static/images}/logo-2018-dold.svg       |   0
 {images => static/images}/logo-2020.jpg            | Bin
 {images => static/images}/logo-2021.svg            |   0
 {images => static/images}/logo-julian.png          | Bin
 {images => static/images}/market.medium.jpg        | Bin
 {images => static/images}/money-laundering.jpg     | Bin
 .../images}/money-laundering.medium.jpg            | Bin
 {images => static/images}/pdf.svg                  |   0
 {images => static/images}/product.png              | Bin
 {images => static/images}/shipment.png             | Bin
 {images => static/images}/stallman.medium.png      | Bin
 {images => static/images}/stock1.jpg               | Bin
 {images => static/images}/stock1s.jpg              | Bin
 {images => static/images}/taler-arch-full.svg      |   0
 .../papers}/bellare_blindsigs_proof.pdf            | Bin
 {papers => static/papers}/cbdc2021en.pdf           | Bin
 .../papers}/chaum-blind-signatures.pdf             | Bin
 .../papers}/codeblau-report-2020-q2.pdf            | Bin
 .../papers}/codeblau-response-2020-q2.pdf          | Bin
 .../papers}/euro-bearer-online-2021.pdf            | Bin
 {papers => static/papers}/jfk2020thesis.pdf        | Bin
 {papers => static/papers}/taler2016space.pdf       | Bin
 .../papers}/thesis-anastasis-2020.pdf              | Bin
 {papers => static/papers}/thesis-dold-phd-2019.pdf | Bin
 {papers => static/papers}/thesis-wenger-2020.pdf   | Bin
 {pdf => static/pdf}/copyright.pdf                  | Bin
 {pdf => static/pdf}/flyer2017.pdf                  | Bin
 .../presentations}/investors2018.pdf               | Bin
 {presentations => static/presentations}/tech.pdf   | Bin
 .../financial-news}/2013-09-15.inc                 |   0
 .../financial-news}/2014-09-10.inc                 |   0
 .../financial-news}/2014-11-13.inc                 |   0
 .../financial-news}/2014-12-05.inc                 |   0
 .../financial-news}/2014-12-06.inc                 |   0
 .../financial-news}/2015-03-17.inc                 |   0
 .../financial-news}/2015-04-30.inc                 |   0
 .../financial-news}/2015-12-22.inc                 |   0
 .../financial-news}/2016-07-23.inc                 |   0
 .../financial-news}/2016-10-15.inc                 |   0
 .../financial-news}/2016-10-21.inc                 |   0
 .../financial-news}/2016-10-24.inc                 |   0
 .../financial-news}/2016-10-26.inc                 |   0
 .../financial-news}/2017-04-03.inc                 |   0
 .../financial-news}/2017-04-04.inc                 |   0
 .../financial-news}/2017-07-20.inc                 |   0
 template/rss.xml.j2                                |  48 +++++++++++++++++++++
 www.yml                                            |   2 +-
 139 files changed, 341 insertions(+), 329 deletions(-)

diff --git a/INSTALL b/INSTALL
index a5c3bd7..45dadf7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ For Debian:
 
 Simply install:
 
-# apt-install python3-ruamel.yaml python3-jinja2 python3-babel git 
node-typescript
+# apt-install python3-ruamel.yaml python3-jinja2 python3-babel git
 
 Then invoke "bootstrap" and "configure". You must pass
 "--prefix=$P" and "--variant=$V" for some values of
@@ -24,12 +24,10 @@ Adjust the values in config.mk:
        PYTHON=python3.7
        BABEL=pybabel-3.7
 
-npm install typescript
-Add the node_module's bin to your $PATH for the typescript binary.
 make submodules/init
 make submodules/update
 make
 
-If you installed typescript in $HOME:
-PATH=$HOME/node_modules/.bin/:$PATH env BROWSER=firefox make run
+Use
+env BROWSER=firefox make run
 to run the website
diff --git a/Makefile b/Makefile
index 5b00c06..bf6d127 100644
--- a/Makefile
+++ b/Makefile
@@ -8,34 +8,10 @@ LANGUAGES="en ar zh_Hant fr de hi it ja ko pt pt_BR ru es sv 
tr"
 # All: build HTML pages in all languages and compile the
 .PHONY: all
 all: locale template
-       $(cp) rendered/static/javascript.html rendered/javascript.html
-       $(cp) rendered/static/robots.txt rendered/robots.txt
-       $(cp) rendered/static/robots.txt rendered/dist/robots.txt
-       for lang in `echo $(LANGUAGES)` ; do \
-               $(cp) rendered/static/robots.txt rendered/$$lang/robots.txt; \
-       done
-       $(python) inc/make_sitemap.py -i rendered
-       $(cp) sitemap.xml rendered/sitemap.xml
-       $(cp) sitemap.xml rendered/en/sitemap.xml
-       for lang in `echo $(LANGUAGES)` ; do \
-               $(cp) rendered/sitemap.xml rendered/$$lang ; \
-       done
-       $(cp) -R images rendered/static/
-       for lang in `echo $(LANGUAGES)` ; \
-               do $(cp) -R images rendered/$$lang ; \
-       done
-       cd rendered; \
-               for lang in `echo $(LANGUAGES)`; do \
-               $(cp) $$lang/rss.xml $$lang/news/rss.xml; \
-       done
-       for d in dist icons papers presentations ; do \
-               $(cp) -R $$d rendered/ ; \
-       done
-       $(cp) -R pdf rendered/static/
-       $(mkdir) -p rendered/.well-known ; $(cp) .well-known/security.txt 
rendered/.well-known/
+       env BASEURL=$(opt_baseurl) ./make_site.py
 
 # Extract translateable strings from jinja2 templates.
-locale/messages.pot: template/*.j2 common/*.j2 common/*.j2.inc
+locale/messages.pot: template/*.j2 template/news/*.j2 common/*.j2 
common/*.j2.inc
        $(python) inc/mybabel.py $(pybabel) extract -F locale/babel.map -o 
locale/messages.pot .
 
 # Update translation (.po) files with new strings.
@@ -61,11 +37,6 @@ locale-compile:
 .PHONY: locale
 locale: locale-update locale-compile
 
-# Run the jinja2 templating engine to expand templates to HTML
-# incorporating translations.
-template: locale-compile
-       env BASEURL=$(opt_baseurl) ./make_site.py
-
 .PHONY: run
 run: all
        $(browser) http://0.0.0.0:8000/rendered/en &
@@ -83,10 +54,6 @@ install: all
        $(cp) -r rendered/* $(prefix)/$(variant)/
        $(cp) -r rendered/.well-known/ $(prefix)/$(variant)/
 
-.PHONY: uninstall
-uninstall:
-       $(rm) -rf $(prefix)/$(variant)
-
 .PHONY: clean
 clean:
        $(rm) -rf __pycache__ *.pyc  *~ \.*~ \#*\#
diff --git a/README b/README
index 8483d24..56594ba 100644
--- a/README
+++ b/README
@@ -20,21 +20,16 @@ locale/
   The translations of the strings into the various languages are in the
   locale/ directory.
 
+static/
+  This directory contains static resources that are language-independent.
 
-dist/
+static/dist/
   This directory contains JavaScript from other projects which we redistribute,
   such as bootstrap and jquery.
 
-
-static/
-  This directory contains static resources that are language-independent
-  and never change.
-
-
-news/ and financial-news/
+template/news/ and template/financial-news/
   This directory contains news items to be posted on the news page.
 
-
 inc/
   This directory contains various Python scripts that are included during
   the pre-processing with Jinja2.
diff --git a/inc b/inc
index d92f6d3..4e83d96 160000
--- a/inc
+++ b/inc
@@ -1 +1 @@
-Subproject commit d92f6d37ed9fc605b517aafe614618369209a665
+Subproject commit 4e83d962573f95f1bc82440c983638aeeda69e98
diff --git a/locale/ar/LC_MESSAGES/messages.po 
b/locale/ar/LC_MESSAGES/messages.po
index 6594ba2..00caabe 100644
--- a/locale/ar/LC_MESSAGES/messages.po
+++ b/locale/ar/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-03-27 17:24+0000\n"
 "Last-Translator: Maisa I <maisa.translator@gmail.com>\n"
 "Language-Team: Arabic <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -85,25 +85,11 @@ msgstr "المزايا"
 msgid "Principles"
 msgstr "المبادئ"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr "الأخبار"
 
-#: news/index.html.j2:11
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr ""
-"منشورات إخبارية عن التغييرات المتعلقة بنظام GNU Taler مثل الإصدارات "
-"والفعاليات"
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr "اشترك في نشرتنا الإخبارية RSS"
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr "اقرأ المزيد"
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "بنية نظام Taler"
@@ -1566,3 +1552,18 @@ msgstr "متصفحات أخرى"
 #: template/wallet.html.j2:261
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr "ستُفر محافظ للمتصفحات الأخرى في المستقبل القريب."
+
+#: template/news/index.html.j2:11
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr ""
+"منشورات إخبارية عن التغييرات المتعلقة بنظام GNU Taler مثل الإصدارات "
+"والفعاليات"
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr "اشترك في نشرتنا الإخبارية RSS"
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr "اقرأ المزيد"
diff --git a/locale/de/LC_MESSAGES/messages.po 
b/locale/de/LC_MESSAGES/messages.po
index b576ee8..84426f4 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: German (Taler Website)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-03-28 11:27+0000\n"
 "Last-Translator: Stefan <eintritt@hotmail.com>\n"
 "Language-Team: German <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -78,25 +78,11 @@ msgstr "Besonderheiten"
 msgid "Principles"
 msgstr "Prinzipien"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr "Aktuelles"
 
-#: news/index.html.j2:11
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr ""
-"Nachrichtenbeiträge zu Änderungen, die GNU Taler betreffen, wie neue "
-"Versionen und Veranstaltungen"
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr "Abonniere unseren RSS-Feed"
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr "weiterlesen"
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Die Systemarchitektur von Taler"
@@ -1832,6 +1818,21 @@ msgstr "Andere Browser"
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr "Wallets für andere Browser werden zukünftig bereitgestellt."
 
+#: template/news/index.html.j2:11
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr ""
+"Nachrichtenbeiträge zu Änderungen, die GNU Taler betreffen, wie neue "
+"Versionen und Veranstaltungen"
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr "Abonniere unseren RSS-Feed"
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr "weiterlesen"
+
 #~ msgid ""
 #~ "GNU Taler must enable a diverse set of operators, breaking up the current "
 #~ "system where only a few global companies dominate the market."
diff --git a/locale/en/LC_MESSAGES/messages.po 
b/locale/en/LC_MESSAGES/messages.po
index ad55732..5c43351 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -71,23 +71,11 @@ msgstr ""
 msgid "Principles"
 msgstr ""
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr ""
 
-#: news/index.html.j2:11
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr ""
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr ""
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr ""
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr ""
@@ -1273,3 +1261,16 @@ msgstr ""
 #: template/wallet.html.j2:261
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr ""
+
+#: template/news/index.html.j2:11
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr ""
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr ""
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po 
b/locale/es/LC_MESSAGES/messages.po
index db6b875..05ac26c 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-03-13 00:32+0000\n"
 "Last-Translator: Francesca Giusti <francescag1194@gmail.com>\n"
 "Language-Team: Spanish <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -80,25 +80,11 @@ msgstr "Funcionalidades"
 msgid "Principles"
 msgstr "Principios"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr "Noticias"
 
-#: news/index.html.j2:11
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr ""
-"Nuevas publicaciones sobre cambios relacionados con GNU Taler como versiones "
-"y eventos"
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr "suscribirse a nuestro RSS"
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr "leer más"
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Arquitectura del sistema Taler"
@@ -1638,6 +1624,21 @@ msgstr "Otros navegadores"
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr "Carteras para otros navegadores serán provistas en un futuro próximo."
 
+#: template/news/index.html.j2:11
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr ""
+"Nuevas publicaciones sobre cambios relacionados con GNU Taler como versiones "
+"y eventos"
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr "suscribirse a nuestro RSS"
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr "leer más"
+
 #~ msgid ""
 #~ "GNU Taler must enable a diverse set of operators, breaking up the current "
 #~ "system where only a few global companies dominate the market."
diff --git a/locale/fr/LC_MESSAGES/messages.po 
b/locale/fr/LC_MESSAGES/messages.po
index b56de64..b92e06d 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: French (Taler Website)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-03-28 20:54+0000\n"
 "Last-Translator: Edhyne Dablé <edhyne.dable@gmail.com>\n"
 "Language-Team: French <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -78,25 +78,11 @@ msgstr "Fonctionnalités"
 msgid "Principles"
 msgstr "Principes"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr "Actualité"
 
-#: news/index.html.j2:11
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr ""
-"Articles d'actualité à propos des changements concernant GNU Taler, tels les "
-"annonces de nouvelles versions ou d'événements"
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr "s'abonner à notre flux RSS"
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr "lire la suite"
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Architecture du système Taler"
@@ -1665,6 +1651,21 @@ msgstr ""
 "Les porte-monnaies pour d'autres navigateurs seront rendus disponibles dès "
 "que possible."
 
+#: template/news/index.html.j2:11
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr ""
+"Articles d'actualité à propos des changements concernant GNU Taler, tels les "
+"annonces de nouvelles versions ou d'événements"
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr "s'abonner à notre flux RSS"
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr "lire la suite"
+
 #~ msgid ""
 #~ "GNU Taler must enable a diverse set of operators, breaking up the current "
 #~ "system where only a few global companies dominate the market."
diff --git a/locale/hi/LC_MESSAGES/messages.po 
b/locale/hi/LC_MESSAGES/messages.po
index 0f8fa57..b26c259 100644
--- a/locale/hi/LC_MESSAGES/messages.po
+++ b/locale/hi/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-04-12 05:50+0000\n"
 "Last-Translator: Jigisha Sharma <jigishas38@gmail.com>\n"
 "Language-Team: Hindi <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -84,23 +84,11 @@ msgstr "विशेषताएँ"
 msgid "Principles"
 msgstr "सिद्धांत"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr "ख़बर"
 
-#: news/index.html.j2:11
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr "GNU टेलर से संबंधित परिवर्तनों के बारे में समाचार पोस्ट करता है जैसे 
कि रिलीज़ और ईवेंट"
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr "हमारी आरएसएस फीड को सब्सक्राइब करें"
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr "और पढ़ें..."
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "संचार तंत्र संरचना , जो मुक्त तंत्र संरचना से संबंधित ISO मानक समूहों 
का पालन करता है"
@@ -1349,3 +1337,16 @@ msgstr ""
 #, fuzzy
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr "निकट भविष्य में अन्य ब्राउज़रों के लिए वॉलेट प्रदान किए जाएंगे।"
+
+#: template/news/index.html.j2:11
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr "GNU टेलर से संबंधित परिवर्तनों के बारे में समाचार पोस्ट करता है जैसे 
कि रिलीज़ और ईवेंट"
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr "हमारी आरएसएस फीड को सब्सक्राइब करें"
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr "और पढ़ें..."
diff --git a/locale/it/LC_MESSAGES/messages.po 
b/locale/it/LC_MESSAGES/messages.po
index c8bdbee..dfe716f 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-03-26 05:47+0000\n"
 "Last-Translator: Francesca Giusti <francescag1194@gmail.com>\n"
 "Language-Team: Italian <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -79,25 +79,11 @@ msgstr "Funzioni"
 msgid "Principles"
 msgstr "Principi"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr "Novità"
 
-#: news/index.html.j2:11
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr ""
-"Post di notizie relative alle modifiche di GNU Taler come pubblicazioni ed "
-"eventi"
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr "Abbonati ai nostri RSS feed"
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr "Leggi di più"
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Architettura del sistema Taler"
@@ -1639,3 +1625,18 @@ msgstr "Altri browser"
 #: template/wallet.html.j2:261
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr "I wallet per altri browser saranno forniti nel prossimo futuro."
+
+#: template/news/index.html.j2:11
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr ""
+"Post di notizie relative alle modifiche di GNU Taler come pubblicazioni ed "
+"eventi"
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr "Abbonati ai nostri RSS feed"
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr "Leggi di più"
diff --git a/locale/ja/LC_MESSAGES/messages.po 
b/locale/ja/LC_MESSAGES/messages.po
index 9dd5f5a..26535bc 100644
--- a/locale/ja/LC_MESSAGES/messages.po
+++ b/locale/ja/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-03-15 12:34+0000\n"
 "Last-Translator: Miyuki Komatsu <miykom@gmail.com>\n"
 "Language-Team: Japanese <http://weblate.taler.net/projects/gnu-taler/main-";
@@ -84,23 +84,11 @@ msgstr "機能"
 msgid "Principles"
 msgstr "行動規範"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr "ニュース"
 
-#: news/index.html.j2:11
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr "GNU Talerの変更に関するお知らせ"
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr "RSSフィードを購読する"
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr "続きを読む"
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Taler システム設計"
@@ -1589,6 +1577,19 @@ msgstr "他のブラウザ"
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr "他のブラウザ用ウォレットは開発中です。"
 
+#: template/news/index.html.j2:11
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr "GNU Talerの変更に関するお知らせ"
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr "RSSフィードを購読する"
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr "続きを読む"
+
 #~ msgid "Download"
 #~ msgstr "取得"
 
diff --git a/locale/ko/LC_MESSAGES/messages.po 
b/locale/ko/LC_MESSAGES/messages.po
index 9b3d295..aec9d31 100644
--- a/locale/ko/LC_MESSAGES/messages.po
+++ b/locale/ko/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-03-20 15:15+0000\n"
 "Last-Translator: Choyi Whang <choyi.whang@gmail.com>\n"
 "Language-Team: Korean <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -86,23 +86,11 @@ msgstr "기능"
 msgid "Principles"
 msgstr "원칙"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr "뉴스"
 
-#: news/index.html.j2:11
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr "GNU 탈러 관련 변경 사항에 대한 뉴스기사 (출시, 행사 등)"
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr "RSS 피드 구독"
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr "더 읽기"
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "탈러(Taler) 시스템 구성"
@@ -1554,6 +1542,19 @@ msgstr "타 브라우저"
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr "다른 브라우저를 위한 지갑은 머지않아 제공될 예정입니다."
 
+#: template/news/index.html.j2:11
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr "GNU 탈러 관련 변경 사항에 대한 뉴스기사 (출시, 행사 등)"
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr "RSS 피드 구독"
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr "더 읽기"
+
 #~ msgid ""
 #~ "GNU Taler must enable a diverse set of operators, breaking up the current "
 #~ "system where only a few global companies dominate the market."
diff --git a/locale/messages.pot b/locale/messages.pot
index 98b40b2..feb908f 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-04 22:45+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+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"
@@ -75,22 +75,11 @@ msgstr ""
 msgid "Principles"
 msgstr ""
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr ""
 
-#: news/index.html.j2:11
-msgid "News posts about changes related to GNU Taler such as releases and 
events"
-msgstr ""
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr ""
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr ""
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr ""
@@ -1290,3 +1279,15 @@ msgstr ""
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr ""
 
+#: template/news/index.html.j2:11
+msgid "News posts about changes related to GNU Taler such as releases and 
events"
+msgstr ""
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr ""
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr ""
+
diff --git a/locale/pt/LC_MESSAGES/messages.po 
b/locale/pt/LC_MESSAGES/messages.po
index bcd8c16..3b2db8d 100644
--- a/locale/pt/LC_MESSAGES/messages.po
+++ b/locale/pt/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU taler master\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-03-25 09:18+0000\n"
 "Last-Translator: Stefan <eintritt@hotmail.com>\n"
 "Language-Team: Portuguese <http://weblate.taler.net/projects/gnu-taler/main-";
@@ -83,25 +83,11 @@ msgstr "Funcionalidades"
 msgid "Principles"
 msgstr "Princípios"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr "Notícias"
 
-#: news/index.html.j2:11
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr ""
-"Publicações de notícias acerca de mudanças ao GNU Taler, como versões, e "
-"eventos"
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr "subscreva ao nosso feed RSS"
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr "ler mais"
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Arquitetura de Sistema da Taler"
@@ -1342,3 +1328,18 @@ msgstr ""
 #: template/wallet.html.j2:261
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr ""
+
+#: template/news/index.html.j2:11
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr ""
+"Publicações de notícias acerca de mudanças ao GNU Taler, como versões, e "
+"eventos"
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr "subscreva ao nosso feed RSS"
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr "ler mais"
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po 
b/locale/pt_BR/LC_MESSAGES/messages.po
index 7bd9874..da26a94 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-03-25 09:18+0000\n"
 "Last-Translator: Stefan <eintritt@hotmail.com>\n"
 "Language-Team: Portuguese (Brazil) <http://weblate.taler.net/projects/gnu-";
@@ -93,29 +93,12 @@ msgstr "Recursos"
 msgid "Principles"
 msgstr "Princípios"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 #, fuzzy
 msgid "News"
 msgstr "Novidades"
 
-#: news/index.html.j2:11
-#, fuzzy
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr ""
-"Publicações de novidades sobre mudanças relacionadas ao GNU Taler, como "
-"lançamentos e eventos"
-
-#: news/index.html.j2:16
-#, fuzzy
-msgid "subscribe to our RSS feed"
-msgstr "Inscrever-se no Feed RSS"
-
-#: news/index.html.j2:33
-#, fuzzy
-msgid "read more"
-msgstr "ler mais"
-
 #: template/architecture.html.j2:6
 #, fuzzy
 msgid "Taler System Architecture"
@@ -1496,3 +1479,21 @@ msgstr ""
 #: template/wallet.html.j2:261
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr ""
+
+#: template/news/index.html.j2:11
+#, fuzzy
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr ""
+"Publicações de novidades sobre mudanças relacionadas ao GNU Taler, como "
+"lançamentos e eventos"
+
+#: template/news/index.html.j2:16
+#, fuzzy
+msgid "subscribe to our RSS feed"
+msgstr "Inscrever-se no Feed RSS"
+
+#: template/news/index.html.j2:33
+#, fuzzy
+msgid "read more"
+msgstr "ler mais"
diff --git a/locale/ru/LC_MESSAGES/messages.po 
b/locale/ru/LC_MESSAGES/messages.po
index 301ddc9..919c9ed 100644
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-04-22 10:29+0000\n"
 "Last-Translator: Yulia Greben <yulia.greben@gmail.com>\n"
 "Language-Team: Russian <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -86,23 +86,11 @@ msgstr "Особенности"
 msgid "Principles"
 msgstr "Принципы"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr "Новости"
 
-#: news/index.html.j2:11
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr "Обновления и мероприятия GNU Taler"
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr "подпишитесь на нашу RSS-ленту"
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr "Подробнее"
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Архитектура системы Taler"
@@ -1583,3 +1571,16 @@ msgstr ""
 #: template/wallet.html.j2:261
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr ""
+
+#: template/news/index.html.j2:11
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr "Обновления и мероприятия GNU Taler"
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr "подпишитесь на нашу RSS-ленту"
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr "Подробнее"
diff --git a/locale/sv/LC_MESSAGES/messages.po 
b/locale/sv/LC_MESSAGES/messages.po
index b48385c..8d0e173 100644
--- a/locale/sv/LC_MESSAGES/messages.po
+++ b/locale/sv/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-02-27 22:18+0000\n"
 "Last-Translator: Weblate Admin <admin@example.com>\n"
 "Language-Team: Swedish <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -84,25 +84,11 @@ msgstr "Funktioner"
 msgid "Principles"
 msgstr "Principer"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr "Nyheter"
 
-#: news/index.html.j2:11
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr ""
-"Nyheter om förändringar relaterade till GNU Taler såsom releaser och "
-"evenemang"
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr "prenumerera på vårt RSS-flöde"
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr "läs mer"
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Taler Systemarkitektur"
@@ -1616,6 +1602,21 @@ msgstr ""
 "Plånböcker för andra webbläsare kommer att tillhandahållas inom en snar "
 "framtid."
 
+#: template/news/index.html.j2:11
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr ""
+"Nyheter om förändringar relaterade till GNU Taler såsom releaser och "
+"evenemang"
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr "prenumerera på vårt RSS-flöde"
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr "läs mer"
+
 #~ msgid ""
 #~ "GNU Taler must enable a diverse set of operators, breaking up the current "
 #~ "system where only a few global companies dominate the market."
diff --git a/locale/tr/LC_MESSAGES/messages.po 
b/locale/tr/LC_MESSAGES/messages.po
index c2c4ec9..5e78b08 100644
--- a/locale/tr/LC_MESSAGES/messages.po
+++ b/locale/tr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-02-27 22:18+0000\n"
 "Last-Translator: Weblate Admin <admin@example.com>\n"
 "Language-Team: Turkish <http://weblate.taler.net/projects/gnu-taler/main-web-";
@@ -85,25 +85,11 @@ msgstr "Özellikleri"
 msgid "Principles"
 msgstr "İlkelerimiz"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr "Haberdar olun"
 
-#: news/index.html.j2:11
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr ""
-"Sürümler ve etkinlikler gibi GNU Taler ile ilgili değişiklikler hakkında "
-"haber gönderileri"
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr "RSS akışına abone olun"
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr "daha fazlasını okumak için"
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Taler Sistem Mimarisi"
@@ -1635,6 +1621,21 @@ msgstr "Diğer web tarayıcıları"
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr "Diğer tarayıcılar için cüzdanlar yakın gelecekte sağlanacaktır."
 
+#: template/news/index.html.j2:11
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr ""
+"Sürümler ve etkinlikler gibi GNU Taler ile ilgili değişiklikler hakkında "
+"haber gönderileri"
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr "RSS akışına abone olun"
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr "daha fazlasını okumak için"
+
 #~ msgid ""
 #~ "GNU Taler must enable a diverse set of operators, breaking up the current "
 #~ "system where only a few global companies dominate the market."
diff --git a/locale/zh_Hant/LC_MESSAGES/messages.po 
b/locale/zh_Hant/LC_MESSAGES/messages.po
index 2bebf0d..8be5101 100644
--- a/locale/zh_Hant/LC_MESSAGES/messages.po
+++ b/locale/zh_Hant/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-05-04 22:25+0200\n"
+"POT-Creation-Date: 2021-05-06 17:16+0200\n"
 "PO-Revision-Date: 2021-04-12 05:50+0000\n"
 "Last-Translator: Ting-Yi Fu <futingyi0215@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <http://weblate.taler.net/projects/gnu-";
@@ -88,24 +88,11 @@ msgstr "功能"
 msgid "Principles"
 msgstr "準則"
 
-#: common/navigation.j2.inc:26 news/index.html.j2:8 template/index.html.j2:56
+#: common/navigation.j2.inc:26 template/index.html.j2:56
+#: template/news/index.html.j2:8
 msgid "News"
 msgstr "最新消息"
 
-#: news/index.html.j2:11
-#, fuzzy
-msgid ""
-"News posts about changes related to GNU Taler such as releases and events"
-msgstr "與GNU Taler更改、發布、活動等相關的最新消息"
-
-#: news/index.html.j2:16
-msgid "subscribe to our RSS feed"
-msgstr "訂閱我們的RSS feed"
-
-#: news/index.html.j2:33
-msgid "read more"
-msgstr "閱讀更多"
-
 #: template/architecture.html.j2:6
 msgid "Taler System Architecture"
 msgstr "Taler系統架構"
@@ -1507,3 +1494,17 @@ msgstr "其他瀏覽器"
 #, fuzzy
 msgid "Wallets for other browsers will be provided in the near future."
 msgstr "其他瀏覽器的錢包會於近期提供。"
+
+#: template/news/index.html.j2:11
+#, fuzzy
+msgid ""
+"News posts about changes related to GNU Taler such as releases and events"
+msgstr "與GNU Taler更改、發布、活動等相關的最新消息"
+
+#: template/news/index.html.j2:16
+msgid "subscribe to our RSS feed"
+msgstr "訂閱我們的RSS feed"
+
+#: template/news/index.html.j2:33
+msgid "read more"
+msgstr "閱讀更多"
diff --git a/make_site.py b/make_site.py
index 95a114d..624be17 100755
--- a/make_site.py
+++ b/make_site.py
@@ -18,26 +18,14 @@ from pathlib import Path, PurePath
 sys.path.insert(0, ".")
 sys.path.insert(0, "inc/")
 
-from inc.site import gen_site
-from inc.fileproc import copy_files
+from inc.site import SiteGenerator
 
-env = 
jinja2.Environment(loader=jinja2.FileSystemLoader(str(PurePath(__file__).parent)),
-                         extensions=["jinja2.ext.i18n"],
-                         lstrip_blocks=True,
-                         trim_blocks=True,
-                         undefined=jinja2.StrictUndefined,
-                         autoescape=False)
-env.newstyle_gettext = True
 
 def main():
-    x = gen_site(0)
-    conf = x.load_config("www.yml")
-    x.gen_abstract(conf, "newsposts", "abstract", "page", 1000)
-    x.gen_newspost_content(conf, "newsposts", "content", "page", "en")
-    x.gen_rss("inc", conf, env)
-    x.run("template", conf, env)
-    x.copy_trees("static")
-    x.copy_trees("dist")
+    x = SiteGenerator()
+    x.gen_abstract("newsposts", "abstract", "page", 1000)
+    x.gen_newspost_content("newsposts", "content", "page", "en")
+    x.run()
 
 if __name__ == "__main__":
     main()
diff --git a/.well-known/security.txt b/static/.well-known/security.txt
similarity index 100%
rename from .well-known/security.txt
rename to static/.well-known/security.txt
diff --git a/dist/bootstrap@4.6.0/bootstrap.bundle.min.js 
b/static/dist/bootstrap@4.6.0/bootstrap.bundle.min.js
similarity index 100%
rename from dist/bootstrap@4.6.0/bootstrap.bundle.min.js
rename to static/dist/bootstrap@4.6.0/bootstrap.bundle.min.js
diff --git a/dist/bootstrap@4.6.0/bootstrap.bundle.min.js.map 
b/static/dist/bootstrap@4.6.0/bootstrap.bundle.min.js.map
similarity index 100%
rename from dist/bootstrap@4.6.0/bootstrap.bundle.min.js.map
rename to static/dist/bootstrap@4.6.0/bootstrap.bundle.min.js.map
diff --git a/dist/bootstrap@4.6.0/bootstrap.min.css 
b/static/dist/bootstrap@4.6.0/bootstrap.min.css
similarity index 100%
rename from dist/bootstrap@4.6.0/bootstrap.min.css
rename to static/dist/bootstrap@4.6.0/bootstrap.min.css
diff --git a/dist/bootstrap@4.6.0/bootstrap.min.css.map 
b/static/dist/bootstrap@4.6.0/bootstrap.min.css.map
similarity index 100%
rename from dist/bootstrap@4.6.0/bootstrap.min.css.map
rename to static/dist/bootstrap@4.6.0/bootstrap.min.css.map
diff --git a/dist/bootstrap@4.6.0/jquery-3.5.1.slim.min.js 
b/static/dist/bootstrap@4.6.0/jquery-3.5.1.slim.min.js
similarity index 100%
rename from dist/bootstrap@4.6.0/jquery-3.5.1.slim.min.js
rename to static/dist/bootstrap@4.6.0/jquery-3.5.1.slim.min.js
diff --git a/icons/buildbot.svg b/static/icons/buildbot.svg
similarity index 100%
rename from icons/buildbot.svg
rename to static/icons/buildbot.svg
diff --git a/icons/icon-api.svg b/static/icons/icon-api.svg
similarity index 100%
rename from icons/icon-api.svg
rename to static/icons/icon-api.svg
diff --git a/icons/icon-backend.svg b/static/icons/icon-backend.svg
similarity index 100%
rename from icons/icon-backend.svg
rename to static/icons/icon-backend.svg
diff --git a/icons/icon-backoffice.svg b/static/icons/icon-backoffice.svg
similarity index 100%
rename from icons/icon-backoffice.svg
rename to static/icons/icon-backoffice.svg
diff --git a/icons/icon-bank.svg b/static/icons/icon-bank.svg
similarity index 100%
rename from icons/icon-bank.svg
rename to static/icons/icon-bank.svg
diff --git a/icons/icon-cashier.svg b/static/icons/icon-cashier.svg
similarity index 100%
rename from icons/icon-cashier.svg
rename to static/icons/icon-cashier.svg
diff --git a/icons/icon-code.svg b/static/icons/icon-code.svg
similarity index 100%
rename from icons/icon-code.svg
rename to static/icons/icon-code.svg
diff --git a/icons/icon-developers.svg b/static/icons/icon-developers.svg
similarity index 100%
rename from icons/icon-developers.svg
rename to static/icons/icon-developers.svg
diff --git a/icons/icon-exchange.svg b/static/icons/icon-exchange.svg
similarity index 100%
rename from icons/icon-exchange.svg
rename to static/icons/icon-exchange.svg
diff --git a/icons/icon-lcov.svg b/static/icons/icon-lcov.svg
similarity index 100%
rename from icons/icon-lcov.svg
rename to static/icons/icon-lcov.svg
diff --git a/icons/icon-market.svg b/static/icons/icon-market.svg
similarity index 100%
rename from icons/icon-market.svg
rename to static/icons/icon-market.svg
diff --git a/icons/icon-share.svg b/static/icons/icon-share.svg
similarity index 100%
rename from icons/icon-share.svg
rename to static/icons/icon-share.svg
diff --git a/icons/icon-wallet.svg b/static/icons/icon-wallet.svg
similarity index 100%
rename from icons/icon-wallet.svg
rename to static/icons/icon-wallet.svg
diff --git a/images/1-libre.png b/static/images/1-libre.png
similarity index 100%
rename from images/1-libre.png
rename to static/images/1-libre.png
diff --git a/images/1-libre.svg b/static/images/1-libre.svg
similarity index 100%
rename from images/1-libre.svg
rename to static/images/1-libre.svg
diff --git a/images/2-buyer-privacy.png b/static/images/2-buyer-privacy.png
similarity index 100%
rename from images/2-buyer-privacy.png
rename to static/images/2-buyer-privacy.png
diff --git a/images/2-buyer-privacy.svg b/static/images/2-buyer-privacy.svg
similarity index 100%
rename from images/2-buyer-privacy.svg
rename to static/images/2-buyer-privacy.svg
diff --git a/images/3-taxable.png b/static/images/3-taxable.png
similarity index 100%
rename from images/3-taxable.png
rename to static/images/3-taxable.png
diff --git a/images/3-taxable.svg b/static/images/3-taxable.svg
similarity index 100%
rename from images/3-taxable.svg
rename to static/images/3-taxable.svg
diff --git a/images/4-fraud.png b/static/images/4-fraud.png
similarity index 100%
rename from images/4-fraud.png
rename to static/images/4-fraud.png
diff --git a/images/4-fraud.svg b/static/images/4-fraud.svg
similarity index 100%
rename from images/4-fraud.svg
rename to static/images/4-fraud.svg
diff --git a/images/5-data-minimization.png 
b/static/images/5-data-minimization.png
similarity index 100%
rename from images/5-data-minimization.png
rename to static/images/5-data-minimization.png
diff --git a/images/5-data-minimization.svg 
b/static/images/5-data-minimization.svg
similarity index 100%
rename from images/5-data-minimization.svg
rename to static/images/5-data-minimization.svg
diff --git a/images/6-usable.png b/static/images/6-usable.png
similarity index 100%
rename from images/6-usable.png
rename to static/images/6-usable.png
diff --git a/images/6-usable.svg b/static/images/6-usable.svg
similarity index 100%
rename from images/6-usable.svg
rename to static/images/6-usable.svg
diff --git a/images/7-efficient.png b/static/images/7-efficient.png
similarity index 100%
rename from images/7-efficient.png
rename to static/images/7-efficient.png
diff --git a/images/7-efficient.svg b/static/images/7-efficient.svg
similarity index 100%
rename from images/7-efficient.svg
rename to static/images/7-efficient.svg
diff --git a/images/8-fault-tolerant.png b/static/images/8-fault-tolerant.png
similarity index 100%
rename from images/8-fault-tolerant.png
rename to static/images/8-fault-tolerant.png
diff --git a/images/8-fault-tolerant.svg b/static/images/8-fault-tolerant.svg
similarity index 100%
rename from images/8-fault-tolerant.svg
rename to static/images/8-fault-tolerant.svg
diff --git a/images/9-competition.png b/static/images/9-competition.png
similarity index 100%
rename from images/9-competition.png
rename to static/images/9-competition.png
diff --git a/images/9-competition.svg b/static/images/9-competition.svg
similarity index 100%
rename from images/9-competition.svg
rename to static/images/9-competition.svg
diff --git a/images/UseCaseDiagram.png b/static/images/UseCaseDiagram.png
similarity index 100%
rename from images/UseCaseDiagram.png
rename to static/images/UseCaseDiagram.png
diff --git a/images/anonymous.jpg b/static/images/anonymous.jpg
similarity index 100%
rename from images/anonymous.jpg
rename to static/images/anonymous.jpg
diff --git a/images/anonymous.medium.jpg b/static/images/anonymous.medium.jpg
similarity index 100%
rename from images/anonymous.medium.jpg
rename to static/images/anonymous.medium.jpg
diff --git a/images/anonymous.png b/static/images/anonymous.png
similarity index 100%
rename from images/anonymous.png
rename to static/images/anonymous.png
diff --git a/images/backend.svg b/static/images/backend.svg
similarity index 100%
rename from images/backend.svg
rename to static/images/backend.svg
diff --git a/images/buy.jpg b/static/images/buy.jpg
similarity index 100%
rename from images/buy.jpg
rename to static/images/buy.jpg
diff --git a/images/buy.medium.jpg b/static/images/buy.medium.jpg
similarity index 100%
rename from images/buy.medium.jpg
rename to static/images/buy.medium.jpg
diff --git a/images/ccby.png b/static/images/ccby.png
similarity index 100%
rename from images/ccby.png
rename to static/images/ccby.png
diff --git a/images/checkmark.png b/static/images/checkmark.png
similarity index 100%
rename from images/checkmark.png
rename to static/images/checkmark.png
diff --git a/images/citizen.svg b/static/images/citizen.svg
similarity index 100%
rename from images/citizen.svg
rename to static/images/citizen.svg
diff --git a/images/de.png b/static/images/de.png
similarity index 100%
rename from images/de.png
rename to static/images/de.png
diff --git a/images/dependencies.dot b/static/images/dependencies.dot
similarity index 100%
rename from images/dependencies.dot
rename to static/images/dependencies.dot
diff --git a/images/diagram-complex.png b/static/images/diagram-complex.png
similarity index 100%
rename from images/diagram-complex.png
rename to static/images/diagram-complex.png
diff --git a/images/diagram-simple.png b/static/images/diagram-simple.png
similarity index 100%
rename from images/diagram-simple.png
rename to static/images/diagram-simple.png
diff --git a/images/efficient.png b/static/images/efficient.png
similarity index 100%
rename from images/efficient.png
rename to static/images/efficient.png
diff --git a/images/en.png b/static/images/en.png
similarity index 100%
rename from images/en.png
rename to static/images/en.png
diff --git a/images/es.png b/static/images/es.png
similarity index 100%
rename from images/es.png
rename to static/images/es.png
diff --git a/images/fossa2014.png b/static/images/fossa2014.png
similarity index 100%
rename from images/fossa2014.png
rename to static/images/fossa2014.png
diff --git a/images/fr.png b/static/images/fr.png
similarity index 100%
rename from images/fr.png
rename to static/images/fr.png
diff --git a/images/fraud.jpg b/static/images/fraud.jpg
similarity index 100%
rename from images/fraud.jpg
rename to static/images/fraud.jpg
diff --git a/images/fraud.medium.jpg b/static/images/fraud.medium.jpg
similarity index 100%
rename from images/fraud.medium.jpg
rename to static/images/fraud.medium.jpg
diff --git a/images/gb.png b/static/images/gb.png
similarity index 100%
rename from images/gb.png
rename to static/images/gb.png
diff --git a/images/gdpr.jpg b/static/images/gdpr.jpg
similarity index 100%
rename from images/gdpr.jpg
rename to static/images/gdpr.jpg
diff --git a/images/gdpr.medium.jpg b/static/images/gdpr.medium.jpg
similarity index 100%
rename from images/gdpr.medium.jpg
rename to static/images/gdpr.medium.jpg
diff --git a/images/home.png b/static/images/home.png
similarity index 100%
rename from images/home.png
rename to static/images/home.png
diff --git a/images/html.svg b/static/images/html.svg
similarity index 100%
rename from images/html.svg
rename to static/images/html.svg
diff --git a/images/it.png b/static/images/it.png
similarity index 100%
rename from images/it.png
rename to static/images/it.png
diff --git a/images/languageicon.svg b/static/images/languageicon.svg
similarity index 100%
rename from images/languageicon.svg
rename to static/images/languageicon.svg
diff --git a/images/life-safer.jpg b/static/images/life-safer.jpg
similarity index 100%
rename from images/life-safer.jpg
rename to static/images/life-safer.jpg
diff --git a/images/life-safer.medium.jpg b/static/images/life-safer.medium.jpg
similarity index 100%
rename from images/life-safer.medium.jpg
rename to static/images/life-safer.medium.jpg
diff --git a/images/logo-2017.es.svg b/static/images/logo-2017.es.svg
similarity index 100%
rename from images/logo-2017.es.svg
rename to static/images/logo-2017.es.svg
diff --git a/images/logo-2017.fr.svg b/static/images/logo-2017.fr.svg
similarity index 100%
rename from images/logo-2017.fr.svg
rename to static/images/logo-2017.fr.svg
diff --git a/images/logo-2017.svg b/static/images/logo-2017.svg
similarity index 100%
rename from images/logo-2017.svg
rename to static/images/logo-2017.svg
diff --git a/images/logo-2018-dold.raw.svg 
b/static/images/logo-2018-dold.raw.svg
similarity index 100%
rename from images/logo-2018-dold.raw.svg
rename to static/images/logo-2018-dold.raw.svg
diff --git a/images/logo-2018-dold.svg b/static/images/logo-2018-dold.svg
similarity index 100%
rename from images/logo-2018-dold.svg
rename to static/images/logo-2018-dold.svg
diff --git a/images/logo-2020.jpg b/static/images/logo-2020.jpg
similarity index 100%
rename from images/logo-2020.jpg
rename to static/images/logo-2020.jpg
diff --git a/images/logo-2021.svg b/static/images/logo-2021.svg
similarity index 100%
rename from images/logo-2021.svg
rename to static/images/logo-2021.svg
diff --git a/images/logo-julian.png b/static/images/logo-julian.png
similarity index 100%
rename from images/logo-julian.png
rename to static/images/logo-julian.png
diff --git a/images/market.medium.jpg b/static/images/market.medium.jpg
similarity index 100%
rename from images/market.medium.jpg
rename to static/images/market.medium.jpg
diff --git a/images/money-laundering.jpg b/static/images/money-laundering.jpg
similarity index 100%
rename from images/money-laundering.jpg
rename to static/images/money-laundering.jpg
diff --git a/images/money-laundering.medium.jpg 
b/static/images/money-laundering.medium.jpg
similarity index 100%
rename from images/money-laundering.medium.jpg
rename to static/images/money-laundering.medium.jpg
diff --git a/images/pdf.svg b/static/images/pdf.svg
similarity index 100%
rename from images/pdf.svg
rename to static/images/pdf.svg
diff --git a/images/product.png b/static/images/product.png
similarity index 100%
rename from images/product.png
rename to static/images/product.png
diff --git a/images/shipment.png b/static/images/shipment.png
similarity index 100%
rename from images/shipment.png
rename to static/images/shipment.png
diff --git a/images/stallman.medium.png b/static/images/stallman.medium.png
similarity index 100%
rename from images/stallman.medium.png
rename to static/images/stallman.medium.png
diff --git a/images/stock1.jpg b/static/images/stock1.jpg
similarity index 100%
rename from images/stock1.jpg
rename to static/images/stock1.jpg
diff --git a/images/stock1s.jpg b/static/images/stock1s.jpg
similarity index 100%
rename from images/stock1s.jpg
rename to static/images/stock1s.jpg
diff --git a/images/taler-arch-full.svg b/static/images/taler-arch-full.svg
similarity index 100%
rename from images/taler-arch-full.svg
rename to static/images/taler-arch-full.svg
diff --git a/papers/bellare_blindsigs_proof.pdf 
b/static/papers/bellare_blindsigs_proof.pdf
similarity index 100%
rename from papers/bellare_blindsigs_proof.pdf
rename to static/papers/bellare_blindsigs_proof.pdf
diff --git a/papers/cbdc2021en.pdf b/static/papers/cbdc2021en.pdf
similarity index 100%
rename from papers/cbdc2021en.pdf
rename to static/papers/cbdc2021en.pdf
diff --git a/papers/chaum-blind-signatures.pdf 
b/static/papers/chaum-blind-signatures.pdf
similarity index 100%
rename from papers/chaum-blind-signatures.pdf
rename to static/papers/chaum-blind-signatures.pdf
diff --git a/papers/codeblau-report-2020-q2.pdf 
b/static/papers/codeblau-report-2020-q2.pdf
similarity index 100%
rename from papers/codeblau-report-2020-q2.pdf
rename to static/papers/codeblau-report-2020-q2.pdf
diff --git a/papers/codeblau-response-2020-q2.pdf 
b/static/papers/codeblau-response-2020-q2.pdf
similarity index 100%
rename from papers/codeblau-response-2020-q2.pdf
rename to static/papers/codeblau-response-2020-q2.pdf
diff --git a/papers/euro-bearer-online-2021.pdf 
b/static/papers/euro-bearer-online-2021.pdf
similarity index 100%
rename from papers/euro-bearer-online-2021.pdf
rename to static/papers/euro-bearer-online-2021.pdf
diff --git a/papers/jfk2020thesis.pdf b/static/papers/jfk2020thesis.pdf
similarity index 100%
rename from papers/jfk2020thesis.pdf
rename to static/papers/jfk2020thesis.pdf
diff --git a/papers/taler2016space.pdf b/static/papers/taler2016space.pdf
similarity index 100%
rename from papers/taler2016space.pdf
rename to static/papers/taler2016space.pdf
diff --git a/papers/thesis-anastasis-2020.pdf 
b/static/papers/thesis-anastasis-2020.pdf
similarity index 100%
rename from papers/thesis-anastasis-2020.pdf
rename to static/papers/thesis-anastasis-2020.pdf
diff --git a/papers/thesis-dold-phd-2019.pdf 
b/static/papers/thesis-dold-phd-2019.pdf
similarity index 100%
rename from papers/thesis-dold-phd-2019.pdf
rename to static/papers/thesis-dold-phd-2019.pdf
diff --git a/papers/thesis-wenger-2020.pdf 
b/static/papers/thesis-wenger-2020.pdf
similarity index 100%
rename from papers/thesis-wenger-2020.pdf
rename to static/papers/thesis-wenger-2020.pdf
diff --git a/pdf/copyright.pdf b/static/pdf/copyright.pdf
similarity index 100%
rename from pdf/copyright.pdf
rename to static/pdf/copyright.pdf
diff --git a/pdf/flyer2017.pdf b/static/pdf/flyer2017.pdf
similarity index 100%
rename from pdf/flyer2017.pdf
rename to static/pdf/flyer2017.pdf
diff --git a/presentations/investors2018.pdf 
b/static/presentations/investors2018.pdf
similarity index 100%
rename from presentations/investors2018.pdf
rename to static/presentations/investors2018.pdf
diff --git a/presentations/tech.pdf b/static/presentations/tech.pdf
similarity index 100%
rename from presentations/tech.pdf
rename to static/presentations/tech.pdf
diff --git a/financial-news/2013-09-15.inc 
b/template/financial-news/2013-09-15.inc
similarity index 100%
rename from financial-news/2013-09-15.inc
rename to template/financial-news/2013-09-15.inc
diff --git a/financial-news/2014-09-10.inc 
b/template/financial-news/2014-09-10.inc
similarity index 100%
rename from financial-news/2014-09-10.inc
rename to template/financial-news/2014-09-10.inc
diff --git a/financial-news/2014-11-13.inc 
b/template/financial-news/2014-11-13.inc
similarity index 100%
rename from financial-news/2014-11-13.inc
rename to template/financial-news/2014-11-13.inc
diff --git a/financial-news/2014-12-05.inc 
b/template/financial-news/2014-12-05.inc
similarity index 100%
rename from financial-news/2014-12-05.inc
rename to template/financial-news/2014-12-05.inc
diff --git a/financial-news/2014-12-06.inc 
b/template/financial-news/2014-12-06.inc
similarity index 100%
rename from financial-news/2014-12-06.inc
rename to template/financial-news/2014-12-06.inc
diff --git a/financial-news/2015-03-17.inc 
b/template/financial-news/2015-03-17.inc
similarity index 100%
rename from financial-news/2015-03-17.inc
rename to template/financial-news/2015-03-17.inc
diff --git a/financial-news/2015-04-30.inc 
b/template/financial-news/2015-04-30.inc
similarity index 100%
rename from financial-news/2015-04-30.inc
rename to template/financial-news/2015-04-30.inc
diff --git a/financial-news/2015-12-22.inc 
b/template/financial-news/2015-12-22.inc
similarity index 100%
rename from financial-news/2015-12-22.inc
rename to template/financial-news/2015-12-22.inc
diff --git a/financial-news/2016-07-23.inc 
b/template/financial-news/2016-07-23.inc
similarity index 100%
rename from financial-news/2016-07-23.inc
rename to template/financial-news/2016-07-23.inc
diff --git a/financial-news/2016-10-15.inc 
b/template/financial-news/2016-10-15.inc
similarity index 100%
rename from financial-news/2016-10-15.inc
rename to template/financial-news/2016-10-15.inc
diff --git a/financial-news/2016-10-21.inc 
b/template/financial-news/2016-10-21.inc
similarity index 100%
rename from financial-news/2016-10-21.inc
rename to template/financial-news/2016-10-21.inc
diff --git a/financial-news/2016-10-24.inc 
b/template/financial-news/2016-10-24.inc
similarity index 100%
rename from financial-news/2016-10-24.inc
rename to template/financial-news/2016-10-24.inc
diff --git a/financial-news/2016-10-26.inc 
b/template/financial-news/2016-10-26.inc
similarity index 100%
rename from financial-news/2016-10-26.inc
rename to template/financial-news/2016-10-26.inc
diff --git a/financial-news/2017-04-03.inc 
b/template/financial-news/2017-04-03.inc
similarity index 100%
rename from financial-news/2017-04-03.inc
rename to template/financial-news/2017-04-03.inc
diff --git a/financial-news/2017-04-04.inc 
b/template/financial-news/2017-04-04.inc
similarity index 100%
rename from financial-news/2017-04-04.inc
rename to template/financial-news/2017-04-04.inc
diff --git a/financial-news/2017-07-20.inc 
b/template/financial-news/2017-07-20.inc
similarity index 100%
rename from financial-news/2017-07-20.inc
rename to template/financial-news/2017-07-20.inc
diff --git a/template/rss.xml.j2 b/template/rss.xml.j2
new file mode 100644
index 0000000..b9a29f7
--- /dev/null
+++ b/template/rss.xml.j2
@@ -0,0 +1,48 @@
+{#
+# Copyright (C) 2019, 2020 GNUnet e.V.
+#
+# This code is derived from code contributed to GNUnet eV
+# by nikita <nikita@n0.is>.
+#
+# Permission to use, copy, modify, and/or distribute this software for
+# any purpose with or without fee is hereby granted.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+# PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+# SPDX-License-Identifier: 0BSD
+#}
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom";>
+  {% for siteconfitem in siteconf %}
+    <channel>
+      <atom:link href="https://{{ siteconfitem['baseurl'] }}/{{ lang 
}}/rss.xml" rel="self" type="application/rss+xml" />
+      <title>{{ siteconfitem['rsstitle'] }}</title>
+      <language>{{ lang }}</language>
+      <description>{{ siteconfitem['rssdescr']|e }}</description>
+      <link>https://{{ siteconfitem['baseurl'] }}/</link>
+      <lastBuildDate>{{ now }}</lastBuildDate>
+      {% for newspostitem in newsposts %}
+        <item>
+          <guid>https://{{ siteconfitem['baseurl'] }}/{{ lang }}{{ 
siteconfitem['newsloc'] }}{{ newspostitem['page'] }}</guid>
+          <link>https://{{ siteconfitem['baseurl'] }}/{{ lang }}{{ 
siteconfitem['newsloc'] }}{{ newspostitem['page'] }}</link>
+          <pubDate>{{ conv_date_rfc822(newspostitem["date"]) }}</pubDate>
+          <title>{{ newspostitem['title']|e }}</title>
+          <description>
+            <![CDATA[
+             <article>
+               {{ newspostitem['content'] }}
+             </article>
+             ]]>
+          </description>
+        </item>
+      {% endfor %}
+    </channel>
+  {% endfor %}
+</rss>
diff --git a/www.yml b/www.yml
index 741fdf7..68db2c0 100644
--- a/www.yml
+++ b/www.yml
@@ -1,5 +1,5 @@
 siteconf:
-  - baseurl: taler.net
+  - baseurl: https://taler.net/
     newsloc: /news/
     newsdir: news
     rsstitle: Taler.net

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]