Merge ac5614f into e6bee8d

impaktfull · May 6, 2021 · 550c386 · 550c386
2 parents e6bee8d + ac5614f
commit 550c386
Show file tree

Hide file tree

Showing 8 changed files with 102 additions and 5 deletions.
diff --git a/example/assets/locale/fi-FI.json b/example/assets/locale/fi-FI.json
@@ -0,0 +1,9 @@
+{
+  "test": "Näet lisää napauttamalla kuvakkeita",
+  "test_arg1": "Lisää napauttamalla %1$s",
+  "test_arg2": "Lisää napauttamalla %1$d",
+  "test_arg3": "Lisää napauttamalla %1$s %2$d",
+  "test_arg4": "Lisää napauttamalla %1$s %2$d %1$s",
+  "welcome_message": "Lisää napauttamalla",
+  "test_new_line": "Lisää\nLisää napauttamalla\n\n%1$s %2$d %1$s"
+}
diff --git a/example/assets/locale/zh-Hans-CN.json b/example/assets/locale/zh-Hans-CN.json
@@ -0,0 +1,8 @@
+{
+  "test": "视频的灯光脚本",
+  "test_arg1": "频的 %1$s",
+  "test_arg2": "频的 %1$d",
+  "test_arg3": "频的 %1$s %2$d",
+  "test_arg4": "频的 %1$s %2$d %1$s",
+  "test_new_line": "频\n的\n\n%1$s %2$d %1$s"
+}
diff --git a/example/lib/util/locale/localization.dart b/example/lib/util/locale/localization.dart
@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:intl/locale.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:locale_gen_example/util/locale/localization_keys.dart';
@@ -57,13 +58,21 @@ class Localization {
   /// en:  **'Testing in English'**
   ///
   /// nl:  **'Test in het Nederlands'**
+  ///
+  /// zh-Hans-CN: **'视频的灯光脚本'**
+  ///
+  /// fi-FI: **'Näet lisää napauttamalla kuvakkeita'**
   String get test => _t(LocalizationKeys.test);
 
   /// Translations:
   ///
   /// en:  **'Testing argument %1$s'**
   ///
   /// nl:  **'Test argument %1$s'**
+  ///
+  /// zh-Hans-CN: **'频的 %1$s'**
+  ///
+  /// fi-FI: **'Lisää napauttamalla %1$s'**
   String testArg1(String arg1) =>
       _t(LocalizationKeys.testArg1, args: <dynamic>[arg1]);
 
@@ -72,6 +81,10 @@ class Localization {
   /// en:  **'Testing argument %1$d'**
   ///
   /// nl:  **'Test argument %1$d'**
+  ///
+  /// zh-Hans-CN: **'频的 %1$d'**
+  ///
+  /// fi-FI: **'Lisää napauttamalla %1$d'**
   String testArg2(num arg1) =>
       _t(LocalizationKeys.testArg2, args: <dynamic>[arg1]);
 
@@ -80,6 +93,10 @@ class Localization {
   /// en:  **'Testing argument %1$s %2$d'**
   ///
   /// nl:  **'Test argument %1$s %2$d'**
+  ///
+  /// zh-Hans-CN: **'频的 %1$s %2$d'**
+  ///
+  /// fi-FI: **'Lisää napauttamalla %1$s %2$d'**
   String testArg3(String arg1, num arg2) =>
       _t(LocalizationKeys.testArg3, args: <dynamic>[arg1, arg2]);
 
@@ -88,6 +105,10 @@ class Localization {
   /// en:  **'Testing argument %1$s %2$d %1$s'**
   ///
   /// nl:  **'Test argument %1$s %2$d %1$s'**
+  ///
+  /// zh-Hans-CN: **'频的 %1$s %2$d %1$s'**
+  ///
+  /// fi-FI: **'Lisää napauttamalla %1$s %2$d %1$s'**
   String testArg4(String arg1, num arg2) =>
       _t(LocalizationKeys.testArg4, args: <dynamic>[arg1, arg2]);
 
@@ -96,6 +117,10 @@ class Localization {
   /// en:  **'Testing\nargument\n\n%1$s %2$d %1$s'**
   ///
   /// nl:  **'Test\nargument\n\n%1$s %2$d %1$s'**
+  ///
+  /// zh-Hans-CN: **'频\n的\n\n%1$s %2$d %1$s'**
+  ///
+  /// fi-FI: **'Lisää\nLisää napauttamalla\n\n%1$s %2$d %1$s'**
   String testNewLine(String arg1, num arg2) =>
       _t(LocalizationKeys.testNewLine, args: <dynamic>[arg1, arg2]);
 

diff --git a/example/lib/util/locale/localization_delegate.dart b/example/lib/util/locale/localization_delegate.dart
@@ -16,11 +16,16 @@ class LocalizationDelegate extends LocalizationsDelegate<Localization> {
   static const _supportedLanguages = [
     'en',
     'nl',
+    'zh',
+    'fi',
   ];
 
   static const _supportedLocales = [
-    Locale('en'),
-    Locale('nl'),
+    Locale.fromSubtags(languageCode: 'en', scriptCode: null, countryCode: null),
+    Locale.fromSubtags(languageCode: 'nl', scriptCode: null, countryCode: null),
+    Locale.fromSubtags(
+        languageCode: 'zh', scriptCode: 'Hans', countryCode: 'CN'),
+    Locale.fromSubtags(languageCode: 'fi', scriptCode: null, countryCode: 'FI'),
   ];
 
   static List<String> get supportedLanguages {

diff --git a/example/lib/util/locale/localization_keys.dart b/example/lib/util/locale/localization_keys.dart
@@ -7,40 +7,64 @@ class LocalizationKeys {
   /// en:  **'Testing in English'**
   ///
   /// nl:  **'Test in het Nederlands'**
+  ///
+  /// zh-Hans-CN: **'视频的灯光脚本'**
+  ///
+  /// fi-FI: **'Näet lisää napauttamalla kuvakkeita'**
   static const test = 'test';
 
   /// Translations:
   ///
   /// en:  **'Testing argument %1$s'**
   ///
   /// nl:  **'Test argument %1$s'**
+  ///
+  /// zh-Hans-CN: **'频的 %1$s'**
+  ///
+  /// fi-FI: **'Lisää napauttamalla %1$s'**
   static const testArg1 = 'test_arg1';
 
   /// Translations:
   ///
   /// en:  **'Testing argument %1$d'**
   ///
   /// nl:  **'Test argument %1$d'**
+  ///
+  /// zh-Hans-CN: **'频的 %1$d'**
+  ///
+  /// fi-FI: **'Lisää napauttamalla %1$d'**
   static const testArg2 = 'test_arg2';
 
   /// Translations:
   ///
   /// en:  **'Testing argument %1$s %2$d'**
   ///
   /// nl:  **'Test argument %1$s %2$d'**
+  ///
+  /// zh-Hans-CN: **'频的 %1$s %2$d'**
+  ///
+  /// fi-FI: **'Lisää napauttamalla %1$s %2$d'**
   static const testArg3 = 'test_arg3';
 
   /// Translations:
   ///
   /// en:  **'Testing argument %1$s %2$d %1$s'**
   ///
   /// nl:  **'Test argument %1$s %2$d %1$s'**
+  ///
+  /// zh-Hans-CN: **'频的 %1$s %2$d %1$s'**
+  ///
+  /// fi-FI: **'Lisää napauttamalla %1$s %2$d %1$s'**
   static const testArg4 = 'test_arg4';
 
   /// Translations:
   ///
   /// en:  **'Testing\nargument\n\n%1$s %2$d %1$s'**
   ///
   /// nl:  **'Test\nargument\n\n%1$s %2$d %1$s'**
+  ///
+  /// zh-Hans-CN: **'频\n的\n\n%1$s %2$d %1$s'**
+  ///
+  /// fi-FI: **'Lisää\nLisää napauttamalla\n\n%1$s %2$d %1$s'**
   static const testNewLine = 'test_new_line';
 }
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -24,7 +24,7 @@ flutter:
     - assets/locale/
 
 locale_gen:
-  languages: ['en','nl']
+  languages: ['en','nl', 'zh-Hans-CN', 'fi-FI']
 #  locale_assets_path: 'assets/localization'
 #  assets_path: 'assets/localization'
 #  doc_languages: ['en']
diff --git a/lib/src/locale_gen_writer.dart b/lib/src/locale_gen_writer.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:intl/locale.dart';
 import 'package:locale_gen/src/case_util.dart';
 import 'package:path/path.dart';
 
@@ -84,6 +85,7 @@ class LocaleGenWriter {
     final sb = StringBuffer()
       ..writeln("import 'dart:convert';")
       ..writeln()
+      ..writeln("import 'package:intl/locale.dart';")
       ..writeln("import 'package:flutter/services.dart';")
       ..writeln("import 'package:flutter/widgets.dart';")
       ..writeln(
@@ -186,13 +188,14 @@ class LocaleGenWriter {
       ..writeln(
           "  static const defaultLocale = Locale('${params.defaultLanguage}');")
       ..writeln('  static const _supportedLanguages = [');
-    params.languages.forEach((language) => sb.writeln("    '$language',"));
+    params.languages
+        .forEach((language) => sb.writeln(_parseSupportedLanguage(language)));
     sb
       ..writeln('  ];')
       ..writeln()
       ..writeln('  static const _supportedLocales = [');
     params.languages
-        .forEach((language) => sb.writeln("    Locale('$language'),"));
+        .forEach((language) => sb.writeln(_parseSupportedLocale(language)));
     sb
       ..writeln('  ];')
       ..writeln()
@@ -247,4 +250,26 @@ class LocaleGenWriter {
     }
     localizationDelegateFile.writeAsStringSync(sb.toString());
   }
+
+  static String _parseSupportedLanguage(String language) {
+    try {
+      final locale = Locale.tryParse(language);
+      final languageCode = locale?.languageCode;
+      return "    '$languageCode',";
+    } catch (_) {
+      return "    '$language',";
+    }
+  }
+
+  static String _parseSupportedLocale(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}),";
+    } catch (_) {
+      return "    Locale('$language'),";
+    }
+  }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -7,6 +7,7 @@ environment:
   sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
+  intl: ^0.17.0
   meta: ^1.3.0
   path: ^1.8.0
   yaml: ^3.1.0