zjs81/meshcore-open
1
0
Fork 0
mirror of https://github.com/zjs81/meshcore-open.git synced 2026-07-06 00:36:40 +10:00
Code Issues Packages Projects Releases 2 Wiki Activity

Validate locale override and use preferred locale list for fallback

Browse Source
This commit is contained in:
Serge Tarkovski
2026-04-25 01:03:11 +03:00
parent e03d80b71f
commit f8d00caae0
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/screens/channel_chat_screen.dart
+11 -2
View File
@@ -57,6 +57,10 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
DateTime? _lastChannelSendAt; DateTime? _lastChannelSendAt;
bool _channelSkipNextBottomSnap = false; bool _channelSkipNextBottomSnap = false;
String? _cachedFormatLocale;
late DateFormat _hmFormat;
late DateFormat _mdFormat;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@@ -1232,10 +1236,15 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
final now = DateTime.now(); final now = DateTime.now();
final diff = now.difference(time); final diff = now.difference(time);
final locale = Localizations.localeOf(context).toString(); final locale = Localizations.localeOf(context).toString();
final hm = DateFormat.Hm(locale).format(time); if (locale != _cachedFormatLocale) {
_cachedFormatLocale = locale;
_hmFormat = DateFormat.Hm(locale);
_mdFormat = DateFormat.Md(locale);
}
final hm = _hmFormat.format(time);
if (diff.inDays > 0) { if (diff.inDays > 0) {
return '${DateFormat.Md(locale).format(time)} $hm'; return '${_mdFormat.format(time)} $hm';
} else { } else {
return hm; return hm;
} }
lib/services/background_service.dart
+10 -7
View File
@@ -57,14 +57,17 @@ class BackgroundService {
final supported = AppLocalizations.supportedLocales; final supported = AppLocalizations.supportedLocales;
final override = _languageOverrideProvider?.call(); final override = _languageOverrideProvider?.call();
if (override != null && override.isNotEmpty) { if (override != null && override.isNotEmpty) {
return AppLocalizations.delegate.load(Locale(override)); final overrideLocale = Locale(override);
final isSupported = supported.any(
(l) => l.languageCode == overrideLocale.languageCode,
);
if (isSupported) {
return AppLocalizations.delegate.load(overrideLocale);
}
} }
final system = final preferred =
WidgetsBinding.instance.platformDispatcher.locale; WidgetsBinding.instance.platformDispatcher.locales;
final match = basicLocaleListResolution( final match = basicLocaleListResolution(preferred, supported);
<Locale>[system],
supported,
);
return AppLocalizations.delegate.load(match); return AppLocalizations.delegate.load(match);
} }