From dbf11d7daf526574bf2f7c9ef8cbca7ce56ae635 Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Thu, 19 Jan 2017 19:46:02 +0100 Subject: i18n: fix common includes --- about.html.j2 | 6 +++--- citizens.html.j2 | 6 +++--- developers.html.j2 | 6 +++--- financial-news.html.j2 | 6 +++--- governments.html.j2 | 6 +++--- index.html.j2 | 6 +++--- investors.html.j2 | 6 +++--- locale/de/LC_MESSAGES/messages.po | 16 ++++++++++++---- locale/en/LC_MESSAGES/messages.po | 16 ++++++++++++---- locale/es/LC_MESSAGES/messages.po | 16 ++++++++++++---- locale/fr/LC_MESSAGES/messages.po | 16 ++++++++++++---- locale/it/LC_MESSAGES/messages.po | 16 ++++++++++++---- merchants.html.j2 | 6 +++--- news.html.j2 | 6 +++--- template.sh | 12 ++++++++++-- wallet.html.j2 | 6 +++--- 16 files changed, 100 insertions(+), 52 deletions(-) diff --git a/about.html.j2 b/about.html.j2 index 61108094..5a6a2d69 100644 --- a/about.html.j2 +++ b/about.html.j2 @@ -2,11 +2,11 @@ {{ _("GNU Taler") }} - {{ _("About us") }} - +
- +

{{ _("About us") }}

@@ -113,7 +113,7 @@

{{ _("Software engineer. Works on Android wallet.") }}

- + diff --git a/citizens.html.j2 b/citizens.html.j2 index 43593de2..897d1e92 100644 --- a/citizens.html.j2 +++ b/citizens.html.j2 @@ -2,11 +2,11 @@ {{ _("GNU Taler") }} - {{ _("Citizens") }} - +
- +

{{ _("Advantages for citizens") }}

@@ -96,7 +96,7 @@

- +
diff --git a/developers.html.j2 b/developers.html.j2 index 963b8f45..8097b389 100644 --- a/developers.html.j2 +++ b/developers.html.j2 @@ -2,11 +2,11 @@ {{ _("GNU Taler") }} - {{ _("Developers") }} - +
- +

{{ _("Taler for developers") }}

@@ -211,7 +211,7 @@

- +
diff --git a/financial-news.html.j2 b/financial-news.html.j2 index 4a06e583..b85d7fdb 100644 --- a/financial-news.html.j2 +++ b/financial-news.html.j2 @@ -4,11 +4,11 @@ {{ _("GNU Taler") }} - {{ _("Financial News") }} - +
- +

{{ _("Financial News") }}

@@ -200,7 +200,7 @@

Source

- + diff --git a/governments.html.j2 b/governments.html.j2 index 1ca62d54..9e388026 100644 --- a/governments.html.j2 +++ b/governments.html.j2 @@ -2,11 +2,11 @@ {{ _("GNU Taler") }} - {{ _("Governments") }} - +
- +

{{ _("Advantages for governments") }}

@@ -96,7 +96,7 @@

- +
diff --git a/index.html.j2 b/index.html.j2 index b5c59e1a..ba4e9090 100644 --- a/index.html.j2 +++ b/index.html.j2 @@ -2,11 +2,11 @@ {{ _("GNU Taler") }} - +
- +
Taler logo @@ -77,7 +77,7 @@ for transactions and the ability to give change. ") }}

- +
diff --git a/investors.html.j2 b/investors.html.j2 index dbd6ab0d..d622c67a 100644 --- a/investors.html.j2 +++ b/investors.html.j2 @@ -2,11 +2,11 @@ {{ _("GNU Taler") }} - {{ _("Investors") }} - +
- +

{{ _("Operate a Taler exchange!") }}

@@ -75,7 +75,7 @@

- +
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po index 5cd5b5f5..8f853dbd 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 \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 17ac9f9c..92d226b4 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 \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 07cf7f53..db21b3cc 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 \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 69a3ea17..c271e808 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 \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 85954f29..c6c0d1fe 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 \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 dbfd8df6..32c14224 100644 --- a/merchants.html.j2 +++ b/merchants.html.j2 @@ -2,11 +2,11 @@ {{ _("GNU Taler") }} - {{ _("Merchants") }} - +
- +

{{ _("Advantages for merchants") }}

@@ -132,7 +132,7 @@

- +
diff --git a/news.html.j2 b/news.html.j2 index e5283823..f3ea6b23 100644 --- a/news.html.j2 +++ b/news.html.j2 @@ -2,11 +2,11 @@ {{ _("GNU Taler") }} - {{ _("News") }} - +
- +

{{ _("News") }}

@@ -112,7 +112,7 @@
- + diff --git a/template.sh b/template.sh index 4d498c71..54dc1709 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 aa833d57..7b4914a2 100644 --- a/wallet.html.j2 +++ b/wallet.html.j2 @@ -4,7 +4,7 @@ {{ _("GNU Taler") }} - {{ _("Wallet") }} - + @@ -109,7 +109,7 @@ document.addEventListener('DOMContentLoaded', onLoad);
- +

Taler Wallet

@@ -191,7 +191,7 @@ document.addEventListener('DOMContentLoaded', onLoad);
- +
-- cgit v1.2.3