Starting state for all PO files.

10 files changed, 115 insertions, 53 deletions

diff --git a/talerbackoffice/backoffice/templates/Makefile b/talerbackoffice/backoffice/templates/Makefile
index ba531d1..3a0643c 100644
--- a/talerbackoffice/backoffice/templates/Makefile
+++ b/talerbackoffice/backoffice/templates/Makefile
@@ -1,16 +1,15 @@
+
+
 # This file is in the public domain.
 
-# All: build HTML pages in all languages and compile the
-# TypeScript logic in web-common.
-all: locale
-	true
+.PHONY: extract
 
 # Extract translateable strings from jinja2 templates.
-locale/messages.pot: *.html
+extract: *.html
 	pybabel extract -F translations/babel.map -o translations/messages.pot .
 
 # Update translation (.po) files with new strings.
-locale-update: locale/messages.pot
+update: translations/messages.pot
 	msgmerge -U -m --previous translations/en/LC_MESSAGES/messages.po translations/messages.pot 
 	msgmerge -U -m --previous translations/de/LC_MESSAGES/messages.po translations/messages.pot
 	msgmerge -U -m --previous translations/fr/LC_MESSAGES/messages.po translations/messages.pot
@@ -19,10 +18,8 @@ locale-update: locale/messages.pot
 	msgmerge -U -m --previous translations/ru/LC_MESSAGES/messages.po translations/messages.pot
 	msgmerge -U -m --previous translations/pt/LC_MESSAGES/messages.po translations/messages.pot
 
