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