translations added

assets/locale/ru-RU.json

@@ -1,52 +1,52 @@
 {
-  "profile_select_lang": "Dil saýlamak",
-  "my_orders": "Sargytlarym",
-  "follow_orders": "öz ýüküňizi yzarlaň",
-  "order_history": "Sargytlaryň taryhy",
-  "order_history_desc": "şu ýerde siziň sargytlaryňyz wagt tertipi boyunça görkezilen",
-  "order_not_available": "Siziň ýapylan sargytlaryňyz ýok",
-  "personal_cabinet": "Şahsy otagym",
-  "splash_text": "Довезём всё!",
-  "start_tracking": "Yzarlap başlaň",
-  "track_cargo": "Öz sargydyňyzy yzarlaň",
-  "cargo_app": "Cargo goşundy",
-  "exit_app": "Exit Application",
-  "are_you_sure": "Are You Sure?",
-  "yes": "Hawa",
-  "no": "Ýok",
-  "login_header": "Şahsy otaga giriş",
-  "login_desc": "özüňize berlen logini we açar sözi giriziň",
-  "login": "Giriş",
-  "login_hint": "Öz loginiňizi ýazyň",
-  "password": "Açar sözi",
-  "password_hint": "Öz açar sözüni ýazyň",
-  "credentials_validation_header": "Invalid credentials",
-  "credentials_validation_body": "Username or Password Wrong!",
-  "required_validation": "This field can't be empty",
-  "order": "Sargyt",
-  "order_info": "Sargyt barada maglumat",
-  "route": "Gatnaw yoly",
-  "order_status": "Ýagdaýy",
-  "order_carrier": "Awtoulag №",
-  "order_shop": "Dükan №",
-  "order_from": "Nireden ugradyldy",
-  "order_to": "Nirä barmaly",
-  "order_placement_count": "Ýer sany",
-  "order_volume": "Kuby",
-  "order_dimensions": "Göwrümi",
-  "order_dimensions_desc": "(ini, uzynlygy, beýikligi)",
-  "order_product_name": "Harydyň ady",
-  "contact_support": "Habarlaşmak üçin",
-  "privacy_policy": "Gizlinlik syýasaty",
-  "use_terms": "Ulanyş şertleri",
-  "logout": "Şahsy otagdan çykmak",
-  "order_details": "Giňişleýin",
-  "order_from_card": "Nireden",
-  "order_to_card": "Nirä",
-  "order_sent": "Ugradylan senesi",
-  "Reserved": "Rezerw",
-  "Received": "Kabul edildi",
-  "Delivered": "Gowşuryldy",
-  "image_preview": "Image Preview",
-  "error_message": "Something went wrong. Please try again."
+  "profile_select_lang": "Язык",
+  "my_orders": "Мои заказы",
+  "follow_orders": "отслеживайте свой груз",
+  "order_history": "История заказов",
+  "order_history_desc": "здест ваши заказы указаны по времени",
+  "order_not_available": "У вас пока еще нет закрытых заказов",
+  "personal_cabinet": "Личный кабинет",
+  "splash_text": "Логистика с гарантией качества!",
+  "start_tracking": "Войти",
+  "track_cargo": "Отслеживайте ваш груз 24/7",
+  "cargo_app": "Мобмльное приложение CARGO 66",
+  "exit_app": "Выйти из системы",
+  "are_you_sure": "Вы уверены?",
+  "yes": "Да",
+  "no": "Нет",
+  "login_header": "Для входа в приложение",
+  "login_desc": "введите предоставленный вам логин и пароль",
+  "login": "Логин",
+  "login_hint": "введите свой логин",
+  "password": "Пароль",
+  "password_hint": "введите свой пароль",
+  "credentials_validation_header": "Неправильные данные",
+  "credentials_validation_body": "Логин или пароль неправильные!",
+  "required_validation": "Это поле не должно быть пустым",
+  "order": "Заказ",
+  "order_info": "Информация о заказе",
+  "route": "Маршруе",
+  "order_status": "Груз",
+  "order_carrier": "Автомашина №",
+  "order_shop": "Магазин №",
+  "order_from": "Откуда",
+  "order_to": "Куда",
+  "order_placement_count": "Кол-во мест",
+  "order_volume": "Куб",
+  "order_dimensions": "Размеры",
+  "order_dimensions_desc": "(шир, длина, выс)",
+  "order_product_name": "Название товара",
+  "contact_support": "Наши контакты",
+  "privacy_policy": "Политика конфиденциальности",
+  "use_terms": "Правила пользования",
+  "logout": "Выйти из личного кабинета",
+  "order_details": "Подробнее",
+  "order_from_card": "Откуда",
+  "order_to_card": "Куда",
+  "order_sent": "Дата отправки",
+  "Reserved": "Зарезервировано",
+  "Received": "Получено",
+  "Delivered": "Доставлено",
+  "image_preview": "Предварительный просмотр",
+  "error_message": "Что-то пошло не так. Пожалуйста, попробуйте еще раз."
 }

