Merge pull request #234 from rdkcentral/dev

michielvandergeest · web-flow · commit 0accb42cf647 · 2021-05-07T16:16:35.000-03:00
Dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v4.3.3
+
+*7 may 2021*
+
+- Removed Error being thrown in Language plugin when using default language as a fallback
 ## v4.3.2
 
 *5 may 2021*
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v4.3.3
+
+*7 may 2021*
+
+- Removed Error being thrown in Language plugin when using default language as a fallback
 ## v4.3.2
 
 *5 may 2021*
diff --git a/docs/package.json b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/sdk",
-  "version": "4.3.2",
+  "version": "4.3.3",
   "license": "Apache-2.0",
   "scripts": {
     "postinstall": "node ./scripts/postinstall.js",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/sdk",
-  "version": "4.3.2",
+  "version": "4.3.3",
   "license": "Apache-2.0",
   "scripts": {
     "postinstall": "node ./scripts/postinstall.js",
diff --git a/src/Language/index.js b/src/Language/index.js
@@ -78,14 +78,13 @@ const setLanguage = lng => {
       if ('map' in meta && lng in meta.map && meta.map[lng] in translations) {
         language = meta.map[lng]
       } else if ('default' in meta && meta.default in translations) {
-        language = meta.default
         const error =
           'Translations for Language ' +
           language +
           ' not found. Using default language ' +
           meta.default
         Log.warn(error)
-        reject(error)
+        language = meta.default
       } else {
         const error = 'Translations for Language ' + language + ' not found.'
         Log.error(error)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@lightningjs/sdk",`
`3`		`- "version": "4.3.2",`
	`3`	`+ "version": "4.3.3",`
`4`	`4`	`"license": "Apache-2.0",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"postinstall": "node ./scripts/postinstall.js",`