Merge pull request #3166 from acterglobal/ben-fix-gray-screen

gnunicorn · web-flow · commit d8205e97af0c · 2025-07-23T12:55:10.000+01:00
Run our own locales for Jiffy to fix gray screens
diff --git a/.changes/3166-gray-screens.md b/.changes/3166-gray-screens.md
@@ -0,0 +1 @@
+- [Fix] gray screens appearing on some locales we didn't have full support for
diff --git a/app/lib/features/main/app_shell.dart b/app/lib/features/main/app_shell.dart
@@ -5,6 +5,7 @@ import 'package:acter/common/providers/space_providers.dart';
 import 'package:acter/common/tutorial_dialogs/bottom_navigation_tutorials/bottom_navigation_tutorials.dart';
 import 'package:acter/config/constants.dart';
 import 'package:acter/common/utils/device.dart';
+import 'package:acter/features/settings/providers/notifiers/locale_notifier.dart';
 import 'package:acter/router/routes.dart';
 import 'package:acter/config/notifications/init.dart';
 import 'package:acter/features/activities/providers/activities_providers.dart';
@@ -30,6 +31,7 @@ import 'package:acter/l10n/generated/l10n.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
+import 'package:jiffy/jiffy.dart';
 import 'package:logging/logging.dart';
 import 'package:matomo_tracker/matomo_tracker.dart';
 import 'package:screenshot/screenshot.dart';
@@ -94,13 +96,24 @@ class AppShellState extends ConsumerState<AppShell> {
     _initDeepLinking();
     // initalize main providers
     _initProviders();
-
     // these want to be sure to execute in order
     await _initNotifications();
     // calendar sync
     await _initCalendarSync();
   }
 
