Merge pull request #1471 from i18next/fix-getBestMatchFromCodes

jamuhl · web-flow · commit 80a38100d21a · 2020-06-21T19:07:12.000+02:00
getBestMatchFromCodes: use fallbackLng if nothing found, fixes #1470
diff --git a/src/LanguageUtils.js b/src/LanguageUtils.js
@@ -111,6 +111,9 @@ class LanguageUtil {
       });
     }
 
+    // if nothing found, use fallbackLng
+    if (!found) found = this.getFallbackCodes(this.options.fallbackLng)[0];
+
     return found;
   }
 
diff --git a/test/languageUtils.spec.js b/test/languageUtils.spec.js
@@ -228,6 +228,8 @@ describe('LanguageUtils', () => {
       { args: [['en-GB']], expected: 'en' },
       { args: [['ru', 'en-GB']], expected: 'en' },
       { args: [['de-CH']], expected: 'de-DE' },
+      { args: [['ru']], expected: 'en' },
+      { args: [[]], expected: 'en' },
     ];
 
     tests.forEach(test => {

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,9 @@ class LanguageUtil {`
`111`	`111`	`});`
`112`	`112`	`}`
`113`	`113`
	`114`	`+ // if nothing found, use fallbackLng`
	`115`	`+ if (!found) found = this.getFallbackCodes(this.options.fallbackLng)[0];`
	`116`	`+`
`114`	`117`	`return found;`
`115`	`118`	`}`
`116`	`119`