Merge 4c46cd3 into e39a452

impaktfull · May 7, 2021 · 947371f · 947371f
2 parents e39a452 + 4c46cd3
commit 947371f
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 38 deletions.
diff --git a/example/lib/util/locale/localization_delegate.dart b/example/lib/util/locale/localization_delegate.dart
@@ -12,13 +12,8 @@ typedef LocaleFilter = bool Function(String languageCode);
 
 class LocalizationDelegate extends LocalizationsDelegate<Localization> {
   static LocaleFilter? localeFilter;
-  static const defaultLocale = Locale('en');
-  static const _supportedLanguages = [
-    'en',
-    'nl',
-    'zh',
-    'fi',
-  ];
+  static const defaultLocale = Locale.fromSubtags(
+      languageCode: 'en', scriptCode: null, countryCode: null);
 
   static const _supportedLocales = [
     Locale.fromSubtags(languageCode: 'en', scriptCode: null, countryCode: null),
@@ -29,8 +24,10 @@ class LocalizationDelegate extends LocalizationsDelegate<Localization> {
   ];
 
   static List<String> get supportedLanguages {
-    if (localeFilter == null) return _supportedLanguages;
-    return _supportedLanguages
+    final supportedLanguageTags =
+        _supportedLocales.map((e) => e.toLanguageTag()).toList(growable: false);
+    if (localeFilter == null) return supportedLanguageTags;
+    return supportedLanguageTags
         .where((element) => localeFilter?.call(element) ?? true)
         .toList();
   }

diff --git a/lib/src/locale_gen_parser.dart b/lib/src/locale_gen_parser.dart
@@ -3,25 +3,27 @@ import 'package:intl/locale.dart';
 class LocaleGenParser {
   const LocaleGenParser._();
 
-  static String parseSupportedLanguage(String language) {
+  static String parseSupportedLocale(String language) {
     try {
       final locale = Locale.tryParse(language);
       final languageCode = locale?.languageCode;
-      return "    '$languageCode',";
+      final scriptCode = locale?.scriptCode;
+      final countryCode = locale?.countryCode;
+      return "    Locale.fromSubtags(languageCode: ${languageCode != null ? "'$languageCode'" : null}, scriptCode: ${scriptCode != null ? "'$scriptCode'" : null}, countryCode: ${countryCode != null ? "'$countryCode'" : null}),";
     } catch (_) {
-      return "    '$language',";
+      return "    Locale('$language'),";
     }
   }
 
-  static String parseSupportedLocale(String language) {
+  static String parseDefaultLanguageLocale(String language) {
     try {
       final locale = Locale.tryParse(language);
       final languageCode = locale?.languageCode;
       final scriptCode = locale?.scriptCode;
       final countryCode = locale?.countryCode;
-      return "    Locale.fromSubtags(languageCode: ${languageCode != null ? "'$languageCode'" : null}, scriptCode: ${scriptCode != null ? "'$scriptCode'" : null}, countryCode: ${countryCode != null ? "'$countryCode'" : null}),";
+      return "  static const defaultLocale = Locale.fromSubtags(languageCode: ${languageCode != null ? "'$languageCode'" : null}, scriptCode: ${scriptCode != null ? "'$scriptCode'" : null}, countryCode: ${countryCode != null ? "'$countryCode'" : null});";
     } catch (_) {
-      return "    Locale('$language'),";
+      return "  static const defaultLocale = Locale('$language');";
     }
   }
 }
diff --git a/lib/src/locale_gen_writer.dart b/lib/src/locale_gen_writer.dart
@@ -184,13 +184,7 @@ class LocaleGenWriter {
       ..writeln(
           'class LocalizationDelegate extends LocalizationsDelegate<Localization> {')
       ..writeln('  static LocaleFilter? localeFilter;')
-      ..writeln(
-          "  static const defaultLocale = Locale('${params.defaultLanguage}');")
-      ..writeln('  static const _supportedLanguages = [');
-    params.languages.forEach((language) =>
-        sb.writeln(LocaleGenParser.parseSupportedLanguage(language)));
-    sb
-      ..writeln('  ];')
+      ..writeln(LocaleGenParser.parseDefaultLanguageLocale(params.defaultLanguage))
       ..writeln()
       ..writeln('  static const _supportedLocales = [');
     params.languages.forEach((language) =>
@@ -199,9 +193,10 @@ class LocaleGenWriter {
       ..writeln('  ];')
       ..writeln()
       ..writeln('  static List<String> get supportedLanguages {')
-      ..writeln('    if (localeFilter == null) return _supportedLanguages;')
+      ..writeln('    final supportedLanguageTags = _supportedLocales.map((e) => e.toLanguageTag()).toList(growable: false);')
+      ..writeln('    if (localeFilter == null) return supportedLanguageTags;')
       ..writeln(
-          '    return _supportedLanguages.where((element) => localeFilter?.call(element) ?? true).toList();')
+          '    return supportedLanguageTags.where((element) => localeFilter?.call(element) ?? true).toList();')
       ..writeln('  }')
       ..writeln()
       ..writeln('  static List<Locale> get supportedLocales {')

diff --git a/test/locale_gen_parser_test.dart b/test/locale_gen_parser_test.dart
@@ -2,20 +2,6 @@ import 'package:locale_gen/src/locale_gen_parser.dart';
 import 'package:test/test.dart';
 
 void main() {
-  group('LocaleGen parseSupportedLanguage', () {
-    test('parses nl locale', () {
-      final result = LocaleGenParser.parseSupportedLanguage('nl');
-      expect(result, "    'nl',");
-    });
-    test('parses zh-Hans-CN locale', () {
-      final result = LocaleGenParser.parseSupportedLanguage('zh-Hans-CN');
-      expect(result, "    'zh',");
-    });
-    test('parses fi-FI locale', () {
-      final result = LocaleGenParser.parseSupportedLanguage('fi-FI');
-      expect(result, "    'fi',");
-    });
-  });
   group('LocaleGen parseSupportedLocale', () {
     test('parses nl locale', () {
       final result = LocaleGenParser.parseSupportedLocale('nl');
@@ -33,4 +19,21 @@ void main() {
           "    Locale.fromSubtags(languageCode: 'fi', scriptCode: null, countryCode: 'FI'),");
     });
   });
+  group('LocaleGen parseDefaultLanguageLocale', () {
+    test('parses nl locale', () {
+      final result = LocaleGenParser.parseDefaultLanguageLocale('nl');
+      expect(result,
+          "  static const defaultLocale = Locale.fromSubtags(languageCode: 'nl', scriptCode: null, countryCode: null);");
+    });
+    test('parses zh-Hans-CN locale', () {
+      final result = LocaleGenParser.parseDefaultLanguageLocale('zh-Hans-CN');
+      expect(result,
+          "  static const defaultLocale = Locale.fromSubtags(languageCode: 'zh', scriptCode: 'Hans', countryCode: 'CN');");
+    });
+    test('parses fi-FI locale', () {
+      final result = LocaleGenParser.parseDefaultLanguageLocale('fi-FI');
+      expect(result,
+          "  static const defaultLocale = Locale.fromSubtags(languageCode: 'fi', scriptCode: null, countryCode: 'FI');");
+    });
+  });
 }