-	if grep -nA1 '#-#-#-#-#' translations/*/LC_MESSAGES/messages.po; then echo -e "\nERROR: Conflicts encountered in PO files.\n"; exit 1; fi
-
 # Compile translation files for use.
-locale-compile:
+compile:
 	pybabel compile -d translations -l en --use-fuzzy
 	pybabel compile -d translations -l de --use-fuzzy
 	pybabel compile -d translations -l fr --use-fuzzy
@@ -30,12 +27,3 @@ locale-compile:
 	pybabel compile -d translations -l es --use-fuzzy
 	pybabel compile -d translations -l ru --use-fuzzy
 	pybabel compile -d translations -l pt --use-fuzzy
-
-# Process everything related to gettext translations.
-locale: locale-update locale-compile
-
-# Run the jinja2 templating engine to expand templates to HTML
-# incorporating translations.  NOTE; likely NOT needed when another
-# templating is happening -- like in a Flask settlement.
-template: locale-compile
-	./template.py
diff --git a/talerbackoffice/backoffice/templates/translations/de/LC_MESSAGES/messages.po b/talerbackoffice/backoffice/templates/translations/de/LC_MESSAGES/messages.po
index 4b63635..eed9a21 100644
--- a/talerbackoffice/backoffice/templates/translations/de/LC_MESSAGES/messages.po
+++ b/talerbackoffice/backoffice/templates/translations/de/LC_MESSAGES/messages.po
@@ -7,19 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-07-31 11:29+0200\n"
+"POT-Creation-Date: 2018-09-03 15:35+0200\n"
 "PO-Revision-Date: 2018-07-31 11:37+0200\n"
 "Last-Translator: Marcello Stanisci <stanisci.m@gmail.com>\n"
 "Language-Team: German\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: backoffice.html.j2:4
+#: backoffice.html:4
 msgid ""
-"This is the Taler backoffice facility. Through it, the user can see the "
-"money flow from Taler transactions to wire transfers and viceversa."
+"This is the Taler backoffice facility.  Through it,\n"
+"  the user can see the money flow from Taler transactions to\n"
+"  wire transfers and viceversa."
+msgstr ""
+
+#: backoffice.html:14
+msgid "Current instance:"
 msgstr ""
diff --git a/talerbackoffice/backoffice/templates/translations/en/LC_MESSAGES/messages.po b/talerbackoffice/backoffice/templates/translations/en/LC_MESSAGES/messages.po
index 839d17f..0059a91 100644
--- a/talerbackoffice/backoffice/templates/translations/en/LC_MESSAGES/messages.po
+++ b/talerbackoffice/backoffice/templates/translations/en/LC_MESSAGES/messages.po
@@ -7,21 +7,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-07-31 11:29+0200\n"
+"POT-Creation-Date: 2018-09-03 15:35+0200\n"
 "PO-Revision-Date: 2018-07-31 11:37+0200\n"
 "Last-Translator: Marcello Stanisci <stanisci.m@gmail.com>\n"
 "Language-Team: English\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
-"Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: backoffice.html.j2:4
+#: backoffice.html:4
+#, fuzzy
+#| msgid ""
+#| "This is the Taler backoffice facility. Through it, the user can see the "
+#| "money flow from Taler transactions to wire transfers and viceversa."
 msgid ""
-"This is the Taler backoffice facility. Through it, the user can see the "
-"money flow from Taler transactions to wire transfers and viceversa."
+"This is the Taler backoffice facility.  Through it,\n"
+"  the user can see the money flow from Taler transactions to\n"
+"  wire transfers and viceversa."
 msgstr ""
 "This is the Taler backoffice facility. Through it, the user can see the "
 "money flow from Taler transactions to wire transfers and viceversa."
+
+#: backoffice.html:14
+msgid "Current instance:"
+msgstr ""
diff --git a/talerbackoffice/backoffice/templates/translations/es/LC_MESSAGES/messages.po b/talerbackoffice/backoffice/templates/translations/es/LC_MESSAGES/messages.po
index b44c00c..cebf853 100644
--- a/talerbackoffice/backoffice/templates/translations/es/LC_MESSAGES/messages.po
+++ b/talerbackoffice/backoffice/templates/translations/es/LC_MESSAGES/messages.po
@@ -7,21 +7,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-07-31 11:29+0200\n"
+"POT-Creation-Date: 2018-09-03 15:35+0200\n"
 "PO-Revision-Date: 2018-07-31 11:53+0200\n"
 "Last-Translator: Marcello Stanisci <stanisci.m@gmail.com>\n"
 "Language-Team: English\n"
+"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
-"Language: en_US\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: backoffice.html.j2:4
+#: backoffice.html:4
+#, fuzzy
+#| msgid ""
+#| "This is the Taler backoffice facility. Through it, the user can see the "
+#| "money flow from Taler transactions to wire transfers and viceversa."
 msgid ""
-"This is the Taler backoffice facility. Through it, the user can see the "
-"money flow from Taler transactions to wire transfers and viceversa."
+"This is the Taler backoffice facility.  Through it,\n"
+"  the user can see the money flow from Taler transactions to\n"
+"  wire transfers and viceversa."
 msgstr ""
 "This is the Taler backoffice facility. Through it, the user can see the "
 "money flow from Taler transactions to wire transfers and viceversa."
+
+#: backoffice.html:14
+msgid "Current instance:"
+msgstr ""
diff --git a/talerbackoffice/backoffice/templates/translations/fr/LC_MESSAGES/messages.po b/talerbackoffice/backoffice/templates/translations/fr/LC_MESSAGES/messages.po
index 8baa214..065d475 100644
--- a/talerbackoffice/backoffice/templates/translations/fr/LC_MESSAGES/messages.po
+++ b/talerbackoffice/backoffice/templates/translations/fr/LC_MESSAGES/messages.po
@@ -7,19 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-07-31 11:29+0200\n"
+"POT-Creation-Date: 2018-09-03 15:35+0200\n"
 "PO-Revision-Date: 2018-07-31 11:37+0200\n"
 "Last-Translator: Marcello Stanisci <stanisci.m@gmail.com>\n"
 "Language-Team: French\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: backoffice.html.j2:4
+#: backoffice.html:4
 msgid ""
-"This is the Taler backoffice facility. Through it, the user can see the "
-"money flow from Taler transactions to wire transfers and viceversa."
+"This is the Taler backoffice facility.  Through it,\n"
+"  the user can see the money flow from Taler transactions to\n"
+"  wire transfers and viceversa."
+msgstr ""
+
+#: backoffice.html:14
+msgid "Current instance:"
 msgstr ""
diff --git a/talerbackoffice/backoffice/templates/translations/it/LC_MESSAGES/messages.po b/talerbackoffice/backoffice/templates/translations/it/LC_MESSAGES/messages.po
index c017fc7..042993d 100644
--- a/talerbackoffice/backoffice/templates/translations/it/LC_MESSAGES/messages.po
+++ b/talerbackoffice/backoffice/templates/translations/it/LC_MESSAGES/messages.po
@@ -7,19 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-07-31 11:29+0200\n"
+"POT-Creation-Date: 2018-09-03 15:35+0200\n"
 "PO-Revision-Date: 2018-07-31 11:37+0200\n"
 "Last-Translator: Marcello Stanisci <stanisci.m@gmail.com>\n"
 "Language-Team: Italian\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: backoffice.html.j2:4
+#: backoffice.html:4
 msgid ""
-"This is the Taler backoffice facility. Through it, the user can see the "
-"money flow from Taler transactions to wire transfers and viceversa."
+"This is the Taler backoffice facility.  Through it,\n"
+"  the user can see the money flow from Taler transactions to\n"
+"  wire transfers and viceversa."
 msgstr ""
+
+#: backoffice.html:14
+msgid "Current instance:"
+msgstr "Istanza negozio attiva:"
diff --git a/talerbackoffice/backoffice/templates/translations/messages.pot b/talerbackoffice/backoffice/templates/translations/messages.pot
new file mode 100644
index 0000000..f17b733
--- /dev/null
+++ b/talerbackoffice/backoffice/templates/translations/messages.pot
@@ -0,0 +1,30 @@
+# Translations template for PROJECT.
+# Copyright (C) 2018 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2018-09-03 15:35+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+#: backoffice.html:4
+msgid ""
+"This is the Taler backoffice facility.  Through it,\n"
+"  the user can see the money flow from Taler transactions to\n"
+"  wire transfers and viceversa."
+msgstr ""
+
+#: backoffice.html:14
+msgid "Current instance:"
+msgstr ""
+
diff --git a/talerbackoffice/backoffice/templates/translations/pt/LC_MESSAGES/messages.po b/talerbackoffice/backoffice/templates/translations/pt/LC_MESSAGES/messages.po
index 603e0e8..c90ad25 100644
--- a/talerbackoffice/backoffice/templates/translations/pt/LC_MESSAGES/messages.po
+++ b/talerbackoffice/backoffice/templates/translations/pt/LC_MESSAGES/messages.po
@@ -7,19 +7,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-07-31 11:29+0200\n"
+"POT-Creation-Date: 2018-09-03 15:35+0200\n"
 "PO-Revision-Date: 2018-07-31 11:37+0200\n"
 "Last-Translator: Marcello Stanisci <stanisci.m@gmail.com>\n"
 "Language-Team: Portuguese\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: backoffice.html.j2:4
+#: backoffice.html:4
 msgid ""
-"This is the Taler backoffice facility. Through it, the user can see the "
-"money flow from Taler transactions to wire transfers and viceversa."
+"This is the Taler backoffice facility.  Through it,\n"
+"  the user can see the money flow from Taler transactions to\n"
+"  wire transfers and viceversa."
+msgstr ""
+
+#: backoffice.html:14
+msgid "Current instance:"
 msgstr ""
diff --git a/talerbackoffice/backoffice/templates/translations/ru/LC_MESSAGES/messages.po b/talerbackoffice/backoffice/templates/translations/ru/LC_MESSAGES/messages.po
index 1bb3f01..78838e0 100644
--- a/talerbackoffice/backoffice/templates/translations/ru/LC_MESSAGES/messages.po
+++ b/talerbackoffice/backoffice/templates/translations/ru/LC_MESSAGES/messages.po
@@ -7,20 +7,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-07-31 11:29+0200\n"
+"POT-Creation-Date: 2018-09-03 15:35+0200\n"
 "PO-Revision-Date: 2018-07-31 11:37+0200\n"
 "Last-Translator: Marcello Stanisci <stanisci.m@gmail.com>\n"
 "Language-Team: Russian\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
-"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: backoffice.html.j2:4
+#: backoffice.html:4
 msgid ""
-"This is the Taler backoffice facility. Through it, the user can see the "
-"money flow from Taler transactions to wire transfers and viceversa."
+"This is the Taler backoffice facility.  Through it,\n"
+"  the user can see the money flow from Taler transactions to\n"
+"  wire transfers and viceversa."
+msgstr ""
+
+#: backoffice.html:14
+msgid "Current instance:"
 msgstr ""
diff --git a/talerbackoffice/backoffice/trans_dirs.cfg b/talerbackoffice/backoffice/trans_dirs.cfg
new file mode 100644
index 0000000..e15a05d
--- /dev/null
+++ b/talerbackoffice/backoffice/trans_dirs.cfg
@@ -0,0 +1 @@
+BABEL_TRANSLATION_DIRECTORIES = "templates/translations/"