diff --git a/lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart index cb4bbb91..a2acd887 100644 --- a/lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; +import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; @@ -40,7 +41,7 @@ class _DailyFragmentState extends State { mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - snapshot.isCalendarLoading ? const Center(child: CircularProgressIndicator()) : DateFormat("EEEE, d MMMM, yyyy").format(DateTime.now()).heading5(context), + snapshot.isCalendarLoading ? const Center(child: CircularProgressIndicator()) : DateFormat("EEEE, d MMMM, yyyy", context.isAr? "ar" : "en").format(DateTime.now()).heading5(context), if (snapshot.calendarRequests?.requestsDetails?.isNotEmpty ?? false) const Divider().defaultStyle(context), ListView.separated( shrinkWrap: true, diff --git a/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart index ca51eaac..ace1b1a2 100644 --- a/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:table_calendar/table_calendar.dart'; +import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; @@ -51,7 +52,7 @@ class _MonthlyFragmentState extends State { rowHeight: 45, availableGestures: AvailableGestures.none, calendarBuilders: CalendarBuilders( - headerTitleBuilder: (context, dateTime) => CalendarHeader(dateFormat: DateFormat("MMMM, yyyy"), dateTime: dateTime).onPress(() async { + headerTitleBuilder: (context, dateTime) => CalendarHeader(dateFormat: DateFormat("MMMM, yyyy", context.isAr? "ar" : "en"), dateTime: dateTime).onPress(() async { final result = await showDatePicker( context: context, initialDate: _initialDate, @@ -66,7 +67,7 @@ class _MonthlyFragmentState extends State { } }), dowBuilder: (context, dateTime) { - final day = DateFormat("EE").format(dateTime).toUpperCase(); + final day = DateFormat("EE", context.isAr? "ar" : "en").format(dateTime).toUpperCase(); return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: AppColor.neutral50)); }, defaultBuilder: (context, dateTime, _) { @@ -103,7 +104,7 @@ class _MonthlyFragmentState extends State { children: [ const CircleAvatar(backgroundColor: AppColor.primary40, radius: 8), 8.width, - "My Requests".heading6(context), + context.translation.myRequests.heading6(context), ], ), 16.height, diff --git a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart index eb23bad0..62dde8b7 100644 --- a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:table_calendar/table_calendar.dart'; +import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; @@ -60,13 +61,13 @@ class _WeeklyFragmentState extends State { headerTitleBuilder: (context, dateTime) => Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - DateFormat("EEEE, d MMMM, yyyy").format(dateTime).heading5(context), + DateFormat("EEEE, d MMMM, yyyy", context.isAr? "ar" : "en").format(dateTime).heading5(context), 8.height, const Divider().defaultStyle(context), ], ), dowBuilder: (context, dateTime) { - final day = DateFormat("EE").format(dateTime).toUpperCase(); + final day = DateFormat("EE", context.isAr? "ar" : "en").format(dateTime).toUpperCase(); return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: AppColor.neutral50)); }, defaultBuilder: (context, dateTime, _) {