diff --git a/lib/pangea/controllers/language_controller.dart b/lib/pangea/controllers/language_controller.dart index 5b007339f..ed1483aa4 100644 --- a/lib/pangea/controllers/language_controller.dart +++ b/lib/pangea/controllers/language_controller.dart @@ -3,6 +3,7 @@ import 'package:fluffychat/pangea/controllers/language_list_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:flutter/material.dart'; +import 'package:universal_io/io.dart'; import '../widgets/user_settings/p_language_dialog.dart'; @@ -27,6 +28,11 @@ class LanguageController { _userL1Code != LanguageKeys.unknownLanguage && _userL2Code != LanguageKeys.unknownLanguage; + LanguageModel get systemLanguage { + final String systemLang = Platform.localeName.split('-').first; + return PangeaLanguage.byLangCode(systemLang); + } + String? get _userL1Code { final source = _pangeaController.userController.profile.userSettings.sourceLanguage; diff --git a/lib/pangea/widgets/user_settings/p_language_dialog.dart b/lib/pangea/widgets/user_settings/p_language_dialog.dart index bc93f0c63..c7bea53f7 100644 --- a/lib/pangea/widgets/user_settings/p_language_dialog.dart +++ b/lib/pangea/widgets/user_settings/p_language_dialog.dart @@ -23,8 +23,8 @@ Future pLanguageDialog( //PTODO: if source language not set by user, default to languge from device settings final LanguageModel? userL1 = pangeaController.languageController.userL1; final LanguageModel? userL2 = pangeaController.languageController.userL2; - final String systemLang = Localizations.localeOf(parentContext).languageCode; - final LanguageModel systemLanguage = PangeaLanguage.byLangCode(systemLang); + final LanguageModel systemLanguage = + pangeaController.languageController.systemLanguage; LanguageModel selectedSourceLanguage = systemLanguage; if (userL1 != null && userL1.langCode != LanguageKeys.unknownLanguage) {