From 805754a5996235221b3f9a8be9f3ed90e9ac3247 Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Wed, 18 Oct 2023 22:38:06 +0300 Subject: [PATCH] 10/18/3 --- lib/controller/local/translations.dart | 187 +++++++++++++++++- lib/views/Rate/rate_captain.dart | 2 +- lib/views/auth/verify_email_page.dart | 2 +- lib/views/home/Captin/home_captin.dart | 6 +- .../passenger_info_window.dart | 9 +- .../map_widget.dart/ride_begin_passenger.dart | 3 +- .../timer_to_passenger_from_driver.dart | 2 +- .../home/my_wallet/passenger_wallet.dart | 14 +- 8 files changed, 208 insertions(+), 17 deletions(-) diff --git a/lib/controller/local/translations.dart b/lib/controller/local/translations.dart index f5605f7..baf5c4d 100644 --- a/lib/controller/local/translations.dart +++ b/lib/controller/local/translations.dart @@ -89,7 +89,98 @@ class MyTranslation extends Translations { "Target": "هدف", "By selecting \"I Agree\" below, I have reviewed and agree to the Terms of Use and acknowledge the Privacy Notice. I am at least 18 years of age.": "بتحديد \"أوافق\" أدناه ، فإنني أوافق على مراجعة وقبول شروط الاستخدام وإقرار إشعار الخصوصية. أنا على الأقل 18 عامًا من العمر.", - ///// + "Update": "تحديث", + "You Should choose rate figure": "يجب عليك اختيار رقم السعر", + "Login Captin": "تسجيل دخول الكابتن", + "Register Captin": "تسجيل كابتن جديد", + "Send Verfication Code": "أرسل رمز التحقق", + "KM": "كم", + "End Ride": "إنهاء الرحلة", + "Minute": "دقيقة", + "Go to passenger Location now": "اذهب إلى موقع الراكب الآن", + "Duration of the Ride is ": "مدة الرحلة هي", + "Distance of the Ride is ": "المسافة للرحلة هي", + "Name of the Passenger is ": "اسم الراكب هو", + "Hello this is Captain": "مرحبا هذا هو الكابتن", + "Start the Ride": "بدء الرحلة", + "Please Wait If passenger want To Cancel!": + "الرجاء الانتظار إذا أراد الراكب الإلغاء!", + "Total Duration:": "المدة الإجمالية:", + "Active Duration:": "المدة الفعالة:", + "Waiting for Captin ...": "الانتظار للكابتن ...", + "Age is ": "العمر هو", + "Rating is ": "التقييم هو", + " to arrive you.": "للوصول إليك.", + "Order History": "سجل الطلبات", + "My Wallet": "محفظتي", + "Tariff": "تعرفة", + "Settings": "الإعدادات", + "Feed Back": "التغذية الراجعة", + "Promos": "العروض الترويجية", + "Please enter a valid 16-digit card number": + "الرجاء إدخال رقم بطاقة صالح مكون من 16 رقمًا", + "Add Phone": "إضافة هاتف", + "Please enter a phone number": "الرجاء إدخال رقم هاتف", + "You dont Add Emergency Phone Yet!": + "لم تقم بإضافة رقم هاتف طوارئ بعد!", + "You will arrive to your destination after ": "ستصل إلى وجهتك بعد", + "You can cancel Ride now": "يمكنك إلغاء الرحلة الآن", + "You Can cancel Ride After Captain did not come in the time": + "يمكنك إلغاء الرحلة بعد أن لا يأتي الكابتن في الوقت المحدد", + "If you in Car Now. Press Start The Ride": + "إذا كنت في السيارة الآن. اضغط على بدء الرحلة", + "You Dont Have Any amount in": "ليس لديك أي مبلغ في", + "Wallet!": "المحفظة!", + "You Have": "لديك", + "Save Credit Card": "حفظ بطاقة الائتمان", + "Show Promos": "إظهار العروض الترويجية", + "10 and get 4% discount": "10 واحصل على خصم 4%", + "20 and get 6% discount": "20 واحصل على خصم 6%", + "40 and get 8% discount": "40 واحصل على خصم 8%", + "100 and get 11% discount": "100 واحصل على خصم 11%", + "Pay with Your PayPal": "ادفع باستخدام PayPal", + "You will choose one of above !": "سوف تختار واحدة من أعلاه!", + "Cancel": "إلغاء", + "Delete My Account": "حذف حسابي", + "Edit Profile": "تعديل الملف الشخصي", + "Name": "الاسم", + "Gender": "الجنس", + "Update Gender": "تحديث الجنس", + "Education": "التعليم", + "Update Education": "تحديث التعليم", + "Employment Type": "نوع التوظيف", + "Marital Status": "الحالة الاجتماعية", + "SOS Phone": "هاتف الطوارئ", + "High School Diploma": "شهادة الثانوية العامة", + "Associate Degree": "درجة الزمالة", + "Bachelor\'s Degree": "بكالوريوس", + "Master\'s Degree": "ماجستير", + "Doctoral Degree": "دكتوراه", + "Promos For today": "العروض الترويجية لليوم", + "Copy this Promo to use it in your Ride!": + "انسخ هذا العرض لاستخدامه في رحلتك!", + "To change some Settings": "لتغيير بعض الإعدادات", + "To change Languge the App": "لتغيير لغة التطبيق", + "Order Request Page": "صفحة طلب الطلب", + "Rouats of Trip": "طرق الرحلة", + "Passenger Name is ": "اسم الراكب هو ", + "Total From Passenger is ": "المبلغ الإجمالي من الراكب هو ", + "Duration To Passenger is ": "المدة إلى الراكب هي ", + "Distance To Passenger is ": "المسافة إلى الراكب هي ", + "Total For You is ": "المبلغ الإجمالي لك هو ", + "Distance is ": "المسافة هي ", + " KM": " كيلومتر", + "Duration of Trip is ": "مدة الرحلة هي ", + " Minutes": " دقائق", + "Apply Order": "تطبيق الطلب", + "Refuse Order": "رفض الطلب", + "Rate Captain": "تقييم الكابتن", + "Enter your Note": "أدخل ملاحظتك", + "Type something...": "اكتب شيئا ما...", + "Submit rating": "إرسال التقييم", + "Rate Passenger": "تقييم الراكب", + "Ride Summary": "ملخص الرحلة" + /// // 'Saved Sucssefully': }, @@ -180,7 +271,99 @@ class MyTranslation extends Translations { "my location": "konumum", "Target": "Hedef", "By selecting \"I Agree\" below, I have reviewed and agree to the Terms of Use and acknowledge the Privacy Notice. I am at least 18 years of age.": - "Aşağıdaki \"Kabul Ediyorum\" seçeneğini seçerek, Kullanım Koşullarını gözden geçirdiğimi ve kabul ettiğimi ve Gizlilik Bildirimini kabul ettiğimi beyan ederim. En az 18 yaşındayım." + "Aşağıdaki \"Kabul Ediyorum\" seçeneğini seçerek, Kullanım Koşullarını gözden geçirdiğimi ve kabul ettiğimi ve Gizlilik Bildirimini kabul ettiğimi beyan ederim. En az 18 yaşındayım.", + "Update": "Güncelle", + "You Should choose rate figure": "Değerlendirme puanını seçmelisiniz", + "Login Captin": "Kaptan olarak giriş yap", + "Register Captin": "Kaptan olarak kayıt ol", + "Send Verfication Code": "Doğrulama kodunu gönder", + "KM": "Km", + "End Ride": "Yolculuğu bitir", + "Minute": "Dakika", + "Go to passenger Location now": "Şimdi yolcunun konumuna git", + "Duration of the Ride is ": "Yolculuğun süresi ", + "Distance of the Ride is ": "Yolculuğun mesafesi ", + "Name of the Passenger is ": "Yolcu adı ", + "Hello this is Captain": "Merhaba, ben kaptan", + "Start the Ride": "Yolculuğu başlat", + "Please Wait If passenger want To Cancel!": + "Yolcu iptal etmek isterse lütfen bekleyin!", + "Total Duration:": "Toplam süre:", + "Active Duration:": "Aktif süre:", + "Waiting for Captin ...": "Kaptan bekleniyor...", + "Age is ": "Yaş ", + "Rating is ": "Değerlendirme ", + " to arrive you.": "Size ulaşmak için.", + "Order History": "Sipariş geçmişi", + "My Wallet": "Cüzdanım", + "Tariff": "Tarife", + "Settings": "Ayarlar", + "Feed Back": "Geri bildirim", + "Promos": "Promosyonlar", + "Please enter a valid 16-digit card number": + "Lütfen geçerli 16 haneli bir kart numarası girin", + "Add Phone": "Telefon ekle", + "Please enter a phone number": "Lütfen bir telefon numarası girin", + "You dont Add Emergency Phone Yet!": + "Henüz acil durum numarası eklemediniz!", + "You will arrive to your destination after ": + "Hedefinize varmanız için", + "You can cancel Ride now": "Yolculuğu şimdi iptal edebilirsiniz", + "You Can cancel Ride After Captain did not come in the time": + "Kaptan zamanında gelmezse yolculuğu iptal edebilirsiniz", + "If you in Car Now. Press Start The Ride": + "Arabadaysanız, Yolculuğu Başlat'a basın", + "You Dont Have Any amount in": "Cüzdanınızda hiç para yok!", + "Wallet!": "Cüzdanınız!", + "You Have": "Sahipsin", + "Save Credit Card": "Kredi kartını kaydet", + "Show Promos": "Promosyonları göster", + "10 and get 4% discount": "10 yüklediğinizde %4 indirim kazanın", + "20 and get 6% discount": "20 yüklediğinizde %6 indirim kazanın", + "40 and get 8% discount": "40 yüklediğinizde %8 indirim kazanın", + "100 and get 11% discount": "100 yüklediğinizde %11 indirim kazanın", + "Pay with Your PayPal": "PayPal ile öde", + "You will choose one of above !": + "Yukarıdakiler arasından birini seçeceksiniz!", + "Cancel": "İptal", + "Delete My Account": "Hesabımı sil", + "Edit Profile": "Profili düzenle", + "Name": "Ad", + "Gender": "Cinsiyet", + "Update Gender": "Cinsiyeti güncelle", + "Education": "Eğitim", + "Update Education": "Eğitimi güncelle", + "Employment Type": "İş türü", + "Marital Status": "Medeni durum", + "SOS Phone": "Acil durum numarası", + "High School Diploma": "Lise diploması", + "Associate Degree": "Yüksek lisans", + "Bachelor\'s Degree": "Lisans", + "Master\'s Degree": "Yüksek lisans", + "Doctoral Degree": "Doktora", + "Copy this Promo to use it in your Ride!": + "Bu Promosyonu seyahatinizde kullanmak için kopyalayın!", + "To change some Settings": "Bazı ayarları değiştirmek için", + "To change Languge the App": "Uygulama dilini değiştirmek için", + "Order Request Page": "Sipariş istek sayfası", + "Rouats of Trip": "Seyahat yolları", + "Passenger Name is ": "Yolcu adı ", + "Total From Passenger is ": "Yolcudan gelen toplam tutar ", + "Duration To Passenger is ": "Yolcuya olan süre ", + "Distance To Passenger is ": "Yolcuya olan mesafe ", + "Total For You is ": "Sizin için toplam tutar ", + "Distance is ": "Mesafe ", + " KM": "Km", + "Duration of Trip is ": "Seyahat süresi ", + " Minutes": "Dakika", + "Apply Order": "Siparişi uygula", + "Refuse Order": "Siparişi reddet", + "Rate Captain": "Kaptanınızı değerlendirin", + "Enter your Note": "Notunuzu girin", + "Type something...": "Bir şeyler yazın...", + "Submit rating": "Değerlendirmeyi gönder", + "Rate Passenger": "Yolcularınızı değerlendirin", + "Ride Summary": "Seyahat özeti" }, "en": { "Choose Language": "Choose Language", diff --git a/lib/views/Rate/rate_captain.dart b/lib/views/Rate/rate_captain.dart index f71d5f7..bda99ba 100644 --- a/lib/views/Rate/rate_captain.dart +++ b/lib/views/Rate/rate_captain.dart @@ -81,7 +81,7 @@ class RateCaptainFromPassenger extends StatelessWidget { controller: controller.comment, decoration: InputDecoration( labelText: 'Enter your Note'.tr, - hintText: 'Type something...', + hintText: 'Type something...'.tr, prefixIcon: const Icon( Icons.rate_review), // Add an icon as a prefix suffixIcon: IconButton( diff --git a/lib/views/auth/verify_email_page.dart b/lib/views/auth/verify_email_page.dart index 58f9121..668e6a4 100644 --- a/lib/views/auth/verify_email_page.dart +++ b/lib/views/auth/verify_email_page.dart @@ -38,7 +38,7 @@ class VerifyEmailPage extends StatelessWidget { decoration: InputDecoration( labelStyle: AppStyle.title, border: const OutlineInputBorder(), - hintText: '5 digit', + hintText: '5 digit'.tr, counterStyle: AppStyle.number, hintStyle: AppStyle.subtitle .copyWith(color: AppColor.accentColor), diff --git a/lib/views/home/Captin/home_captin.dart b/lib/views/home/Captin/home_captin.dart index 0ca1a5d..4bb23bf 100644 --- a/lib/views/home/Captin/home_captin.dart +++ b/lib/views/home/Captin/home_captin.dart @@ -125,11 +125,13 @@ class HomeCaptain extends StatelessWidget { builder: (homeCaptainController) => Column( children: [ Text( - 'Active Duration: ${homeCaptainController.activeDuration.inSeconds} seconds', + 'Active Duration:'.tr + + ' ${homeCaptainController.activeDuration.inSeconds} seconds', style: const TextStyle(fontSize: 20), ), Text( - 'Total Duration: ${homeCaptainController.calculateTotalDuration()} seconds', + 'Total Duration:'.tr + + ' ${homeCaptainController.calculateTotalDuration()} seconds', style: const TextStyle(fontSize: 20), ), TextButton( diff --git a/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart b/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart index ad9516f..8477b94 100644 --- a/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart +++ b/lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart @@ -107,7 +107,8 @@ class PassengerInfoWindow extends StatelessWidget { launchCommunication( 'whatsapp', controller.phone.toString(), - 'Hello this is Captain ${box.read(BoxName.nameDriver)}'); + 'Hello this is Captain'.tr + + ' ${box.read(BoxName.nameDriver)}'); }, icon: const Icon( Icons.whatshot, @@ -118,7 +119,8 @@ class PassengerInfoWindow extends StatelessWidget { launchCommunication( 'sms', controller.phone.toString(), - 'Hello this is Captain ${box.read(BoxName.nameDriver)}'); + 'Hello this is Captain'.tr + + ' ${box.read(BoxName.nameDriver)}'); }, icon: const Icon( Icons.sms_rounded, @@ -129,7 +131,8 @@ class PassengerInfoWindow extends StatelessWidget { launchCommunication( 'email', controller.phone.toString(), - 'Hello this is Captain ${box.read(BoxName.nameDriver)}'); + 'Hello this is Captain'.tr + + ' ${box.read(BoxName.nameDriver)}'); }, icon: const Icon( Icons.email, diff --git a/lib/views/home/map_widget.dart/ride_begin_passenger.dart b/lib/views/home/map_widget.dart/ride_begin_passenger.dart index e099e3b..f0f91f6 100644 --- a/lib/views/home/map_widget.dart/ride_begin_passenger.dart +++ b/lib/views/home/map_widget.dart/ride_begin_passenger.dart @@ -124,7 +124,8 @@ class RideBeginPassenger extends StatelessWidget { validator: (value) { if (value!.isEmpty || value.length < 10) { - return 'Please enter a phone number'; + return 'Please enter a phone number' + .tr; } // Add additional validation if needed return null; diff --git a/lib/views/home/map_widget.dart/timer_to_passenger_from_driver.dart b/lib/views/home/map_widget.dart/timer_to_passenger_from_driver.dart index fe0017b..ef0240f 100644 --- a/lib/views/home/map_widget.dart/timer_to_passenger_from_driver.dart +++ b/lib/views/home/map_widget.dart/timer_to_passenger_from_driver.dart @@ -63,7 +63,7 @@ class TimerToPassengerFromDriver extends StatelessWidget { ), controller.remainingTimeToPassengerFromDriverAfterApplied < 60 ? MyElevatedButton( - title: 'If you in Car Now. Press Start The Ride', + title: 'If you in Car Now. Press Start The Ride'.tr, onPressed: () async { //todo start the trip and rest all counter ,start new counter of the trip time diff --git a/lib/views/home/my_wallet/passenger_wallet.dart b/lib/views/home/my_wallet/passenger_wallet.dart index bf0a3cb..a05926c 100644 --- a/lib/views/home/my_wallet/passenger_wallet.dart +++ b/lib/views/home/my_wallet/passenger_wallet.dart @@ -62,12 +62,14 @@ class PassengerWallet extends StatelessWidget { child: box.read(BoxName.passengerWalletTotal) == null ? Text( - 'You Dont Have Any amount in ${AppInfo.appName} Wallet!' - .tr, + 'You Dont Have Any amount in'.tr + + ' ${AppInfo.appName}' + + 'Wallet!'.tr, style: AppStyle.title, ) : Text( - 'You Have ${box.read(BoxName.passengerWalletTotal).toString()} JD in ${AppInfo.appName} Wallet', + 'You Have'.tr + + ' ${box.read(BoxName.passengerWalletTotal).toString()} JD in ${AppInfo.appName} Wallet', style: AppStyle.title, ), ), @@ -194,7 +196,7 @@ class PassengerWallet extends StatelessWidget { left: Get.width * .3, right: Get.width * .3, child: MyElevatedButton( - title: 'Show Promos', + title: 'Show Promos'.tr, onPressed: () { controller.changePromoSheetDialogue(); }, @@ -313,7 +315,7 @@ class PassengerWallet extends StatelessWidget { )), const Spacer(), MyElevatedButton( - title: 'Pay with Your PayPal', + title: 'Pay with Your PayPal'.tr, onPressed: () { if (controller.selectedAmount != 0) { print(controller.selectedAmount); @@ -489,7 +491,7 @@ class PassengerWallet extends StatelessWidget { }, ), MyElevatedButton( - title: 'Cancel', + title: 'Cancel'.tr, kolor: AppColor.redColor, onPressed: () { controller.changePromoSheetDialogue();