From fc78f3013c72ebab8e49c82cb724910b7050f065 Mon Sep 17 00:00:00 2001 From: Steven Marks Date: Wed, 10 Jun 2020 21:17:29 +0100 Subject: [PATCH 1/4] Amend to have multiple sections Changed to allow multiple sections within the json language files. --- src/localize/localize.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/localize/localize.ts b/src/localize/localize.ts index 55cf5331..6d5eaf03 100644 --- a/src/localize/localize.ts +++ b/src/localize/localize.ts @@ -7,20 +7,18 @@ var languages = { }; export function localize(string: string, search: string = '', replace: string = '') { - const section = string.split('.')[0]; - const key = string.split('.')[1]; const lang = (localStorage.getItem('selectedLanguage') || 'en').replace(/['"]+/g, '').replace('-', '_'); var tranlated: string; try { - tranlated = languages[lang][section][key]; + tranlated = string.split('.').reduce((o, i) => o[i], languages[lang]); } catch (e) { - tranlated = languages['en'][section][key]; + tranlated = string.split('.').reduce((o, i) => o[i], languages['en']); } - if (tranlated === undefined) tranlated = languages['en'][section][key]; + if (tranlated === undefined) tranlated = string.split('.').reduce((o, i) => o[i], languages['en']); if (search !== '' && replace !== '') { tranlated = tranlated.replace(search, replace); From d59fb8661c6b724cc0d9e109c040493474acb8f2 Mon Sep 17 00:00:00 2001 From: Steven Marks Date: Fri, 3 Jul 2020 21:57:46 +0100 Subject: [PATCH 2/4] Update src/localize/localize.ts Co-authored-by: Bram Kragten --- src/localize/localize.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/localize/localize.ts b/src/localize/localize.ts index 6d5eaf03..b1544aeb 100644 --- a/src/localize/localize.ts +++ b/src/localize/localize.ts @@ -10,7 +10,7 @@ export function localize(string: string, search: string = '', replace: string = const lang = (localStorage.getItem('selectedLanguage') || 'en').replace(/['"]+/g, '').replace('-', '_'); - var tranlated: string; + var translated: string; try { tranlated = string.split('.').reduce((o, i) => o[i], languages[lang]); From 975762d04964a0efaf3e207f9ae19637d1e17674 Mon Sep 17 00:00:00 2001 From: Steven Marks Date: Mon, 6 Jul 2020 16:30:53 +0100 Subject: [PATCH 3/4] Update localize.ts --- src/localize/localize.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/localize/localize.ts b/src/localize/localize.ts index b1544aeb..228c92ef 100644 --- a/src/localize/localize.ts +++ b/src/localize/localize.ts @@ -13,15 +13,15 @@ export function localize(string: string, search: string = '', replace: string = var translated: string; try { - tranlated = string.split('.').reduce((o, i) => o[i], languages[lang]); + translated = string.split('.').reduce((o, i) => o[i], languages[lang]); } catch (e) { - tranlated = string.split('.').reduce((o, i) => o[i], languages['en']); + translated = string.split('.').reduce((o, i) => o[i], languages['en']); } - if (tranlated === undefined) tranlated = string.split('.').reduce((o, i) => o[i], languages['en']); + if (translated === undefined) translated = string.split('.').reduce((o, i) => o[i], languages['en']); if (search !== '' && replace !== '') { - tranlated = tranlated.replace(search, replace); + translated = translated.replace(search, replace); } - return tranlated; + return translated; } From 7f9ac43269eeb02b38b03b09123d9dcec3f0a74a Mon Sep 17 00:00:00 2001 From: Steven Marks Date: Mon, 6 Jul 2020 16:45:58 +0100 Subject: [PATCH 4/4] Update localize.ts --- src/localize/localize.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/localize/localize.ts b/src/localize/localize.ts index 228c92ef..d1e49703 100644 --- a/src/localize/localize.ts +++ b/src/localize/localize.ts @@ -1,7 +1,7 @@ import * as en from './languages/en.json'; import * as nb from './languages/nb.json'; -var languages = { +var languages: any = { en: en, nb: nb, };