Update root_widget.dart

Jonny Borges · GitHub
Commit 9bb5245946a38efd25b1e6c4aeba80b87dc68644 9bb52459 1 parent 8bd40117
Showing 1 changed file with 6 additions and 6 deletions
lib/src/navigation/root/root_widget.dart
--- a/lib/src/navigation/root/root_widget.dart
View file @9bb5245
+++ b/lib/src/navigation/root/root_widget.dart
View file @9bb5245
@@ -261,6 +261,7 @@ abstract class Translations {
   Map<String, Map<String, String>> get keys;
 }
+
 extension Trans on String {
   String get tr {
     // Returns the key if locale is null.
@@ -279,9 +280,8 @@ extension Trans on String {
         Get.translations[Get.locale.languageCode].containsKey(this)) {
       return Get.translations[Get.locale.languageCode][this];
       // If there is no corresponding language or corresponding key, return the key.
-    } else if (Get.fallbackLocale == null) {
-      return this;
-    } else if (Get.translations.containsKey(
+    } else if (Get.fallbackLocale != null) {
+      if (Get.translations.containsKey(
               "${Get.fallbackLocale.languageCode}_${Get.fallbackLocale.countryCode}") &&
           Get.translations[
                   "${Get.fallbackLocale.languageCode}_${Get.fallbackLocale.countryCode}"]
@@ -289,11 +289,11 @@ extension Trans on String {
         return Get.translations[
                 "${Get.fallbackLocale.languageCode}_${Get.fallbackLocale.countryCode}"]
             [this];
-
-      // Checks if there is a callback language in the absence of the specific country, and if it contains that key.
-    } else if (Get.translations.containsKey(Get.fallbackLocale.languageCode) &&
+      }
+      if (Get.translations.containsKey(Get.fallbackLocale.languageCode) &&
           Get.translations[Get.fallbackLocale.languageCode].containsKey(this)) {
         return Get.translations[Get.fallbackLocale.languageCode][this];
+      }
     } else {
       return this;
     }