Fix localization stuff

lalomartins · Mar 11, 2021 · 6c75e8c · 6c75e8c
1 parent da2093b
commit 6c75e8c
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 134 deletions.
diff --git a/lib/calendar_page.dart b/lib/calendar_page.dart
@@ -4,6 +4,7 @@ import 'package:flushbar/flushbar.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+import 'config.dart';
 import 'widgets/achieve.dart';
 import 'date_util.dart';
 import 'db.dart';
@@ -40,6 +41,9 @@ class _CalendarPageState extends State<CalendarPage> {
           thisWeek = newWeek;
         });
     });
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      config.useLocaleDefaults(context);
+    });
   }
 
   @override

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_native_timezone/flutter_native_timezone.dart';
 import 'package:package_info/package_info.dart';
 import 'package:provider/provider.dart';
@@ -67,18 +68,25 @@ class WeeklyGoalsApp extends StatelessWidget {
       themeMode: config.themeMode,
       initialRoute: '/',
       routes: {
-        '/': (context) => OrientationBuilder(
-              builder: (BuildContext context, Orientation orientation) {
-                WidgetsBinding.instance.addPostFrameCallback((_) {
-                  config.useLocaleDefaults(context);
-                });
-                return orientation == Orientation.landscape ? CalendarPage() : CompactModePage();
-              },
-            ),
-        'settings': (context) => SettingsScreen(),
-        'add': (context) => AddScreen(),
-        'edit': (context) => EditScreen(),
+        '/': (context) {
+          return OrientationBuilder(
+            builder: (BuildContext context, Orientation orientation) {
+              return orientation == Orientation.landscape ? CalendarPage() : CompactModePage();
+            },
+          );
+        },
+        'settings': (_) => SettingsScreen(),
+        'add': (_) => AddScreen(),
+        'edit': (_) => EditScreen(),
       },
+      localizationsDelegates: [
+        GlobalMaterialLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+      ],
+      supportedLocales: [
+        const Locale('en', ''),
+        const Locale('ja', ''),
+      ],
     );
   }
 }