taler-typescript-core

Wallet core logic and WebUIs for various components
Log | Files | Refs | Submodules | README | LICENSE

commit bc7cfc07ed351d4dd002ff74eea6fe396b437459
parent 532185337515a7426f16fdbfb6e9d4b790849ef7
Author: tg(x) <*@tg-x.net>
Date:   Tue, 23 Feb 2016 18:37:10 +0100

revert i18n.parts

Diffstat:
Mextension/lib/i18n.ts | 12+++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/extension/lib/i18n.ts b/extension/lib/i18n.ts @@ -54,7 +54,7 @@ var i18n = <any>function i18n(strings, ...values) { let str = getI18nString (strings); let n = getPluralValue (values); console.log('i18n:', n, str, strings, values); - console.log('i18n:', jed.translate(str).ifPlural(n, str).fetch(...values);); + console.log('i18n:', jed.translate(str).ifPlural(n, str).fetch(...values)); return jed.translate(str).ifPlural(n, str).fetch(...values); }; @@ -64,10 +64,20 @@ i18n.strings = {}; // Interpolate i18nized values with arbitrary objects and // return array of strings/objects. i18n.parts = function(strings, ...values) { + let parts = []; + for (let i = 0; i < strings.length; i++) { + parts.push(strings[i]); + if (i < values.length) { + parts.push(values[i]); + } + } + return parts; +/* init(); let str = getI18nString (strings); let n = getPluralValue (values); console.log('i18n.parts:', n, str, values, ...values); console.log('i18n.parts:', jed.translate(str).ifPlural(n, str).fetch(...values)); return jed.translate(str).ifPlural(n, str).fetch(...values); +*/ };