summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortg(x) <*@tg-x.net>2017-01-19 19:46:02 +0100
committertg(x) <*@tg-x.net>2017-01-19 19:46:02 +0100
commitdbf11d7daf526574bf2f7c9ef8cbca7ce56ae635 (patch)
treecbe7b803633b975a45b5ab206bfb9e60c9097c47
parentad575cbedbbc6d109241aebf225b7e07bdb17555 (diff)
downloadwww-dbf11d7daf526574bf2f7c9ef8cbca7ce56ae635.tar.gz
www-dbf11d7daf526574bf2f7c9ef8cbca7ce56ae635.tar.bz2
www-dbf11d7daf526574bf2f7c9ef8cbca7ce56ae635.zip
i18n: fix common includes
-rw-r--r--about.html.j26
-rw-r--r--citizens.html.j26
-rw-r--r--developers.html.j26
-rw-r--r--financial-news.html.j26
-rw-r--r--governments.html.j26
-rw-r--r--index.html.j26
-rw-r--r--investors.html.j26
-rw-r--r--locale/de/LC_MESSAGES/messages.po16
-rw-r--r--locale/en/LC_MESSAGES/messages.po16
-rw-r--r--locale/es/LC_MESSAGES/messages.po16
-rw-r--r--locale/fr/LC_MESSAGES/messages.po16
-rw-r--r--locale/it/LC_MESSAGES/messages.po16
-rw-r--r--merchants.html.j26
-rw-r--r--news.html.j26
-rwxr-xr-xtemplate.sh12
-rw-r--r--wallet.html.j26
16 files changed, 100 insertions, 52 deletions
diff --git a/about.html.j2 b/about.html.j2
index 6110809..5a6a2d6 100644
--- a/about.html.j2
+++ b/about.html.j2
@@ -2,11 +2,11 @@
<meta charset="utf-8">
<title>{{ _("GNU Taler") }} - {{ _("About us") }}</title>
<meta name="description" content="">
- <!--# include file="common/header.inc" -->
+ <!--# include file="common/header.{{ _("en") }}.inc" -->
</head>
<body class="en" onload="loadLang();">
<div class="container">
- <!--# include file="common/navigation.inc" -->
+ <!--# include file="common/navigation.{{ _("en") }}.inc" -->
<!-- Jumbotron -->
<div class="jumbotron">
<h1>{{ _("About us") }}</h1>
@@ -113,7 +113,7 @@
<p>{{ _("Software engineer. Works on Android wallet.") }}</p>
</div>
</div>
- <!--# include file="common/footer.inc" -->
+ <!--# include file="common/footer.{{ _("en") }}.inc" -->
</div> <!-- /container -->
</body>
</html>
diff --git a/citizens.html.j2 b/citizens.html.j2
index 43593de..897d1e9 100644
--- a/citizens.html.j2
+++ b/citizens.html.j2
@@ -2,11 +2,11 @@
<meta charset="utf-8">
<title>{{ _("GNU Taler") }} - {{ _("Citizens") }}</title>
<meta name="description" content="">
- <!--# include file="common/header.inc" -->
+ <!--# include file="common/header.{{ _("en") }}.inc" -->
</head>
<body class="en" onload="loadLang();">
<div class="container">
- <!--# include file="common/navigation.inc" -->
+ <!--# include file="common/navigation.{{ _("en") }}.inc" -->
<!-- Jumbotron -->
<div class="jumbotron">
<h1>{{ _("Advantages for citizens") }}</h1>
@@ -96,7 +96,7 @@
</ol>
<p></p>
</div>
- <!--# include file="common/footer.inc" -->
+ <!--# include file="common/footer.{{ _("en") }}.inc" -->
</div> <!-- /container -->
</body>
</html>
diff --git a/developers.html.j2 b/developers.html.j2
index 963b8f4..8097b38 100644
--- a/developers.html.j2
+++ b/developers.html.j2
@@ -2,11 +2,11 @@
<meta charset="utf-8">
<title>{{ _("GNU Taler") }} - {{ _("Developers") }}</title>
<meta name="description" content="">
- <!--# include file="common/header.inc" -->
+ <!--# include file="common/header.{{ _("en") }}.inc" -->
</head>
<body class="en" onload="loadLang();">
<div class="container">
- <!--# include file="common/navigation.inc" -->
+ <!--# include file="common/navigation.{{ _("en") }}.inc" -->
<!-- Jumbotron -->
<div class="jumbotron">
<h1>{{ _("Taler for developers") }}</h1>
@@ -211,7 +211,7 @@
</ol>
<p></p>
</div>
- <!--# include file="common/footer.inc" -->
+ <!--# include file="common/footer.{{ _("en") }}.inc" -->
</div> <!-- /container -->
</body>
</html>
diff --git a/financial-news.html.j2 b/financial-news.html.j2
index 4a06e58..b85d7fd 100644
--- a/financial-news.html.j2
+++ b/financial-news.html.j2
@@ -4,11 +4,11 @@
<meta charset="utf-8">
<title>{{ _("GNU Taler") }} - {{ _("Financial News") }}</title>
<meta name="description" content="">
- <!--# include file="common/header.inc" -->
+ <!--# include file="common/header.{{ _("en") }}.inc" -->
</head>
<body class="en" onLoad="loadLang();">
<div class="container">
- <!--# include file="common/navigation.inc" -->
+ <!--# include file="common/navigation.{{ _("en") }}.inc" -->
<!-- Jumbotron -->
<div class="jumbotron">
<h1 lang="en">{{ _("Financial News") }}</h1>
@@ -200,7 +200,7 @@
<p><a class="btn btn-info" href="http://www.spiegel.de/international/world/spiegel-exclusive-nsa-spies-on-international-bank-transactions-a-922276.html" role="button">Source</a></p>
</div>
</div>
- <!--# include file="common/footer.inc" -->
+ <!--# include file="common/footer.{{ _("en") }}.inc" -->
</div> <!-- /container -->
</body>
</html>
diff --git a/governments.html.j2 b/governments.html.j2
index 1ca62d5..9e38802 100644
--- a/governments.html.j2
+++ b/governments.html.j2
@@ -2,11 +2,11 @@
<meta charset="utf-8">
<title>{{ _("GNU Taler") }} - {{ _("Governments") }}</title>
<meta name="description" content="">
- <!--# include file="common/header.inc" -->
+ <!--# include file="common/header.{{ _("en") }}.inc" -->
</head>
<body class="en" onload="loadLang();">
<div class="container">
- <!--# include file="common/navigation.inc" -->
+ <!--# include file="common/navigation.{{ _("en") }}.inc" -->
<!-- Jumbotron -->
<div class="jumbotron">
<h1>{{ _("Advantages for governments") }}</h1>
@@ -96,7 +96,7 @@
</ul>
<p></p>
</div>
- <!--# include file="common/footer.inc" -->
+ <!--# include file="common/footer.{{ _("en") }}.inc" -->
</div> <!-- /container -->
</body>
</html>
diff --git a/index.html.j2 b/index.html.j2
index b5c59e1..ba4e909 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -2,11 +2,11 @@
<meta charset="utf-8">
<title>{{ _("GNU Taler") }}</title>
<meta name="description" content="Anonymous electronic payments for civil society">
- <!--# include file="common/header.inc" -->
+ <!--# include file="common/header.{{ _("en") }}.inc" -->
</head>
<body class="en" onload="loadLang();">
<div class="container">
- <!--# include file="common/navigation.inc" -->
+ <!--# include file="common/navigation.{{ _("en") }}.inc" -->
<!-- Jumbotron -->
<div class="jumbotron">
<img align="middle" alt="Taler logo" width="33%" src="/images/logo-2015-medium.png" style="margin: 0px 0px -120px 0px;">
@@ -77,7 +77,7 @@
for transactions and the ability to give change.
") }}</p>
</div>
- <!--# include file="common/footer.inc" -->
+ <!--# include file="common/footer.{{ _("en") }}.inc" -->
</div> <!-- /container -->
</body>
</html>
diff --git a/investors.html.j2 b/investors.html.j2
index dbd6ab0..d622c67 100644
--- a/investors.html.j2
+++ b/investors.html.j2
@@ -2,11 +2,11 @@
<meta charset="utf-8">
<title>{{ _("GNU Taler") }} - {{ _("Investors") }}</title>
<meta name="description" content="">
- <!--# include file="common/header.inc" -->
+ <!--# include file="common/header.{{ _("en") }}.inc" -->
</head>
<body class="en" onload="loadLang();">
<div class="container">
- <!--# include file="common/navigation.inc" -->
+ <!--# include file="common/navigation.{{ _("en") }}.inc" -->
<!-- Jumbotron -->
<div class="jumbotron">
<h1>{{ _("Operate a Taler exchange!") }}</h1>
@@ -75,7 +75,7 @@
</ul>
<p></p>
</div>
- <!--# include file="common/footer.inc" -->
+ <!--# include file="common/footer.{{ _("en") }}.inc" -->
</div> <!-- /container -->
</body>
</html>
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 5cd5b5f..8f853db 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-19 18:48+0100\n"
+"POT-Creation-Date: 2017-01-19 19:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: de\n"
@@ -14,9 +14,17 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
-#: about.html.j2:1 citizens.html.j2:1 developers.html.j2:1
-#: governments.html.j2:1 index.html.j2:1 investors.html.j2:1
-#: merchants.html.j2:1 news.html.j2:1
+#: about.html.j2:1 about.html.j2:5 about.html.j2:9 about.html.j2:116
+#: citizens.html.j2:1 citizens.html.j2:5 citizens.html.j2:9 citizens.html.j2:99
+#: developers.html.j2:1 developers.html.j2:5 developers.html.j2:9
+#: developers.html.j2:214 financial-news.html.j2:7 financial-news.html.j2:11
+#: financial-news.html.j2:203 governments.html.j2:1 governments.html.j2:5
+#: governments.html.j2:9 governments.html.j2:99 index.html.j2:1 index.html.j2:5
+#: index.html.j2:9 index.html.j2:80 investors.html.j2:1 investors.html.j2:5
+#: investors.html.j2:9 investors.html.j2:78 merchants.html.j2:1
+#: merchants.html.j2:5 merchants.html.j2:9 merchants.html.j2:135 news.html.j2:1
+#: news.html.j2:5 news.html.j2:9 news.html.j2:115 wallet.html.j2:7
+#: wallet.html.j2:112 wallet.html.j2:194
msgid "en"
msgstr "de"
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index 17ac9f9..92d226b 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-19 18:48+0100\n"
+"POT-Creation-Date: 2017-01-19 19:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
@@ -14,9 +14,17 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
-#: about.html.j2:1 citizens.html.j2:1 developers.html.j2:1
-#: governments.html.j2:1 index.html.j2:1 investors.html.j2:1
-#: merchants.html.j2:1 news.html.j2:1
+#: about.html.j2:1 about.html.j2:5 about.html.j2:9 about.html.j2:116
+#: citizens.html.j2:1 citizens.html.j2:5 citizens.html.j2:9 citizens.html.j2:99
+#: developers.html.j2:1 developers.html.j2:5 developers.html.j2:9
+#: developers.html.j2:214 financial-news.html.j2:7 financial-news.html.j2:11
+#: financial-news.html.j2:203 governments.html.j2:1 governments.html.j2:5
+#: governments.html.j2:9 governments.html.j2:99 index.html.j2:1 index.html.j2:5
+#: index.html.j2:9 index.html.j2:80 investors.html.j2:1 investors.html.j2:5
+#: investors.html.j2:9 investors.html.j2:78 merchants.html.j2:1
+#: merchants.html.j2:5 merchants.html.j2:9 merchants.html.j2:135 news.html.j2:1
+#: news.html.j2:5 news.html.j2:9 news.html.j2:115 wallet.html.j2:7
+#: wallet.html.j2:112 wallet.html.j2:194
msgid "en"
msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 07cf7f5..db21b3c 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-19 18:48+0100\n"
+"POT-Creation-Date: 2017-01-19 19:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: es\n"
@@ -14,9 +14,17 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
-#: about.html.j2:1 citizens.html.j2:1 developers.html.j2:1
-#: governments.html.j2:1 index.html.j2:1 investors.html.j2:1
-#: merchants.html.j2:1 news.html.j2:1
+#: about.html.j2:1 about.html.j2:5 about.html.j2:9 about.html.j2:116
+#: citizens.html.j2:1 citizens.html.j2:5 citizens.html.j2:9 citizens.html.j2:99
+#: developers.html.j2:1 developers.html.j2:5 developers.html.j2:9
+#: developers.html.j2:214 financial-news.html.j2:7 financial-news.html.j2:11
+#: financial-news.html.j2:203 governments.html.j2:1 governments.html.j2:5
+#: governments.html.j2:9 governments.html.j2:99 index.html.j2:1 index.html.j2:5
+#: index.html.j2:9 index.html.j2:80 investors.html.j2:1 investors.html.j2:5
+#: investors.html.j2:9 investors.html.j2:78 merchants.html.j2:1
+#: merchants.html.j2:5 merchants.html.j2:9 merchants.html.j2:135 news.html.j2:1
+#: news.html.j2:5 news.html.j2:9 news.html.j2:115 wallet.html.j2:7
+#: wallet.html.j2:112 wallet.html.j2:194
msgid "en"
msgstr "es"
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 69a3ea1..c271e80 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-19 18:48+0100\n"
+"POT-Creation-Date: 2017-01-19 19:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: fr\n"
@@ -14,9 +14,17 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
-#: about.html.j2:1 citizens.html.j2:1 developers.html.j2:1
-#: governments.html.j2:1 index.html.j2:1 investors.html.j2:1
-#: merchants.html.j2:1 news.html.j2:1
+#: about.html.j2:1 about.html.j2:5 about.html.j2:9 about.html.j2:116
+#: citizens.html.j2:1 citizens.html.j2:5 citizens.html.j2:9 citizens.html.j2:99
+#: developers.html.j2:1 developers.html.j2:5 developers.html.j2:9
+#: developers.html.j2:214 financial-news.html.j2:7 financial-news.html.j2:11
+#: financial-news.html.j2:203 governments.html.j2:1 governments.html.j2:5
+#: governments.html.j2:9 governments.html.j2:99 index.html.j2:1 index.html.j2:5
+#: index.html.j2:9 index.html.j2:80 investors.html.j2:1 investors.html.j2:5
+#: investors.html.j2:9 investors.html.j2:78 merchants.html.j2:1
+#: merchants.html.j2:5 merchants.html.j2:9 merchants.html.j2:135 news.html.j2:1
+#: news.html.j2:5 news.html.j2:9 news.html.j2:115 wallet.html.j2:7
+#: wallet.html.j2:112 wallet.html.j2:194
msgid "en"
msgstr "fr"
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 85954f2..c6c0d1f 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-19 18:48+0100\n"
+"POT-Creation-Date: 2017-01-19 19:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: it\n"
@@ -14,9 +14,17 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.3.4\n"
-#: about.html.j2:1 citizens.html.j2:1 developers.html.j2:1
-#: governments.html.j2:1 index.html.j2:1 investors.html.j2:1
-#: merchants.html.j2:1 news.html.j2:1
+#: about.html.j2:1 about.html.j2:5 about.html.j2:9 about.html.j2:116
+#: citizens.html.j2:1 citizens.html.j2:5 citizens.html.j2:9 citizens.html.j2:99
+#: developers.html.j2:1 developers.html.j2:5 developers.html.j2:9
+#: developers.html.j2:214 financial-news.html.j2:7 financial-news.html.j2:11
+#: financial-news.html.j2:203 governments.html.j2:1 governments.html.j2:5
+#: governments.html.j2:9 governments.html.j2:99 index.html.j2:1 index.html.j2:5
+#: index.html.j2:9 index.html.j2:80 investors.html.j2:1 investors.html.j2:5
+#: investors.html.j2:9 investors.html.j2:78 merchants.html.j2:1
+#: merchants.html.j2:5 merchants.html.j2:9 merchants.html.j2:135 news.html.j2:1
+#: news.html.j2:5 news.html.j2:9 news.html.j2:115 wallet.html.j2:7
+#: wallet.html.j2:112 wallet.html.j2:194
msgid "en"
msgstr "it"
diff --git a/merchants.html.j2 b/merchants.html.j2
index dbfd8df..32c1422 100644
--- a/merchants.html.j2
+++ b/merchants.html.j2
@@ -2,11 +2,11 @@
<meta charset="utf-8">
<title>{{ _("GNU Taler") }} - {{ _("Merchants") }}</title>
<meta name="description" content="">
- <!--# include file="common/header.inc" -->
+ <!--# include file="common/header.{{ _("en") }}.inc" -->
</head>
<body class="en" onload="loadLang();">
<div class="container">
- <!--# include file="common/navigation.inc" -->
+ <!--# include file="common/navigation.{{ _("en") }}.inc" -->
<!-- Jumbotron -->
<div class="jumbotron">
<h1>{{ _("Advantages for merchants") }}</h1>
@@ -132,7 +132,7 @@
</ul>
<p></p>
</div>
- <!--# include file="common/footer.inc" -->
+ <!--# include file="common/footer.{{ _("en") }}.inc" -->
</div> <!-- /container -->
</body>
</html>
diff --git a/news.html.j2 b/news.html.j2
index e528382..f3ea6b2 100644
--- a/news.html.j2
+++ b/news.html.j2
@@ -2,11 +2,11 @@
<meta charset="utf-8">
<title>{{ _("GNU Taler") }} - {{ _("News") }}</title>
<meta name="description" content="">
- <!--# include file="common/header.inc" -->
+ <!--# include file="common/header.{{ _("en") }}.inc" -->
</head>
<body class="en" onload="loadLang();">
<div class="container">
- <!--# include file="common/navigation.inc" -->
+ <!--# include file="common/navigation.{{ _("en") }}.inc" -->
<!-- Jumbotron -->
<div class="jumbotron">
<h1>{{ _("News") }}</h1>
@@ -112,7 +112,7 @@
</div>
</div>
- <!--# include file="common/footer.inc" -->
+ <!--# include file="common/footer.{{ _("en") }}.inc" -->
</div> <!-- /container -->
</body>
</html>
diff --git a/template.sh b/template.sh
index 4d498c7..54dc170 100755
--- a/template.sh
+++ b/template.sh
@@ -1,9 +1,17 @@
#!/bin/sh
-for f in $(git ls-files *.j2 common/*.j2); do
+for f in $(git ls-files *.j2); do
for ld in locale/*/; do
l=$(basename $ld)
echo "$f: $l"
- python template.py $f $l $(basename $f .html.j2).$l.html
+ python template.py $f $l $(dirname $f)/$(basename $f .html.j2).$l.html
+ done
+done
+
+for f in $(git ls-files common/*.j2); do
+ for ld in locale/*/; do
+ l=$(basename $ld)
+ echo "$f: $l"
+ python template.py $f $l $(dirname $f)/$(basename $f .inc.j2).$l.inc
done
done
diff --git a/wallet.html.j2 b/wallet.html.j2
index aa833d5..7b4914a 100644
--- a/wallet.html.j2
+++ b/wallet.html.j2
@@ -4,7 +4,7 @@
<meta charset="utf-8"/>
<title>{{ _("GNU Taler") }} - {{ _("Wallet") }}</title>
<meta name="description" content="">
- <!--# include file="common/header.inc" -->
+ <!--# include file="common/header.{{ _("en") }}.inc" -->
<link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/millncjiddlpgdmkklmhfadpacifaonc" />
<script src="web-common/taler-wallet-lib.js" type="text/javascript"></script>
@@ -109,7 +109,7 @@ document.addEventListener('DOMContentLoaded', onLoad);
<body class="en" onLoad="loadLang();">
<div class="container">
- <!--# include file="common/navigation.inc" -->
+ <!--# include file="common/navigation.{{ _("en") }}.inc" -->
<!-- Jumbotron -->
<div class="jumbotron">
<h1 lang="en">Taler Wallet</h1>
@@ -191,7 +191,7 @@ document.addEventListener('DOMContentLoaded', onLoad);
</div> <!-- /row -->
- <!--# include file="common/footer.inc" -->
+ <!--# include file="common/footer.{{ _("en") }}.inc" -->
</div> <!-- /container -->
</body>
</html>