+  void _initLocale() async {
+    final language = ref.watch(localeProvider);
+    final lang = L10n.of(context);
+    final localeRelativeDateTime = LocaleRelativeDateTime(lang);
+    await Jiffy.setLocale(
+      language,
+      startOfWeek: localeRelativeDateTime.startOfWeek(),
+      ordinals: localeRelativeDateTime.ordinals(),
+      relativeDateTime: localeRelativeDateTime,
+    );
+  }
+
   Future<void> _initTracking() async {
     // listen to matomo analytics provider for opt in or out
     ref.listenManual(matomoAnalyticsProvider, (previous, next) {
@@ -182,6 +195,7 @@ class AppShellState extends ConsumerState<AppShell> {
 
   @override
   Widget build(BuildContext context) {
+    _initLocale();
     // get platform of context.
     if (ref.watch(clientProvider).valueOrNull == null) {
       // at the very startup we might not yet have a client loaded
@@ -211,7 +225,10 @@ class AppShellState extends ConsumerState<AppShell> {
           body: Screenshot(
             controller: screenshotController,
             child: Column(
-              children: [CrossSigning(), Expanded(child: buildBody(context))],
+              children: [
+                CrossSigning(),
+                Expanded(child: buildBody(context)),
+              ],
             ),
           ),
         ),
@@ -235,9 +252,8 @@ class AppShellState extends ConsumerState<AppShell> {
       config: <Breakpoint, SlotLayoutConfig?>{
         Breakpoints.mediumLargeAndUp: SlotLayout.from(
           key: const Key('primaryNavigation'),
-          builder:
-              (BuildContext context) =>
-                  SidebarWidget(navigationShell: widget.navigationShell),
+          builder: (BuildContext context) =>
+              SidebarWidget(navigationShell: widget.navigationShell),
         ),
       },
     );
@@ -261,19 +277,15 @@ class AppShellState extends ConsumerState<AppShell> {
           key: Keys.mainNav,
           inAnimation: AdaptiveScaffold.bottomToTop,
           outAnimation: AdaptiveScaffold.topToBottom,
-          builder:
-              (context) => BottomNavigationWidget(
-                navigationShell: widget.navigationShell,
-              ),
+          builder: (context) =>
+              BottomNavigationWidget(navigationShell: widget.navigationShell),
         ),
         Breakpoints.medium: SlotLayout.from(
           key: Keys.mainNav,
           inAnimation: AdaptiveScaffold.bottomToTop,
           outAnimation: AdaptiveScaffold.topToBottom,
-          builder:
-              (context) => BottomNavigationWidget(
-                navigationShell: widget.navigationShell,
-              ),
+          builder: (context) =>
+              BottomNavigationWidget(navigationShell: widget.navigationShell),
         ),
       },
     );
diff --git a/app/lib/features/settings/providers/notifiers/locale_notifier.dart b/app/lib/features/settings/providers/notifiers/locale_notifier.dart
@@ -3,6 +3,71 @@ import 'package:acter/features/settings/model/language_model.dart';
 import 'package:acter_flutter_sdk/acter_flutter_sdk.dart';
 import 'package:flutter/foundation.dart';
 import 'package:intl/intl.dart';
+import 'package:jiffy/jiffy.dart';
+import 'package:acter/l10n/generated/l10n.dart';
+
+class LocaleRelativeDateTime extends RelativeDateTime {
+  final L10n locale;
+
+  LocaleRelativeDateTime(this.locale);
+
+  @override
+  String prefixAgo() => locale.localePrefixAgo;
+
+  @override
+  String prefixFromNow() => locale.localePrefixFromNow;
+
+  @override
+  String suffixAgo() => locale.localeSuffixAgo;
+
+  @override
+  String suffixFromNow() => locale.localeSuffixFromNow;
+
+  @override
+  String lessThanOneMinute(int seconds) => locale.localeLessThanOneMinute;
+
+  @override
+  String aboutAMinute(int minutes) => locale.localeAboutAMinute;
+
+  @override
+  String minutes(int minutes) => locale.localeMinutes(minutes);
+
+  @override
+  String aboutAnHour(int minutes) => locale.localeAboutAnHour;
+
+  @override
+  String hours(int hours) => locale.localeHours(hours);
+
+  @override
+  String aDay(int hours) => locale.localeADay;
+
+  @override
+  String days(int days) => locale.localeDays(days);
+
+  @override
+  String aboutAMonth(int days) => locale.localeAboutAMonth;
+
+  @override
+  String months(int months) => locale.localeMonths(months);
+
+  @override
+  String aboutAYear(int year) => locale.localeAboutAYear;
+
+  @override
+  String years(int years) => locale.localeYears(years);
+
+  @override
+  String wordSeparator() => locale.localeWordSeparator;
+
+  Ordinals ordinals() => Ordinals(
+    first: locale.localeOrdinalFirst,
+    second: locale.localeOrdinalSecond,
+    third: locale.localeOrdinalThird,
+    nth: locale.localeOrdinalNth,
+  );
+
+  StartOfWeek startOfWeek() => StartOfWeek.monday;
+}
 
 class LocaleNotifier extends StateNotifier<String> {
   LocaleNotifier() : super('en');
@@ -13,11 +78,10 @@ class LocaleNotifier extends StateNotifier<String> {
     final prefInstance = await sharedPrefs();
     final prefLanguageCode = prefInstance.getString(languagePrefKey);
     final deviceLanguageCode = PlatformDispatcher.instance.locale.languageCode;
-    final bool isLanguageContain =
-        LanguageModel.allLanguagesList
-            .where((element) => element.languageCode == deviceLanguageCode)
-            .toList()
-            .isNotEmpty;
+    final bool isLanguageContain = LanguageModel.allLanguagesList
+        .where((element) => element.languageCode == deviceLanguageCode)
+        .toList()
+        .isNotEmpty;
 
     if (prefLanguageCode != null) {
       _localSet(prefLanguageCode);
diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
@@ -2964,6 +2964,47 @@
   "@activism": {},
   "localGroup": "Local Group",
   "@localGroup": {},
+
+  "localePrefixAgo": "",
+  "@localePrefixAgo": {},
+  "localePrefixFromNow": "in",
+  "@localePrefixFromNow": {},
+  "localeSuffixAgo": "ago",
+  "@localeSuffixAgo": {},
+  "localeSuffixFromNow": "",
+  "@localeSuffixFromNow": {},
+  "localeLessThanOneMinute": "a few seconds",
+  "@localeLessThanOneMinute": {},
+  "localeAboutAMinute": "a minute",
+  "@localeAboutAMinute": {},
+  "localeMinutes": "{minutes} minutes",
+  "@localeMinutes": {},
+  "localeAboutAnHour": "an hour",
+  "@localeAboutAnHour": {},
+  "localeHours": "{hours} hours",
+  "@localeHours": {},
+  "localeADay": "a day",
+  "@localeADay": {},
+  "localeDays": "{days} days",
+  "localeAboutAMonth": "a month",
+  "@localeAboutAMonth": {},
+  "localeMonths": "{months} months",
+  "@localeMonths": {},
+  "localeAboutAYear": "a year",
+  "@localeAboutAYear": {},
+  "localeYears": "{years} years",
+  "@localeYears": {},
+  "localeWordSeparator": " ",
+  "@localeWordSeparator": {},
+  "localeOrdinalFirst": "st",
+  "@localeOrdinalFirst": {},
+  "localeOrdinalSecond": "nd",
+  "@localeOrdinalSecond": {},
+  "localeOrdinalThird": "rd",
+  "@localeOrdinalThird": {},
+  "localeOrdinalNth": "th",
+
+
   "unionizing": "Unionizing",
   "@unionizing": {},
   "cooperation": "Cooperatives",
diff --git a/app/lib/main.dart b/app/lib/main.dart
@@ -107,9 +107,8 @@ Future<void> _startAppInner(Widget app, bool withAnalytics) async {
 
       // allows us to check whether the user has activated tracing
       // and prevent reporting otherwise.
-      options.beforeSend =
-          (SentryEvent evt, Hint hint) =>
-              sentryBeforeSend(mainProviderContainer, evt, hint);
+      options.beforeSend = (SentryEvent evt, Hint hint) =>
+          sentryBeforeSend(mainProviderContainer, evt, hint);
     }, appRunner: () => runApp(wrappedApp));
   } else {
     runApp(wrappedApp);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+- [Fix] gray screens appearing on some locales we didn't have full support for`