diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-02-08 08:23:37 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-02-08 08:23:37 +0100 |
commit | 40bb0830aa5c761cffc7706517445518affecc21 (patch) | |
tree | 1dbb0e6d8e0d783d59ebbc9bc92c224974fc98bb | |
parent | 17b634a847f0bc0f3204c3c6bd5dcdfbbf9466f2 (diff) | |
download | www-40bb0830aa5c761cffc7706517445518affecc21.tar.gz www-40bb0830aa5c761cffc7706517445518affecc21.zip |
add documentation, missing licensing statements, some DE fixes
-rw-r--r-- | Makefile | 10 | ||||
-rw-r--r-- | citizens.html.j2 | 2 | ||||
-rw-r--r-- | locale/de/LC_MESSAGES/messages.po | 25 | ||||
-rw-r--r-- | locale/en/LC_MESSAGES/messages.po | 2 | ||||
-rw-r--r-- | locale/es/LC_MESSAGES/messages.po | 2 | ||||
-rw-r--r-- | locale/fr/LC_MESSAGES/messages.po | 2 | ||||
-rw-r--r-- | locale/it/LC_MESSAGES/messages.po | 2 | ||||
-rwxr-xr-x | template.py | 9 | ||||
-rwxr-xr-x | template.sh | 9 |
9 files changed, 41 insertions, 22 deletions
@@ -1,9 +1,15 @@ | |||
1 | # This file is in the public domain. | ||
2 | |||
3 | # All: build HTML pages in all languages and compile the | ||
4 | # TypeScript logic in web-common. | ||
1 | all: locale template | 5 | all: locale template |
2 | cd web-common && tsc | 6 | cd web-common && tsc |
3 | 7 | ||
8 | # Extract translateable strings from jinga2 templates. | ||
4 | locale/messages.pot: *.j2 | 9 | locale/messages.pot: *.j2 |
5 | pybabel extract -F locale/babel.map -o locale/messages.pot . | 10 | pybabel extract -F locale/babel.map -o locale/messages.pot . |
6 | 11 | ||
12 | # Update translation (.po) files with new strings. | ||
7 | locale-update: locale/messages.pot | 13 | locale-update: locale/messages.pot |
8 | pybabel update -i locale/messages.pot -d locale -l en --previous | 14 | pybabel update -i locale/messages.pot -d locale -l en --previous |
9 | pybabel update -i locale/messages.pot -d locale -l de --previous | 15 | pybabel update -i locale/messages.pot -d locale -l de --previous |
@@ -13,6 +19,7 @@ locale-update: locale/messages.pot | |||
13 | 19 | ||
14 | if grep -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then echo -e "\nERROR: Conflicts encountered in PO files.\n"; exit 1; fi | 20 | if grep -nA1 '#-#-#-#-#' locale/*/LC_MESSAGES/messages.po; then echo -e "\nERROR: Conflicts encountered in PO files.\n"; exit 1; fi |
15 | 21 | ||
22 | # Compile translation files for use. | ||
16 | locale-compile: | 23 | locale-compile: |
17 | pybabel compile -d locale -l en --use-fuzzy | 24 | pybabel compile -d locale -l en --use-fuzzy |
18 | pybabel compile -d locale -l de --use-fuzzy | 25 | pybabel compile -d locale -l de --use-fuzzy |
@@ -20,7 +27,10 @@ locale-compile: | |||
20 | pybabel compile -d locale -l it --use-fuzzy | 27 | pybabel compile -d locale -l it --use-fuzzy |
21 | pybabel compile -d locale -l es --use-fuzzy | 28 | pybabel compile -d locale -l es --use-fuzzy |
22 | 29 | ||
30 | # Process everything related to gettext translations. | ||
23 | locale: locale-update locale-compile | 31 | locale: locale-update locale-compile |
24 | 32 | ||
33 | # Run the jinga2 templating engine to expand templates to HTML | ||
34 | # incorporating translations. | ||
25 | template: locale-compile | 35 | template: locale-compile |
26 | ./template.sh | 36 | ./template.sh |
diff --git a/citizens.html.j2 b/citizens.html.j2 index 0f5964b7..bc1019ac 100644 --- a/citizens.html.j2 +++ b/citizens.html.j2 | |||
@@ -46,7 +46,7 @@ | |||
46 | cash today.") }}</p> | 46 | cash today.") }}</p> |
47 | </div> | 47 | </div> |
48 | <div class="col-lg-6"> | 48 | <div class="col-lg-6"> |
49 | <h2>{{ _("Stability ") }}</h2> | 49 | <h2>{{ _("Stability") }}</h2> |
50 | 50 | ||
51 | <p>{{ _("Coins in your digital wallet will be of the same denomination as the | 51 | <p>{{ _("Coins in your digital wallet will be of the same denomination as the |
52 | cash in your physical wallet. So you will not have to worry about | 52 | cash in your physical wallet. So you will not have to worry about |
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po index 40781877..2dae6453 100644 --- a/locale/de/LC_MESSAGES/messages.po +++ b/locale/de/LC_MESSAGES/messages.po | |||
@@ -3,7 +3,7 @@ msgid "" | |||
3 | msgstr "" | 3 | msgstr "" |
4 | "Project-Id-Version: PROJECT VERSION\n" | 4 | "Project-Id-Version: PROJECT VERSION\n" |
5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
6 | "POT-Creation-Date: 2017-01-30 23:16+0100\n" | 6 | "POT-Creation-Date: 2017-02-08 06:20+0100\n" |
7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
9 | "Language: de\n" | 9 | "Language: de\n" |
@@ -24,7 +24,7 @@ msgstr "de" | |||
24 | #: financial-news.html.j2:5 governments.html.j2:5 index.html.j2:5 | 24 | #: financial-news.html.j2:5 governments.html.j2:5 index.html.j2:5 |
25 | #: investors.html.j2:5 merchants.html.j2:5 news.html.j2:5 wallet.html.j2:5 | 25 | #: investors.html.j2:5 merchants.html.j2:5 news.html.j2:5 wallet.html.j2:5 |
26 | msgid "GNU Taler" | 26 | msgid "GNU Taler" |
27 | msgstr "" | 27 | msgstr "GNU Taler" |
28 | 28 | ||
29 | #: about.html.j2:5 about.html.j2:14 | 29 | #: about.html.j2:5 about.html.j2:14 |
30 | msgid "About us" | 30 | msgid "About us" |
@@ -46,7 +46,6 @@ msgid "" | |||
46 | msgstr "" | 46 | msgstr "" |
47 | 47 | ||
48 | #: about.html.j2:32 | 48 | #: about.html.j2:32 |
49 | #, fuzzy | ||
50 | msgid "CFO" | 49 | msgid "CFO" |
51 | msgstr "CFO" | 50 | msgstr "CFO" |
52 | 51 | ||
@@ -73,9 +72,8 @@ msgid "PhD Student, Inria.." | |||
73 | msgstr "Doktorand, Inria." | 72 | msgstr "Doktorand, Inria." |
74 | 73 | ||
75 | #: about.html.j2:66 about.html.j2:81 | 74 | #: about.html.j2:66 about.html.j2:81 |
76 | #, fuzzy | ||
77 | msgid "Software engineer." | 75 | msgid "Software engineer." |
78 | msgstr "" | 76 | msgstr "Softwareentwickler" |
79 | 77 | ||
80 | #: about.html.j2:73 | 78 | #: about.html.j2:73 |
81 | #, fuzzy | 79 | #, fuzzy |
@@ -83,14 +81,12 @@ msgid "Sustainable business development." | |||
83 | msgstr "Des Grundes wegen" | 81 | msgstr "Des Grundes wegen" |
84 | 82 | ||
85 | #: about.html.j2:77 | 83 | #: about.html.j2:77 |
86 | #, fuzzy | ||
87 | msgid "Software engineer. Works on libebics." | 84 | msgid "Software engineer. Works on libebics." |
88 | msgstr "EBICS." | 85 | msgstr "Softwareentwickler. Arbeitet an libebics." |
89 | 86 | ||
90 | #: about.html.j2:87 | 87 | #: about.html.j2:87 |
91 | #, fuzzy | ||
92 | msgid "Translator (Spanish)" | 88 | msgid "Translator (Spanish)" |
93 | msgstr "Übersetzer" | 89 | msgstr "Übersetzer (Spanisch)" |
94 | 90 | ||
95 | #: about.html.j2:91 about.html.j2:95 | 91 | #: about.html.j2:91 about.html.j2:95 |
96 | #, fuzzy | 92 | #, fuzzy |
@@ -112,7 +108,7 @@ msgstr "Doktorand, TU München. Currently teaching." | |||
112 | #: about.html.j2:115 | 108 | #: about.html.j2:115 |
113 | #, fuzzy | 109 | #, fuzzy |
114 | msgid "Software engineer. Works on Android wallet." | 110 | msgid "Software engineer. Works on Android wallet." |
115 | msgstr "Android Geldbörse" | 111 | msgstr "Softwareentwickler. Arbeitet an der Android Geldbörse" |
116 | 112 | ||
117 | #: citizens.html.j2:5 | 113 | #: citizens.html.j2:5 |
118 | msgid "Citizens" | 114 | msgid "Citizens" |
@@ -178,7 +174,7 @@ msgstr "" | |||
178 | 174 | ||
179 | #: citizens.html.j2:42 | 175 | #: citizens.html.j2:42 |
180 | msgid "Convenience" | 176 | msgid "Convenience" |
181 | msgstr "Bequeme Einrichtung" | 177 | msgstr "Bequemlichkeit" |
182 | 178 | ||
183 | #: citizens.html.j2:44 | 179 | #: citizens.html.j2:44 |
184 | msgid "" | 180 | msgid "" |
@@ -194,7 +190,7 @@ msgstr "" | |||
194 | "\t eine SEPA-Überweisung." | 190 | "\t eine SEPA-Überweisung." |
195 | 191 | ||
196 | #: citizens.html.j2:49 | 192 | #: citizens.html.j2:49 |
197 | msgid "Stability " | 193 | msgid "Stability" |
198 | msgstr "Stabilität" | 194 | msgstr "Stabilität" |
199 | 195 | ||
200 | #: citizens.html.j2:51 | 196 | #: citizens.html.j2:51 |
@@ -818,9 +814,8 @@ msgstr "" | |||
818 | "\t auszuschließen." | 814 | "\t auszuschließen." |
819 | 815 | ||
820 | #: governments.html.j2:42 index.html.j2:39 | 816 | #: governments.html.j2:42 index.html.j2:39 |
821 | #, fuzzy | ||
822 | msgid "Libre" | 817 | msgid "Libre" |
823 | msgstr "Liberal" | 818 | msgstr "Libre" |
824 | 819 | ||
825 | #: governments.html.j2:44 | 820 | #: governments.html.j2:44 |
826 | msgid "" | 821 | msgid "" |
@@ -1115,7 +1110,7 @@ msgstr "" | |||
1115 | 1110 | ||
1116 | #: investors.html.j2:5 | 1111 | #: investors.html.j2:5 |
1117 | msgid "Investors" | 1112 | msgid "Investors" |
1118 | msgstr "" | 1113 | msgstr "Investoren" |
1119 | 1114 | ||
1120 | #: investors.html.j2:14 | 1115 | #: investors.html.j2:14 |
1121 | msgid "Operate a Taler exchange!" | 1116 | msgid "Operate a Taler exchange!" |
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po index aad11e27..e5c5c8df 100644 --- a/locale/en/LC_MESSAGES/messages.po +++ b/locale/en/LC_MESSAGES/messages.po | |||
@@ -3,7 +3,7 @@ msgid "" | |||
3 | msgstr "" | 3 | msgstr "" |
4 | "Project-Id-Version: PROJECT VERSION\n" | 4 | "Project-Id-Version: PROJECT VERSION\n" |
5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
6 | "POT-Creation-Date: 2017-01-30 23:16+0100\n" | 6 | "POT-Creation-Date: 2017-02-08 06:20+0100\n" |
7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
9 | "Language: en\n" | 9 | "Language: en\n" |
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po index f82d56a1..c0871ab6 100644 --- a/locale/es/LC_MESSAGES/messages.po +++ b/locale/es/LC_MESSAGES/messages.po | |||
@@ -3,7 +3,7 @@ msgid "" | |||
3 | msgstr "" | 3 | msgstr "" |
4 | "Project-Id-Version: PROJECT VERSION\n" | 4 | "Project-Id-Version: PROJECT VERSION\n" |
5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
6 | "POT-Creation-Date: 2017-01-30 23:16+0100\n" | 6 | "POT-Creation-Date: 2017-02-08 06:20+0100\n" |
7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
9 | "Language: es\n" | 9 | "Language: es\n" |
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index d504bc3a..a0a04eda 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po | |||
@@ -3,7 +3,7 @@ msgid "" | |||
3 | msgstr "" | 3 | msgstr "" |
4 | "Project-Id-Version: PROJECT VERSION\n" | 4 | "Project-Id-Version: PROJECT VERSION\n" |
5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
6 | "POT-Creation-Date: 2017-01-30 23:16+0100\n" | 6 | "POT-Creation-Date: 2017-02-08 06:20+0100\n" |
7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
9 | "Language: fr\n" | 9 | "Language: fr\n" |
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po index a2545ba0..dfeacc92 100644 --- a/locale/it/LC_MESSAGES/messages.po +++ b/locale/it/LC_MESSAGES/messages.po | |||
@@ -3,7 +3,7 @@ msgid "" | |||
3 | msgstr "" | 3 | msgstr "" |
4 | "Project-Id-Version: PROJECT VERSION\n" | 4 | "Project-Id-Version: PROJECT VERSION\n" |
5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | 5 | "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" |
6 | "POT-Creation-Date: 2017-01-30 23:16+0100\n" | 6 | "POT-Creation-Date: 2017-02-08 06:20+0100\n" |
7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 7 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 8 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
9 | "Language: it\n" | 9 | "Language: it\n" |
diff --git a/template.py b/template.py index e86574db..f872ad3e 100755 --- a/template.py +++ b/template.py | |||
@@ -1,5 +1,12 @@ | |||
1 | #!/usr/bin/env python | 1 | #!/usr/bin/env python |
2 | 2 | # This file is in the public domain. | |
3 | # | ||
4 | # This script runs the jinga2 templating engine on an input template-file | ||
5 | # using the specified locale for gettext translations, and outputs | ||
6 | # the resulting (HTML) ouptut-file. | ||
7 | # | ||
8 | # Note that the gettext files need to be prepared first. This script | ||
9 | # is thus to be invoked via the Makefile. | ||
3 | import os | 10 | import os |
4 | import sys | 11 | import sys |
5 | import re | 12 | import re |
diff --git a/template.sh b/template.sh index 1c743617..040f3a00 100755 --- a/template.sh +++ b/template.sh | |||
@@ -1,5 +1,12 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | # This file is in the public domain. | |
3 | # | ||
4 | # Wrapper around 'template.py', running it on all | ||
5 | # of our jinja2 input files for all languages for which | ||
6 | # we have translations. | ||
7 | # | ||
8 | # Note that the gettext files need to be prepared first. This script | ||
9 | # is thus to be invoked via the Makefile. | ||
3 | for f in $(git ls-files *.j2); do | 10 | for f in $(git ls-files *.j2); do |
4 | for ld in locale/*/; do | 11 | for ld in locale/*/; do |
5 | l=$(basename $ld) | 12 | l=$(basename $ld) |