11/17/1

lib/controller/local/local_controller.dart

@@ -20,72 +20,58 @@ class LocaleController extends GetxController {
       case "ar":
         locale = const Locale("ar");
         appTheme = themeArabic;
-        box.write(BoxName.lang, 'ar');
         break;
       case "en":
         locale = const Locale("en");
         appTheme = themeEnglish;
-        box.write(BoxName.lang, 'en');
         break;
       case "tr":
         locale = const Locale("tr");
         appTheme = themeEnglish;
-        box.write(BoxName.lang, 'tr');
         break;
       case "fr":
         locale = const Locale("fr");
         appTheme = themeEnglish;
-        box.write(BoxName.lang, 'fr');
         break;
       case "it":
         locale = const Locale("it");
         appTheme = themeEnglish;
-        box.write(BoxName.lang, 'it');
         break;
       case "de":
         locale = const Locale("de");
         appTheme = themeEnglish;
-        box.write(BoxName.lang, 'de');
         break;
       case "el":
         locale = const Locale("el");
         appTheme = themeEnglish;
-        box.write(BoxName.lang, 'el');
         break;
       case "es":
         locale = const Locale("es");
         appTheme = themeEnglish;
-        box.write(BoxName.lang, 'es');
         break;
       case "fa":
         locale = const Locale("fa");
-        appTheme = themeEnglish;
-        box.write(BoxName.lang, 'fa');
+        appTheme = themeArabic;
         break;
       case "zh":
         locale = const Locale("zh");
         appTheme = themeEnglish;
-        box.write(BoxName.lang, 'zh');
         break;
       case "ru":
         locale = const Locale("ru");
         appTheme = themeEnglish;
-        box.write(BoxName.lang, 'ru');
         break;
       case "hi":
         locale = const Locale("hi");
         appTheme = themeEnglish;
-        box.write(BoxName.lang, 'hi');
         break;
       default:
         locale = Locale(Get.deviceLocale!.languageCode);
-        box.write(BoxName.lang, Get.deviceLocale!.languageCode);
         appTheme = themeEnglish;
         break;
     }
 
     box.write(BoxName.lang, langcode);
-    // box.write(BoxName.lang, langcode);
     Get.changeTheme(appTheme);
     Get.updateLocale(locale);
     restartApp();
@@ -94,62 +80,15 @@ class LocaleController extends GetxController {
 
   @override
   void onInit() {
-    String storedLang = box.read(BoxName.lang) ?? "ar";
-    switch (storedLang) {
-      case "ar":
-        language = const Locale("ar");
-        appTheme = themeArabic;
-        break;
-      case "en":
-        language = const Locale("en");
-        appTheme = themeEnglish;
-        break;
-      case "tr":
-        language = const Locale("tr");
-        appTheme = themeEnglish;
-        break;
-      case "fr":
-        language = const Locale("fr");
-        appTheme = themeEnglish;
-        break;
-      case "it":
-        language = const Locale("it");
-        appTheme = themeEnglish;
-        break;
-      case "de":
-        language = const Locale("de");
-        appTheme = themeEnglish;
-        break;
-      case "el":
-        language = const Locale("el");
-        appTheme = themeEnglish;
-        break;
-      case "es":
-        language = const Locale("es");
-        appTheme = themeEnglish;
-        break;
-      case "fa":
-        language = const Locale("fa");
-        appTheme = themeArabic;
-        break;
-      case "zh":
-        language = const Locale("zh");
-        appTheme = themeEnglish;
-        break;
-      case "ru":
-        language = const Locale("ru");
-        appTheme = themeEnglish;
-        break;
-      case "hi":
-        language = const Locale("hi");
-        appTheme = themeEnglish;
-        break;
-      default:
-        language = Locale(Get.deviceLocale!.languageCode);
-        appTheme = themeEnglish;
-        break;
+    String? storedLang = box.read(BoxName.lang);
+    if (storedLang == null) {
+      // Use device language if no language is stored
+      storedLang = Get.deviceLocale!.languageCode;
+      box.write(BoxName.lang, storedLang);
     }
 
+    changeLang(storedLang);
+
     super.onInit();
   }
 }

lib/controller/local/translations.dart

@@ -52,13 +52,18 @@ class MyTranslation extends Translations {
           "Pick or Tap to confirm": "حدد أو انقر للتأكيد",
           "Select Order Type": "حدد نوع الطلب",
           "Choose who this order is for": "اختر لمن هذا الطلب",
+          "Order Accepted": "تم قبول الطلب", "with type": "مع النوع",
+          "accepted your order at price": "قبل طلبك بالسعر",
           "I want to order for myself": "أريد أن أطلب لنفسي",
           "I want to order for someone else": "أريد أن أطلب لشخص آخر",
           "Cancel Trip from driver": "إلغاء الرحلة من السائق",
+          "Order Cancelled": "تم إلغاء الطلب",
+          "you canceled order": "لقد قمت بإلغاء الطلب",
           "If you want order to another person": "إذا كنت تريد الطلب لشخص آخر",
           "Ok I will go now.": "حسنًا، سأذهب الآن.",
           "Hi, I will go now": "مرحبًا، سأذهب الآن.",
           "upgrade price": "رفع السعر",
+          'Please enter a correct phone': 'يرجى إدخال رقم هاتف صحيح',
           'airport': 'مطار',
           "Best choice for a comfortable car with a flexible route and stop points. This airport offers visa entry at this price.":
               "أفضل اختيار لسيارة مريحة مع طريق ونقاط توقف مرنة. يقدم هذا المطار تأشيرة دخول بهذا السعر.",