assets/locale/tr-TR.json

@@ -1,32 +1,32 @@
 {
-  "profile_select_lang": "Dil saýlamak",
+  "profile_select_lang": "Dil",
   "my_orders": "Sargytlarym",
   "follow_orders": "öz ýüküňizi yzarlaň",
   "order_history": "Sargytlaryň taryhy",
-  "order_history_desc": "şu ýerde siziň sargytlaryňyz wagt tertipi boyunça görkezilen",
+  "order_history_desc": "şu ýerde siziň öňki sargytlaryňyz wagt tertipi boyunça görkezilendir",
   "order_not_available": "Siziň ýapylan sargytlaryňyz ýok",
-  "personal_cabinet": "Şahsy otagym",
+  "personal_cabinet": "Şahsy otag",
   "splash_text": "Довезём всё!",
-  "start_tracking": "Yzarlap başlaň",
-  "track_cargo": "Öz sargydyňyzy yzarlaň",
-  "cargo_app": "Cargo goşundy",
-  "exit_app": "Exit Application",
-  "are_you_sure": "Are You Sure?",
+  "start_tracking": "Ulgama gir",
+  "track_cargo": "Ýükiňizi 24 sagadyň dowamynda yzarlamak indi elýeterli",
+  "cargo_app": "Cargo 66 mobil goşundy",
+  "exit_app": "Ulgamdan çyk",
+  "are_you_sure": "Siz dogurdanam ulgamdan çykmak isleýärsiňizmi?",
   "yes": "Hawa",
   "no": "Ýok",
-  "login_header": "Şahsy otaga giriş",
-  "login_desc": "özüňize berlen logini we açar sözi giriziň",
-  "login": "Giriş",
-  "login_hint": "Öz loginiňizi ýazyň",
+  "login_header": "Şahsy otaga girmek üçin",
+  "login_desc": "özüňize berlen logini we açar sözi yazyň",
+  "login": "Login",
+  "login_hint": "öz loginiňizi ýazyň",
   "password": "Açar sözi",
-  "password_hint": "Öz açar sözüni ýazyň",
-  "credentials_validation_header": "Invalid credentials",
-  "credentials_validation_body": "Username or Password Wrong!",
-  "required_validation": "This field can't be empty",
+  "password_hint": "öz açar sözüňizi ýazyň",
+  "credentials_validation_header": "Nädogry maglumat",
+  "credentials_validation_body": "Login ýa-da açar sözi ýalňyş!",
+  "required_validation": "Meýdança boş durmaly däl",
   "order": "Sargyt",
   "order_info": "Sargyt barada maglumat",
-  "route": "Gatnaw yoly",
-  "order_status": "Ýagdaýy",
+  "route": "Gatnaw ýoly",
+  "order_status": "Ýük",
   "order_carrier": "Awtoulag №",
   "order_shop": "Dükan №",
   "order_from": "Nireden ugradyldy",
@@ -39,14 +39,16 @@
   "contact_support": "Habarlaşmak üçin",
   "privacy_policy": "Gizlinlik syýasaty",
   "use_terms": "Ulanyş şertleri",
-  "logout": "Şahsy otagdan çykmak",
-  "order_details": "Giňişleýin",
+  "logout": "Ulgamdan çyk",
+  "order_details": "Doly maglumat",
   "order_from_card": "Nireden",
   "order_to_card": "Nirä",
   "order_sent": "Ugradylan senesi",
-  "Reserved": "Rezerw",
+  "Reserved": "Ýer aýrylyp goýuldy",
   "Received": "Kabul edildi",
   "Delivered": "Gowşuryldy",
-  "image_preview": "Image Preview",
-  "error_message": "Something went wrong. Please try again."
+  "image_preview": "Surat",
+  "error_message": "Näsazlyk ýüze çykdy. Täzeden synanşyp görmegiňizi haýyş edýäris.",
+  "follow_orders_banner": "Öz sargydyňyzy yzarlaň",
+  "order_empty": "Siziň heniz sargydyňyz ýok"
 }

