refactor(translations): fix settings.locale breaking settings

yukino-org · Oct 21, 2021 · 8df97fe · 8df97fe
1 parent 4870db8
commit 8df97fe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/lib/core/models/translations.dart b/lib/core/models/translations.dart
@@ -6,9 +6,9 @@ class TranslationLocale {
   TranslationLocale(this.code, [this.country]);
 
   factory TranslationLocale.parse(final String locale) {
-    final RegExpMatch match = RegExp('([^_]+)(_(.*?))?').firstMatch(locale)!;
+    final RegExpMatch match = RegExp('([^_]+)(_(.*))?').firstMatch(locale)!;
     final LanguageCodes lang = LanguageUtils.languageCodeMap[match.group(1)!]!;
-    final LanguageCountries? country = match.groupCount == 3
+    final LanguageCountries? country = match.group(3) != null
         ? LanguageCountryUtils.nameCodeMap[match.group(3)!]
         : null;
 
@@ -34,7 +34,7 @@ class TranslationLocale {
 
   @override
   String toString() =>
-      <String>[code.name, if (country != null) country!.country].join('_');
+      <String>[code.name, if (country != null) country!.name].join('_');
 
   @override
   bool operator ==(final Object other) =>

diff --git a/lib/pages/settings_page/setting_labels/preference.dart b/lib/pages/settings_page/setting_labels/preference.dart
@@ -15,10 +15,11 @@ List<Widget> getPreference(
           title: Translator.t.language(),
           dialogTitle: Translator.t.chooseLanguage(),
           icon: Icons.language,
-          value: settings.locale ?? Translator.t.locale.code.name,
+          value: Translator.t.locale.toString(),
           labels: <String, String>{
             for (final TranslationSentences lang in Translator.translations)
-              lang.locale.code.name: lang.locale.code.language,
+              lang.locale.toString():
+                  '${lang.locale.code.language} (${lang.locale.toString()})',
           },
           onChanged: (final String val) async {
             settings.locale = val;

diff --git a/lib/plugins/app_lifecycle.dart b/lib/plugins/app_lifecycle.dart
@@ -53,7 +53,7 @@ abstract class AppLifecycle {
       try {
         await LocalServer.initialize();
         Logger.of('LocalServer')
-          ..info('Finsihed "initialize"')
+          ..info('Finished "initialize"')
           ..info('Serving at ${LocalServer.baseURL}');
       } catch (err, trace) {
         Logger.of('LocalServer').error(
@@ -78,7 +78,7 @@ abstract class AppLifecycle {
     if (primaryInstance != null) {
       try {
         await InstanceManager.sendArguments(primaryInstance, args);
-        Logger.of('InstanceManager').info('Finsihed "sendArguments"');
+        Logger.of('InstanceManager').info('Finished "sendArguments"');
       } catch (err, trace) {
         Logger.of('InstanceManager').error(
           '"sendArguments" failed: $err',

diff --git a/packages/utilx/lib/utilities/countries.dart b/packages/utilx/lib/utilities/countries.dart
@@ -3,7 +3,6 @@ enum LanguageCountries {
 }
 
 extension LanguageCountriesUtils on LanguageCountries {
-  String get name => toString().split('.').last.toUpperCase();
   String get country => LanguageCountryUtils.codeNameMap[this]!;
 }