Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fallback to supported locale if easy_localization doesn't support device locale

Browse Source
This commit is contained in:
appflowy 2022-02-05 21:50:49 +08:00
parent 0d47397851
commit e9ba1e1886
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/app_flowy/lib/workspace/application/appearance.dart
View File

@ -1,6 +1,7 @@
import 'package:app_flowy/user/infrastructure/repos/user_setting_repo.dart';
import 'package:equatable/equatable.dart';
import 'package:flowy_infra/theme.dart';
import 'package:flowy_log/flowy_log.dart';
import 'package:flowy_sdk/protobuf/flowy-user-data-model/user_setting.pb.dart';
import 'package:flutter/material.dart';
import 'package:easy_localization/easy_localization.dart';
@ -46,6 +47,12 @@ class AppearanceSettingModel extends ChangeNotifier with EquatableMixin {
void setLocale(BuildContext context, Locale newLocale) {
if (_locale != newLocale) {
if (context.supportedLocales.contains(newLocale)) {
Log.error("Unsupported locale: $newLocale");
newLocale = const Locale('en');
Log.debug("Fall back to locale: $newLocale");
}
context.setLocale(newLocale);
_locale = newLocale;
setting.locale.languageCode = _locale.languageCode;

8
frontend/rust-lib/flowy-user/src/handlers/user_handler.rs
View File

@ -59,7 +59,13 @@ pub async fn get_appearance_setting() -> DataResult<AppearanceSettings, FlowyErr
match KV::get_str(APPEARANCE_SETTING_CACHE_KEY) {
None => data_result(AppearanceSettings::default()),
Some(s) => {
let setting: AppearanceSettings = serde_json::from_str(&s)?;
let setting = match serde_json::from_str(&s) {
Ok(setting) => setting,
Err(e) => {
tracing::error!("Deserialize AppearanceSettings failed: {:?}, fallback to default", e);
AppearanceSettings::default()
}
};
data_result(setting)
}
}