optimize getBestMatchFromCodes for i18next/i18next-browser-languageDe…

…tector#281
i18next · Mar 8, 2024 · f7b8176 · f7b8176
1 parent 4685bea
commit f7b8176
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 23.10.1
+
+- optimize getBestMatchFromCodes for https://github.com/i18next/i18next-browser-languageDetector/issues/281
+
 ## 23.10.0
 
 - Add 'isInitializing' property so we're able to detect init() was already called [2141](https://github.com/i18next/i18next/issues/2141)

diff --git a/i18next.js b/i18next.js
@@ -948,7 +948,8 @@
           found = this.options.supportedLngs.find(supportedLng => {
             if (supportedLng === lngOnly) return supportedLng;
             if (supportedLng.indexOf('-') < 0 && lngOnly.indexOf('-') < 0) return;
-            if (supportedLng.indexOf(lngOnly) === 0) return supportedLng;
+            if (supportedLng.indexOf('-') > 0 && lngOnly.indexOf('-') < 0 && supportedLng.substring(0, supportedLng.indexOf('-')) === lngOnly) return supportedLng;
+            if (supportedLng.indexOf(lngOnly) === 0 && lngOnly.length > 1) return supportedLng;
           });
         });
       }

diff --git a/i18next.min.js b/i18next.min.js
diff --git a/src/LanguageUtils.js b/src/LanguageUtils.js
@@ -98,11 +98,16 @@ class LanguageUtil {
         found = this.options.supportedLngs.find((supportedLng) => {
           if (supportedLng === lngOnly) return supportedLng;
           if (supportedLng.indexOf('-') < 0 && lngOnly.indexOf('-') < 0) return;
-          if (supportedLng.indexOf(lngOnly) === 0) return supportedLng;
+          if (
+            supportedLng.indexOf('-') > 0 &&
+            lngOnly.indexOf('-') < 0 &&
+            supportedLng.substring(0, supportedLng.indexOf('-')) === lngOnly
+          )
+            return supportedLng;
+          if (supportedLng.indexOf(lngOnly) === 0 && lngOnly.length > 1) return supportedLng;
         });
       });
     }
-
     // if nothing found, use fallbackLng
     if (!found) found = this.getFallbackCodes(this.options.fallbackLng)[0];
 

diff --git a/test/runtime/languageUtils.test.js b/test/runtime/languageUtils.test.js
@@ -316,6 +316,8 @@ describe('LanguageUtils', () => {
       { args: [['ru', 'en-GB']], expected: 'en' },
       { args: [['de-CH']], expected: 'de-DE' },
       { args: [['ru']], expected: 'en' },
+      { args: [['c']], expected: 'en' },
+      { args: [['e']], expected: 'en' },
       { args: [[]], expected: 'en' },
     ];