Fix i18n issues

7 files changed, 140 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index e632abd16..1f36f8e4f 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,7 @@ appdist:
 	$(gulp) appdist
 
 i18n/strings.js: # $(ts) node_modules
+	cp i18n/strings-prelude.js i18n/strings.js
 	for pofile in i18n/*.po; do \
 	  b=`basename $$pofile`; \
 	  lang=$${b%%.po}; \
diff --git a/i18n/strings-prelude.js b/i18n/strings-prelude.js
new file mode 100644
index 000000000..0e9ddc468
--- /dev/null
+++ b/i18n/strings-prelude.js
@@ -0,0 +1,3 @@
+if (!window.i18n) {
+  throw Error("Module loading order incorrect, please load i18n module before loading i18n-strings");
+}
diff --git a/i18n/strings.js b/i18n/strings.js
index 92223aa73..77c8daf0e 100644
--- a/i18n/strings.js
+++ b/i18n/strings.js
@@ -1,3 +1,6 @@
+if (!window.i18n) {
+  throw Error("Module loading order incorrect, please load i18n module before loading i18n-strings");
+}
 i18n.strings['de-DE'] = {"domain":"de-DE","locale_data":{"de-DE":{"":{"domain":"de-DE","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":[""],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":["Bitte eine URL eingeben"],"The URL you've entered is not valid (must be absolute)":["Die eingegebene URL ist nicht gültig (muss absolut sein)"],"The bank wants to create a reserve over %1$s.":["Die Bank möchte eine Reserve über %1$s anlegen."],"%1$s\n               wants to enter a contract over %2$s\n               with you.":["%1$s\n               möchte einen Vertrag über %2$s\n               mit Ihnen abschließen."],"You are about to purchase:":["Sie sind dabei, Folgendes zu kaufen:"],"Confirm Payment":["Bezahlung bestätigen"],"Balance":["Saldo"],"History":["Verlauf"],"Debug":["Debug"],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":["Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"],"Created reserve (%1$s) of %2$s at %3$s":["Reserve (%1$s) mit %2$s bei %3$s erzeugt"],"Bank confirmed reserve (%1$s) at %2$s":["Bank bestätig anlegen der Reserve (%1$s) bei %2$s"],"Withdraw at %1$s":["Abheben bei %1$s"],"Wallet depleted reserve (%1$s) at %2$s":["Geldbörse hat die Reserve (%1$s) erschöpft"],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":["Ihre Geldbörse verzeichnet keine Vorkommnisse."]}}};
 i18n.strings['en-US'] = {"domain":"en-US","locale_data":{"en-US":{"":{"domain":"en-US","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":["DEBUG: Your balance is %2$s KUDO on %1$s. Get more at %3$s"],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"%1$s\n               wants to enter a contract over %2$s\n               with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}};
 i18n.strings['fr-FR'] = {"domain":"fr-FR","locale_data":{"fr-FR":{"":{"domain":"fr-FR","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":[""],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"%1$s\n               wants to enter a contract over %2$s\n               with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}};
diff --git a/i18n/taler-wallet-webex.pot b/i18n/taler-wallet-webex.pot
new file mode 100644
index 000000000..2be594019
--- /dev/null
+++ b/i18n/taler-wallet-webex.pot
@@ -0,0 +1,131 @@
+# This file is part of TALER
+# (C) 2016 GNUnet e.V.
+#
+# TALER is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 3, or (at your option) any later version.
+#
+# TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# TALER; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Taler Wallet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-03-18 17:42+0100\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: pages/confirm-create-reserve.tsx:92
+#, c-format
+msgid "Please enter a URL"
+msgstr ""
+
+#: pages/confirm-create-reserve.tsx:98
+#, c-format
+msgid "The URL you've entered is not valid (must be absolute)"
+msgstr ""
+
+#: pages/confirm-create-reserve.tsx:185
+#, c-format
+msgid "The bank wants to create a reserve over %1$s."
+msgstr ""
+
+#: pages/confirm-contract.tsx:79
+#, c-format
+msgid ""
+"%1$s\n"
+"               wants to enter a contract over %2$s\n"
+"               with you."
+msgstr ""
+
+#: pages/confirm-contract.tsx:84
+#, c-format
+msgid "You are about to purchase:"
+msgstr ""
+
+#: pages/confirm-contract.tsx:90
+#, c-format
+msgid "Confirm Payment"
+msgstr ""
+
+#: popup/popup.tsx:70
+#, c-format
+msgid "Balance"
+msgstr ""
+
+#: popup/popup.tsx:71
+#, c-format
+msgid "History"
+msgstr ""
+
+#: popup/popup.tsx:72
+#, c-format
+msgid "Debug"
+msgstr ""
+
+#: popup/popup.tsx:126
+#, c-format
+msgid "Error: could not retrieve balance information."
+msgstr ""
+
+#: popup/popup.tsx:136
+#, c-format
+msgid "help"
+msgstr ""
+
+#: popup/popup.tsx:139
+#, c-format
+msgid "You have no balance to show. Need some %1$s? getting started?"
+msgstr ""
+
+#: popup/popup.tsx:177
+#, c-format
+msgid "Created reserve (%1$s) of %2$s at %3$s"
+msgstr ""
+
+#: popup/popup.tsx:182
+#, c-format
+msgid "Bank confirmed reserve (%1$s) at %2$s"
+msgstr ""
+
+#: popup/popup.tsx:186
+#, c-format
+msgid "Withdraw at %1$s"
+msgstr ""
+
+#: popup/popup.tsx:189
+#, c-format
+msgid "Wallet depleted reserve (%1$s) at %2$s"
+msgstr ""
+
+#: popup/popup.tsx:195
+#, c-format
+msgid "Payment for %1$s to merchant %2$s. "
+msgstr ""
+
+#: popup/popup.tsx:202
+#, c-format
+msgid "Unknown event (%1$s)"
+msgstr ""
+
+#: popup/popup.tsx:241
+#, c-format
+msgid "Error: could not retrieve event history"
+msgstr ""
+
+#: popup/popup.tsx:250
+#, c-format
+msgid "Your wallet has no events recorded."
+msgstr ""
diff --git a/lib/i18n-strings.js b/lib/i18n-strings.js
deleted file mode 100644
index a2b0fc568..000000000
--- a/lib/i18n-strings.js
+++ /dev/null
@@ -1,4 +0,0 @@
-i18n.strings['en-US'] = {"domain":"en-US","locale_data":{"en-US":{"":{"domain":"en-US","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":["DEBUG: Your balance is %2$s KUDO on %1$s. Get more at %3$s"],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"%1$s\n               wants to enter a contract over %2$s\n               with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}};
-i18n.strings['de-DE'] = {"domain":"de-DE","locale_data":{"de-DE":{"":{"domain":"de-DE","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":[""],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":["Bitte eine URL eingeben"],"The URL you've entered is not valid (must be absolute)":["Die eingegebene URL ist nicht gültig (muss absolut sein)"],"The bank wants to create a reserve over %1$s.":["Die Bank möchte eine Reserve über %1$s anlegen."],"%1$s\n               wants to enter a contract over %2$s\n               with you.":["%1$s\n               möchte einen Vertrag über %2$s\n               mit Ihnen abschließen."],"You are about to purchase:":["Sie sind dabei, Folgendes zu kaufen:"],"Confirm Payment":["Bezahlung bestätigen"],"Balance":["Saldo"],"History":["Verlauf"],"Debug":["Debug"],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":["Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"],"Created reserve (%1$s) of %2$s at %3$s":["Reserve (%1$s) mit %2$s bei %3$s erzeugt"],"Bank confirmed reserve (%1$s) at %2$s":["Bank bestätig anlegen der Reserve (%1$s) bei %2$s"],"Withdraw at %1$s":["Abheben bei %1$s"],"Wallet depleted reserve (%1$s) at %2$s":["Geldbörse hat die Reserve (%1$s) erschöpft"],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":["Ihre Geldbörse verzeichnet keine Vorkommnisse."]}}};
-i18n.strings['fr-FR'] = {"domain":"fr-FR","locale_data":{"fr-FR":{"":{"domain":"fr-FR","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":[""],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"%1$s\n               wants to enter a contract over %2$s\n               with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}};
-i18n.strings['it-IT'] = {"domain":"it-IT","locale_data":{"it-IT":{"":{"domain":"it-IT","plural_forms":"nplurals=2; plural=(n != 1);","lang":""},"free KUDOS":[""],"DEBUG: Your balance on %1$s is %2$s KUDO. Get more at %3$s":[""],"DEBUG: Your balance is %1$s KUDO.":[""],"DEBUG: #%1$s: Your balance is %2$s KUDO.":[""],"Please enter a URL":[""],"The URL you've entered is not valid (must be absolute)":[""],"The bank wants to create a reserve over %1$s.":[""],"%1$s\n               wants to enter a contract over %2$s\n               with you.":[""],"You are about to purchase:":[""],"Confirm Payment":[""],"Balance":[""],"History":[""],"Debug":[""],"Error: could not retrieve balance information.":[""],"You have no balance to show. Want to get some %1$s?":[""],"Created reserve (%1$s) of %2$s at %3$s":[""],"Bank confirmed reserve (%1$s) at %2$s":[""],"Withdraw at %1$s":[""],"Wallet depleted reserve (%1$s) at %2$s":[""],"Payment for %1$s to merchant %2$s. ":[""],"Unknown event (%1$s)":[""],"Error: could not retrieve event history":[""],"Your wallet has no events recorded.":[""]}}};
diff --git a/lib/i18n.ts b/lib/i18n.ts
index b48eb291a..3c7106422 100644
--- a/lib/i18n.ts
+++ b/lib/i18n.ts
@@ -53,9 +53,9 @@ function init () {
   if ("function" !== typeof JedModule) {
     return;
   }
-
   if (!(i18n.lang in i18n.strings)) {
     i18n.lang = "en-US";
+    return;
   }
   jed = new JedModule(i18n.strings[i18n.lang]);
 }
diff --git a/tsconfig.json b/tsconfig.json
index 0e6337d86..0ce2125c5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -33,4 +33,4 @@
     "pages/confirm-create-reserve.tsx",
     "test/tests/taler.ts"
   ]
-}
\ No newline at end of file
+}