taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

fixed i18n.parts

Browse Source
This commit is contained in:
tg(x) 2016-02-23 19:51:34 +01:00
parent 3d57f2edbf
commit 70f001aacc
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
extension/lib/i18n.ts
View File

@ -28,7 +28,7 @@ function init () {
} }
} }
function getI18nString (strings) { function toI18nString (strings) {
let str = ''; let str = '';
for (let i = 0; i < strings.length; i++) { for (let i = 0; i < strings.length; i++) {
str += strings[i]; str += strings[i];
@ -51,11 +51,13 @@ function getPluralValue (values) {
var i18n = <any>function i18n(strings, ...values) { var i18n = <any>function i18n(strings, ...values) {
init(); init();
let str = getI18nString (strings); let str = toI18nString (strings);
let n = getPluralValue (values); let n = getPluralValue (values);
console.log('i18n:', n, str, strings, values); let tr = jed.translate(str).ifPlural(n, str).fetch(...values);
console.log('i18n:', jed.translate(str).ifPlural(n, str).fetch(...values)); console.log('i18n:', 'n: ', n, 'strings:', strings, 'values:', values);
return jed.translate(str).ifPlural(n, str).fetch(...values); console.log('i18n:', 'str:', str);
console.log('i18n:', 'tr:', tr);
return tr;
}; };
i18n.lang = chrome.i18n.getUILanguage(); i18n.lang = chrome.i18n.getUILanguage();
@ -64,20 +66,21 @@ i18n.strings = {};
// Interpolate i18nized values with arbitrary objects and // Interpolate i18nized values with arbitrary objects and
// return array of strings/objects. // return array of strings/objects.
i18n.parts = function(strings, ...values) { i18n.parts = function(strings, ...values) {
init();
let str = toI18nString (strings);
let n = getPluralValue (values);
let tr = jed.ngettext(str, str, n).split(/%(\d+)\$s/);
let parts = []; let parts = [];
for (let i = 0; i < strings.length; i++) { for (let i = 0; i < tr.length; i++) {
parts.push(strings[i]); if (0 == i % 2) {
if (i < values.length) { parts.push(tr[i]);
parts.push(values[i]); } else {
parts.push(values[parseInt(tr[i]) - 1]);
} }
} }
console.log('i18n.parts:', 'n: ', n, 'strings:', strings, 'values:', values);
console.log('i18n.parts:', 'str:', str);
console.log('i18n.parts:', 'parts:', parts);
return parts; 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);
*/
}; };