Skip to content

Commit 23fc494

Browse files
kavantrivediPRBaraiya
authored andcommitted
feat: refine localization support by removing unnecessary string interpolation & dependency
1 parent 7a67f24 commit 23fc494

File tree

14 files changed

+26
-21
lines changed

14 files changed

+26
-21
lines changed

example/lib/l10n/app_ar.arb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,5 @@
6868
"thisAndFollowingEvents": "هذا الحدث والأحداث التالية",
6969
"allEvents": "جميع الأحداث",
7070
"cancel": "إلغاء",
71-
"done": "تم",
72-
"darkMode": "الوضع المظلم:"
71+
"done": "تم"
7372
}

example/lib/l10n/app_en.arb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,5 @@
6868
"thisAndFollowingEvents": "This and following events",
6969
"allEvents": "All events",
7070
"cancel": "Cancel",
71-
"done": "Done",
72-
"darkMode": "Dark mode:"
71+
"done": "Done"
7372
}

example/lib/l10n/app_es.arb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,5 @@
6868
"thisAndFollowingEvents": "Este y los siguientes eventos",
6969
"allEvents": "Todos los eventos",
7070
"cancel": "Cancelar",
71-
"done": "Hecho",
72-
"darkMode": "Modo oscuro:"
71+
"done": "Hecho"
7372
}

example/lib/localization/calendar_locales.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ class CalendarLocales {
77
am: 'a. m.',
88
pm: 'p. m.',
99
more: 'Más',
10-
numbers: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
1110
weekdays: ['L', 'M', 'X', 'J', 'V', 'S', 'D'],
1211
);
1312

@@ -30,12 +29,12 @@ class CalendarLocales {
3029
});
3130

3231
/// Initialize and register all supported calendar localizations
33-
static void initialize(String initialLocale) {
32+
static void initialize() {
3433
// Register all custom localizations
3534
PackageStrings.addLocaleObject('es', spanish);
3635
PackageStrings.addLocaleObject('ar', arabic);
3736

3837
// Set the initial locale
39-
PackageStrings.setLocale(PackageStrings.selectedLocale ?? initialLocale);
38+
PackageStrings.setLocale(PackageStrings.selectedLocale);
4039
}
4140
}

example/lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class _MyAppState extends State<MyApp> {
2727
@override
2828
void initState() {
2929
super.initState();
30-
CalendarLocales.initialize(initialLocale);
30+
CalendarLocales.initialize();
3131
}
3232

3333
// This widget is the root of your application.
@@ -58,7 +58,7 @@ class _MyAppState extends State<MyApp> {
5858
child: MaterialApp(
5959
title: 'Flutter Calendar Page Demo',
6060
debugShowCheckedModeBanner: false,
61-
locale: Locale(localeController.currentLocale, ''),
61+
locale: Locale(localeController.currentLocale),
6262
theme: AppTheme.light,
6363
darkTheme: AppTheme.dark,
6464
themeMode: isDarkMode ? ThemeMode.dark : ThemeMode.light,

example/lib/pages/mobile/mobile_home_page.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ class _MobileHomePageState extends State<MobileHomePage> {
124124
mainAxisAlignment: MainAxisAlignment.end,
125125
children: [
126126
FloatingActionButton(
127+
heroTag: null,
127128
child: Icon(
128129
Icons.dark_mode,
129130
color: context.appColors.onPrimary,
@@ -138,6 +139,7 @@ class _MobileHomePageState extends State<MobileHomePage> {
138139
),
139140
SizedBox(width: 16),
140141
FloatingActionButton(
142+
heroTag: null,
141143
child: Icon(
142144
Icons.language,
143145
color: context.appColors.onPrimary,

example/lib/pages/multi_day_view_page.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ class _MultiDayViewDemoState extends State<MultiDayViewDemo> {
2121
webWidget: WebHomePage(selectedView: CalendarView.week),
2222
mobileWidget: Scaffold(
2323
floatingActionButton: FloatingActionButton(
24-
child: Icon(Icons.add),
24+
child: Icon(
25+
Icons.add,
26+
color: context.appColors.onPrimary,
27+
),
2528
elevation: 8,
2629
onPressed: () => context.pushRoute(CreateEventPage()),
2730
),

example/lib/widgets/date_time_selector.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ class _DateTimeSelectorFormFieldState extends State<DateTimeSelectorFormField> {
151151

152152
Future<DateTime?> _showDateSelector() async {
153153
final date = await showDatePicker(
154-
context: context,
155-
initialDate: _selectedDate ?? DateTime.now(),
156-
firstDate: widget.minimumDateTime ?? CalendarConstants.minDate,
157-
lastDate: CalendarConstants.maxDate,
158-
);
154+
context: context,
155+
initialDate: _selectedDate ?? DateTime.now(),
156+
firstDate: widget.minimumDateTime ?? CalendarConstants.minDate,
157+
lastDate: CalendarConstants.maxDate,
158+
locale: Locale(PackageStrings.selectedLocale));
159159

160160
return date;
161161
}

lib/src/day_view/day_view.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
709709
initialDate: date,
710710
firstDate: _minDate,
711711
lastDate: _maxDate,
712-
locale: Locale('${PackageStrings.selectedLocale}', ''),
712+
locale: Locale(PackageStrings.selectedLocale),
713713
);
714714

715715
if (selectedDate == null) return;

lib/src/month_view/month_view.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ class MonthViewState<T extends Object?> extends State<MonthView<T>> {
378378
initialDate: date,
379379
firstDate: _minDate,
380380
lastDate: _maxDate,
381+
locale: Locale(PackageStrings.selectedLocale),
381382
);
382383

383384
if (selectedDate == null) return;

0 commit comments

Comments
 (0)