feat: prefer language code over region code

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.7.0
+
+- Prefer language code over region code.
+
 ## 1.6.1
 
 - Add more unit tests.

README.md

@@ -10,7 +10,7 @@ Lightweight i18n solution. Use JSON files to create typesafe translations.
 
 ```yaml
 dependencies:
-  fast_i18n: ^1.6.1
+  fast_i18n: ^1.7.0
 
 dev_dependencies:
   build_runner: any

example/README.md

@@ -4,7 +4,7 @@
 
 ```yaml
 dependencies:
-  fast_i18n: ^1.6.1
+  fast_i18n: ^1.7.0
 
 dev_dependencies:
   build_runner: any

lib/fast_i18n.dart

@@ -26,12 +26,16 @@ class FastI18n {
         orElse: () => null);
     if (selected != null) return selected;
 
-    // 2nd try: match the first or the second part
+    // 2nd try: match the first part (language)
     List<String> deviceLocaleParts = candidate.split('-');
     selected = supported.firstWhere(
-        (element) =>
-            element == deviceLocaleParts.first ||
-            element == deviceLocaleParts.last,
+        (element) => element == deviceLocaleParts.first,
+        orElse: () => null);
+    if (selected != null) return selected;
+
+    // 3rd try: match the second part (region)
+    selected = supported.firstWhere(
+        (element) => element == deviceLocaleParts.last,
         orElse: () => null);
     if (selected != null) return selected;
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: fast_i18n
 description: Lightweight i18n solution. Use JSON files to create typesafe translations.
-version: 1.6.1
+version: 1.7.0
 homepage: https://github.com/Tienisto/flutter-fast-i18n
 
 environment:

test/fast_i18n_test.dart

@@ -23,6 +23,10 @@ void testSelectLocale() {
       expect(FastI18n.selectLocale('de_DE', ['en', 'de']), 'de');
     });
 
+    test('prefer first part over second part', () {
+      expect(FastI18n.selectLocale('en_DE', ['de', 'en']), 'en');
+    });
+
     test('match last part', () {
       expect(FastI18n.selectLocale('en_US', ['us', 'de']), 'us');
     });