lib/presentation/screens/histories_screen.dart

@@ -82,8 +82,10 @@ class _HistoriesScreenState extends State<HistoriesScreen> {
                   );
                 } else if (state is OrderLoaded) {
                   if (state.orders.isEmpty) {
-                    return const SliverToBoxAdapter(
-                      child: EmptyOrder(),
+                    return SliverToBoxAdapter(
+                      child: EmptyOrder(
+                        text: 'order_not_available'.tr(),
+                      ),
                     );
                   }
 

lib/presentation/screens/login.dart

@@ -131,6 +131,8 @@ class _LoginScreenState extends State<LoginScreen> {
                                 ),
                               ),
 
+                              Space.yf(0.5),
+
                               Text(
                                 'login_desc'.tr(),
                                 style: const TextStyle(

lib/presentation/screens/orders.dart

@@ -91,7 +91,7 @@ class _OrdersScreenState extends State<OrdersScreen> with AutomaticKeepAliveClie
                     return SliverToBoxAdapter(
                       child: SizedBox(
                         height: MediaQuery.of(context).size.height / 2.5,
-                        child: const EmptyOrder(),
+                        child: EmptyOrder(text: 'order_empty'.tr()),
                       ),
                     );
                   }

lib/presentation/screens/splash2.dart

@@ -34,6 +34,7 @@ class Splash2Screen extends StatelessWidget {
           child: Center(
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.center,
               children: [
                 Text(
                   'cargo_app'.tr(),
@@ -41,6 +42,7 @@ class Splash2Screen extends StatelessWidget {
                     color: Colors.white,
                     fontSize: 40,
                   ),
+                  textAlign: TextAlign.center,
                 ),
 
                 /// gap
@@ -53,6 +55,7 @@ class Splash2Screen extends StatelessWidget {
                     color: AppColors.yellow,
                     fontSize: 22,
                   ),
+                  textAlign: TextAlign.center,
                 ),
 
                 /// gap

lib/presentation/widgets/empty_order.dart

@@ -1,11 +1,11 @@
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 
 import '../../configs/space.dart';
 import '../../core/constants/constants.dart';
 
 class EmptyOrder extends StatelessWidget {
-  const EmptyOrder({super.key});
+  final String text;
+  const EmptyOrder({super.key, required this.text});
 
   @override
   Widget build(BuildContext context) {
@@ -27,7 +27,7 @@ class EmptyOrder extends StatelessWidget {
               ),
             ),
             Space.yf(),
-            Text('order_not_available'.tr()),
+            Text(text),
           ],
         ),
       ),

lib/presentation/widgets/info_card.dart

@@ -19,7 +19,7 @@ class InfoCard extends StatelessWidget {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              RowTextWidget(title: '${'order_status'.tr()}:', info: order.state),
+              RowTextWidget(title: '${'order_status'.tr()}:', info: order.state.tr()),
               Space.y!,
               RowTextWidget(title: '${'order_carrier'.tr()}:', info: order.carrier),
               Space.y!,

lib/presentation/widgets/order_card.dart

@@ -60,7 +60,7 @@ class OrderCard extends StatelessWidget {
                 const Icon(Icons.circle, color: AppColors.green, size: 12),
                 const SizedBox(width: 4),
                 Text(
-                  order.state,
+                  order.state.tr(),
                   style: AppText.b2b!.copyWith(
                     color: AppColors.grey,
                   ),

lib/presentation/widgets/order_header.dart

@@ -1,3 +1,4 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 
 import '../../configs/configs.dart';
@@ -24,15 +25,19 @@ class OrderHeader extends StatelessWidget {
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                Text(
-                  'Cargo goşundy',
-                  style: AppText.h1b?.copyWith(
-                    color: Colors.white,
+                SizedBox(
+                  width: MediaQuery.of(context).size.width * 0.50,
+                  child: Text(
+                    'cargo_app'.tr(),
+                    style: AppText.h1b?.copyWith(
+                      color: Colors.white,
+                    ),
+                    textAlign: TextAlign.center,
                   ),
                 ),
                 Space.yf(0.30),
                 Text(
-                  'Öz sargydyňyzy yzarlaň',
+                  'follow_orders_banner'.tr(),
                   style: AppText.b1?.copyWith(
                     color: AppColors.yellow,
                   ),