[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] branch stable updated (c663445 -> e38b12c)
From: |
gnunet |
Subject: |
[taler-www] branch stable updated (c663445 -> e38b12c) |
Date: |
Tue, 04 May 2021 22:36:27 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a change to branch stable
in repository www.
from c663445 alt text
new deff05f fix some pofile issues that make pybabel barf
new ddaa3bb remove nonsensical subshell usage
new e38b12c makefile
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile | 53 +++++++++++++++++++++------------------
locale/de/LC_MESSAGES/messages.po | 9 -------
locale/fr/LC_MESSAGES/messages.po | 12 +--------
3 files changed, 29 insertions(+), 45 deletions(-)
diff --git a/Makefile b/Makefile
index 93448f6..5b00c06 100644
--- a/Makefile
+++ b/Makefile
@@ -8,31 +8,31 @@ 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/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 \
+ 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)` ; \
+ done
+ $(cp) -R images rendered/static/
+ for lang in `echo $(LANGUAGES)` ; \
do $(cp) -R images rendered/$$lang ; \
- done)
- (cd rendered; \
+ 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 \
+ 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/)
+ done
+ $(cp) -R pdf rendered/static/
+ $(mkdir) -p rendered/.well-known ; $(cp) .well-known/security.txt
rendered/.well-known/
# Extract translateable strings from jinja2 templates.
locale/messages.pot: template/*.j2 common/*.j2 common/*.j2.inc
@@ -41,19 +41,21 @@ locale/messages.pot: template/*.j2 common/*.j2
common/*.j2.inc
# Update translation (.po) files with new strings.
.PHONY: locale-update
locale-update: locale/messages.pot
- (for lang in `echo $(LANGUAGES)`; do \
+ 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
+ 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 \
+ for lang in `echo $(LANGUAGES)`; do \
echo compiling $$lang; \
$(pybabel) -q compile -d locale -l $$lang --use-fuzzy ; \
- done)
+ done
# Process everything related to gettext translations.
.PHONY: locale
@@ -90,5 +92,6 @@ clean:
$(rm) -rf __pycache__ *.pyc *~ \.*~ \#*\#
$(rm) -rf rendered/
+.PHONY: submodules/update
submodules/update:
$(git) submodule update --recursive --remote
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 6e6f4c9..b576ee8 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -1856,15 +1856,6 @@ msgstr "Wallets für andere Browser werden zukünftig
bereitgestellt."
#~ "beim Betrieb von Taler."
#, fuzzy
-#~| msgid ""
-#~| "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html"
-#~| "\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
-#~| "vendor lock-in meaning merchants can easily choose another service "
-#~| "provider to process their payments. For countries, Free/Libre software "
-#~| "means GNU Taler can not compromise sovereignty by imposing restrictions "
-#~| "or requirements. And for exchange operators, transparency is crucial to "
-#~| "satisfy <a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle"
-#~| "\">Kerckhoff's principle</a> and to establish public confidence."
#~ msgid ""
#~ "For countries, Free/Libre software means GNU Taler can not compromise "
#~ "sovereignty by imposing restrictions or requirements. And for exchange "
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 253428d..b56de64 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1686,15 +1686,6 @@ msgstr ""
#~ "d'avoir une système complètement monolithique."
#, fuzzy
-#~| msgid ""
-#~| "GNU Taler must be <a href=\"https://www.gnu.org/philosophy/free-sw.html"
-#~| "\">Free/Libre Software</a>. For merchants, Free/Libre Software prevents "
-#~| "vendor lock-in meaning merchants can easily choose another service "
-#~| "provider to process their payments. For countries, Free/Libre software "
-#~| "means GNU Taler can not compromise sovereignty by imposing restrictions "
-#~| "or requirements. And for exchange operators, transparency is crucial to "
-#~| "satisfy <a href=\"https://en.wikipedia.org/wiki/Kerckhoffs's_principle"
-#~| "\">Kerckhoff's principle</a> and to establish public confidence."
#~ msgid ""
#~ "For countries, Free/Libre software means GNU Taler can not compromise "
#~ "sovereignty by imposing restrictions or requirements. And for exchange "
@@ -1755,9 +1746,8 @@ msgstr ""
#~ "terminal.pdf\">PDF</a>."
#, fuzzy
-#~| msgid "News"
#~ msgid "News:"
-#~ msgstr "Actualité"
+#~ msgstr "Actualité:"
#~ msgid "Taler Cashier"
#~ msgstr "Caisse enregistreuse Taler"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-www] branch stable updated (c663445 -> e38b12c),
gnunet <=