From faad607d22b1b3f617b027b0930fc74cd01afa19 Mon Sep 17 00:00:00 2001 From: Marco Prontera Date: Tue, 22 Aug 2023 10:35:53 +0200 Subject: [PATCH] Revert "fix: remove not required check" This reverts commit 78f498e2b2bad0122f4c7055acb7cc25ad302102. --- modules/core/src/GVL.ts | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/modules/core/src/GVL.ts b/modules/core/src/GVL.ts index e7b49d64..30e6cd71 100644 --- a/modules/core/src/GVL.ts +++ b/modules/core/src/GVL.ts @@ -442,37 +442,41 @@ export class GVL extends Cloneable implements VendorList { const cacheLang = lang.toUpperCase(); - this.lang_ = parsedLanguage; + if (parsedLanguage !== this.lang_) { - if (GVL.LANGUAGE_CACHE.has(cacheLang)) { + this.lang_ = parsedLanguage; - const cached: Declarations = GVL.LANGUAGE_CACHE.get(cacheLang) as Declarations; + if (GVL.LANGUAGE_CACHE.has(cacheLang)) { - for (const prop in cached) { + const cached: Declarations = GVL.LANGUAGE_CACHE.get(cacheLang) as Declarations; - if (cached.hasOwnProperty(prop)) { + for (const prop in cached) { - this[prop] = cached[prop]; + if (cached.hasOwnProperty(prop)) { + + this[prop] = cached[prop]; + + } } - } + } else { - } else { + // load Language specified + const url = GVL.baseUrl + GVL.languageFilename.replace('[LANG]', this.lang_.toLowerCase()); - // load Language specified - const url = GVL.baseUrl + GVL.languageFilename.replace('[LANG]', this.lang_.toLowerCase()); + try { - try { + await this.fetchJson(url); - await this.fetchJson(url); + this.cacheLang_ = cacheLang; + this.cacheLanguage(); - this.cacheLang_ = cacheLang; - this.cacheLanguage(); + } catch (err) { - } catch (err) { + throw new GVLError('unable to load language: ' + err.message); - throw new GVLError('unable to load language: ' + err.message); + } }