fix(translation): ignore invalid system locale

yukino-org · Nov 13, 2021 · 8dbddd1 · 8dbddd1
1 parent 8aff163
commit 8dbddd1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/lib/config/app.dart b/lib/config/app.dart
@@ -23,11 +23,8 @@ abstract class Config {
   static const String repoAuthor = 'yukino-app';
   static const String repoName = 'yukino';
 
-  // static const String storeURL =
-  //     'https://raw.githubusercontent.com/$repoAuthor/extensions-store/dist/extensions.json';
-
   static const String storeURL =
-      'https://raw.githubusercontent.com/$repoAuthor/this-is-kek/main/store.json';
+      'https://raw.githubusercontent.com/$repoAuthor/extensions-store/dist/extensions.json';
 
   static const String releasesURL =
       'https://api.github.com/repos/$repoAuthor/$repoName/releases?per_page=20';

diff --git a/lib/modules/helpers/screen.dart b/lib/modules/helpers/screen.dart
@@ -194,7 +194,8 @@ abstract class Screen {
     }
   }
 
-  static Future<bool> isWakelockEnabled() => Wakelock.enabled;
+  static Future<bool> isWakelockEnabled() =>
+      !Platform.isLinux && Wakelock.enabled;
 
   static Future<void> enableWakelock() async {
     if (!Platform.isLinux) {

diff --git a/lib/modules/translator/translator.dart b/lib/modules/translator/translator.dart
@@ -13,20 +13,22 @@ abstract class Translator {
   static late TranslationSentences t;
 
   static TranslationSentences? tryGetTranslation(final String _locale) {
-    final Locale locale = Locale.parse(_locale);
-
-    TranslationSentences? translation;
-    int threshold = 0;
-
-    for (final TranslationSentences x in translations) {
-      final int nThresh = x.locale.compare(locale);
-      if (nThresh > threshold) {
-        translation = x;
-        threshold = nThresh;
+    final Locale? locale = Locale.tryParse(_locale);
+
+    if (locale != null) {
+      TranslationSentences? translation;
+      int threshold = 0;
+
+      for (final TranslationSentences x in translations) {
+        final int nThresh = x.locale.compare(locale);
+        if (nThresh > threshold) {
+          translation = x;
+          threshold = nThresh;
+        }
       }
-    }
 
-    return translation;
+      return translation;
+    }
   }
 
   static TranslationSentences getDefaultTranslation() =>

diff --git a/packages/utilx/lib/utilities/locale.dart b/packages/utilx/lib/utilities/locale.dart
@@ -15,6 +15,12 @@ class Locale {
     return Locale(lang, country);
   }
 
+  static Locale? tryParse(final String locale) {
+    try {
+      return Locale.parse(locale);
+    } catch (_) {}
+  }
+
   final LanguageCodes code;
   final CountryCodes? country;