if locale has a countryCode set, fallbackTranslations should attempt …

…to merge base lang translations with fallback translations
wonderfulday-john · Dec 25, 2021 · ef037ae · ef037ae
1 parent 724c6dc
commit ef037ae
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/lib/src/easy_localization_controller.dart b/lib/src/easy_localization_controller.dart
@@ -80,7 +80,14 @@ class EasyLocalizationController extends ChangeNotifier {
       data = await loadTranslationData(_locale);
       _translations = Translations(data);
       if (useFallbackTranslations && _fallbackLocale != null) {
+        Map<String, dynamic>? baseLangData;
+        if (_locale.countryCode != null && _locale.countryCode!.isNotEmpty) {
+          baseLangData = await loadTranslationData(Locale(locale.languageCode));
+        }
         data = await loadTranslationData(_fallbackLocale!);
+        if (baseLangData != null) {
+          data.addAll(baseLangData);
+        }
         _fallbackTranslations = Translations(data);
       }
     } on FlutterError catch (e) {