From 665c1d80726ce2ffdf0020de9c4dd293ccbee849 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 16 Nov 2016 10:23:42 +0100
Subject: add JSX classes for translation

---
 playground/animation.html |   6 +-
 playground/contract.html  |   7 +-
 src/i18n.ts               | 205 ----------------------------------------------
 tsconfig.json             |   8 +-
 4 files changed, 10 insertions(+), 216 deletions(-)
 delete mode 100644 src/i18n.ts
diff --git a/playground/animation.html b/playground/animation.html
index eec913c65..893276b3f 100644
--- a/playground/animation.html
+++ b/playground/animation.html
@@ -2,11 +2,11 @@
 <html>
   <head>
     <title>Spinner playground</title>
-    <script src="../lib/vendor/system-csp-production.src.js"></script>
+    <script src="/src/vendor/system-csp-production.src.js"></script>
   </head>
   <html>
     <div style="display: none;">
-      <img src="../img/icon.png" id="taler-logo" style="display:hidden;">
+      <img src="/img/icon.png" id="taler-logo" style="display:hidden;">
     </div>
     <br />
     <div id="container"></div>
@@ -17,7 +17,7 @@
                       defaultJSExtensions: true,
                     });
 
-      System.import("../lib/wallet/chromeBadge")
+      System.import("/src/chromeBadge")
             .then((badge) => {
               let b = new badge.ChromeBadge(window);
               window.badge = b;
diff --git a/playground/contract.html b/playground/contract.html
index 3bc7d3480..20365aac8 100644
--- a/playground/contract.html
+++ b/playground/contract.html
@@ -3,9 +3,8 @@
 <head>
   <title>Contract playground</title>
   <meta charset="UTF-8">
-  <script src="../lib/vendor/mithril.js"></script>
-  <script src="../lib/i18n.js"></script>
-  <script src="../lib/vendor/system-csp-production.src.js"></script>
+  <script src="/src/i18n.js"></script>
+  <script src="/src/vendor/system-csp-production.src.js"></script>
   <script type="application/javascript">
     var contract = {
       "H_wire": "ADVPV6Q9P0GF74CD5H5ENYCC862AM34ZS93JDQR2G09SR8868YMPYCVQP8WGGVVYZDY2ZMG703TQESN837VBAEDCGMS2D2RADKFKW08",
@@ -52,7 +51,7 @@
   });
 
   document.addEventListener("DOMContentLoaded", () => {
-    System.import("../lib/wallet/renderHtml")
+    System.import("/src/renderHtml")
       .then((render) => {
         let r = render.renderContract(contract);
         let component = {view: function () {return r;}}
diff --git a/src/i18n.ts b/src/i18n.ts
deleted file mode 100644
index c91b385a7..000000000
--- a/src/i18n.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- 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, see <http://www.gnu.org/licenses/>
- */
-
-"use strict";
-
-document.addEventListener(
-  "DOMContentLoaded",
-  function () {
-    try {
-      document.body.lang = chrome.i18n.getUILanguage();
-    } catch (e) {
-      // chrome.* not available?
-    }
-  });
-
-declare var i18n: any;
-
-/**
- * Information about the last two i18n results, used by plural()
- * 2-element array, each element contains { stringFound: boolean, pluralValue: number }
- */
-var i18nResult = <any>[];
-
-const JedModule: any = (window as any)["Jed"];
-var jed: any;
-
-
-class PluralNumber {
-  n: number;
-
-  constructor(n: number) {
-    this.n = n;
-  }
-
-  valueOf () {
-    return this.n;
-  }
-
-  toString () {
-    return this.n.toString();
-  }
-}
-
-
-/**
- * Initialize Jed
- */
-function init () {
-  if ("object" === typeof jed) {
-    return;
-  }
-  if ("function" !== typeof JedModule) {
-    return;
-  }
-  if (!(i18n.lang in i18n.strings)) {
-    i18n.lang = "en-US";
-    return;
-  }
-  jed = new JedModule(i18n.strings[i18n.lang]);
-}
-
-
-/**
- * Convert template strings to a msgid
- */
-function toI18nString(strings: string[]) {
-  let str = "";
-  for (let i = 0; i < strings.length; i++) {
-    str += strings[i];
-    if (i < strings.length - 1) {
-      str += "%"+ (i+1) +"$s";
-    }
-  }
-  return str;
-}
-
-
-/**
- * Use the first number in values to determine plural form
- */
-function getPluralValue (values: any) {
-  let n = null;
-  for (let i = 0; i < values.length; i++) {
-    if ("number" === typeof values[i] || values[i] instanceof PluralNumber) {
-      if (null === n || values[i] instanceof PluralNumber) {
-        n = values[i].valueOf();
-      }
-    }
-  }
-  return (null === n) ? 1 : n;
-}
-
-
-/**
- * Store information about the result of the last to i18n() or i18n.parts()
- *
- * @param i18nString   the string template as found in i18n.strings
- * @param pluralValue  value returned by getPluralValue()
- */
-function setI18nResult (i18nString: string, pluralValue: number) {
-  i18nResult[1] = i18nResult[0];
-  i18nResult[0] = {
-    stringFound: i18nString in i18n.strings[i18n.lang].locale_data[i18n.lang],
-    pluralValue: pluralValue
-  };
-}
-
-
-/**
- * Internationalize a string template with arbitrary serialized values.
- */
-var i18n = <any>function i18n(strings: string[], ...values: any[]) {
-  init();
-  //console.log('i18n:', strings, values);
-  if ("object" !== typeof jed) {
-    // Fallback implementation in case i18n lib is not there
-    return String.raw(strings as any, ...values);
-  }
-
-  let str = toI18nString (strings);
-  let n = getPluralValue (values);
-  let tr = jed.translate(str).ifPlural(n, str).fetch(...values);
-
-  setI18nResult (str, n);
-  return tr;
-};
-
-try {
-  i18n.lang = chrome.i18n.getUILanguage();
-} catch (e) {
-  console.warn("i18n default language not available");
-}
-i18n.strings = {};
-
-
-/**
- * Interpolate i18nized values with arbitrary objects.
- * @return Array of strings/objects.
- */
-i18n.parts = function(strings: string[], ...values: any[]) {
-  init();
-  if ("object" !== typeof jed) {
-    // Fallback implementation in case i18n lib is not there
-    let parts: string[] = [];
-
-    for (let i = 0; i < strings.length; i++) {
-      parts.push(strings[i]);
-      if (i < values.length) {
-        parts.push(values[i]);
-      }
-    }
-    return parts;
-  }
-
-  let str = toI18nString (strings);
-  let n = getPluralValue (values);
-  let tr = jed.ngettext(str, str, n).split(/%(\d+)\$s/);
-  let parts: string[] = [];
-  for (let i = 0; i < tr.length; i++) {
-    if (0 == i % 2) {
-      parts.push(tr[i]);
-    } else {
-      parts.push(values[parseInt(tr[i]) - 1]);
-    }
-  }
-
-  setI18nResult (str, n);
-  return parts;
-};
-
-
-/**
- * Pluralize based on first numeric parameter in the template.
- * @todo The plural argument is used for extraction by pogen.js
- */
-i18n.plural = function (singular: any, plural: any) {
-  if (i18nResult[1].stringFound) { // string found in translation file?
-    // 'singular' has the correctly translated & pluralized text
-    return singular;
-  } else {
-    // return appropriate form based on value found in 'singular'
-    return (1 == i18nResult[1].pluralValue) ? singular : plural;
-  }
-};
-
-
-/**
- * Return a number that is used to determine the plural form for a template.
- */
-i18n.number = function (n : number) {
-  return new PluralNumber (n);
-};
diff --git a/tsconfig.json b/tsconfig.json
index 502512ae0..e79ad03ce 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,14 +16,14 @@
     "src/checkable.ts",
     "decl/lib.es6.d.ts",
     "src/chromeBadge.ts",
-    "src/cryptoApi-test.ts",
     "decl/urijs/URIjs.d.ts",
+    "src/cryptoApi-test.ts",
     "src/components.ts",
-    "src/emscriptif-test.ts",
     "decl/systemjs/systemjs.d.ts",
+    "src/emscriptif-test.ts",
     "src/cryptoApi.ts",
-    "src/helpers-test.ts",
     "decl/react-global.d.ts",
+    "src/helpers-test.ts",
     "src/cryptoLib.ts",
     "src/types-test.ts",
     "decl/chrome/chrome.d.ts",
@@ -32,13 +32,13 @@
     "src/emscriptif.ts",
     "src/helpers.ts",
     "src/http.ts",
-    "src/i18n.ts",
     "src/query.ts",
     "src/taler-wallet-lib.ts",
     "src/types.ts",
     "src/wallet.ts",
     "src/wxApi.ts",
     "src/wxBackend.ts",
+    "src/i18n.tsx",
     "src/renderHtml.tsx",
     "src/background/background.ts",
     "src/content_scripts/notify.ts",
-- 
cgit v1.2.3

