flutter_polyglot_cli 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2677efcaed8b5c731998d960ad6b25f8ac26dfdc654b510d52bb44f57b31b97
-  data.tar.gz: b41e5447f2cd83df7ae743a1e95458fb745be38caa956be4e61263225be14400
+  metadata.gz: '085f1f15e8e51d53a5a95e0d2f30a4e962e084a5a80620e5bfcd7fc16a286750'
+  data.tar.gz: 60d1ad3bb0faa8755453f0dbe3d7c894a91bf7b8223304f8ddf65a5b9b4a1b6d
 SHA512:
-  metadata.gz: d1804575384e29434dfe41b0fdaeef2693eeb804f35a293b9307c7186ce76999c638aafef11e2b8e84191c54b3652d9c45f534046aed6d19ae3137e2dd317c13
-  data.tar.gz: e084e1fbfa913eef571fd1234baea1acca3f0ab8e75bcad9926ce63e382291aee656dd701ee2b5938c3451fa4703b09d755ba2f64e8810fc3a2fe61d05040b33
+  metadata.gz: '0984d36f5bcb523a73589fedf7e296e49f5c491438224b4340fa8beb96cf1c313787d1b30e9044b478a70cf78278f9f65e9df746f2c220d503fbe2c1b804130a'
+  data.tar.gz: f4607e31c62590440ac7688fedcd2f6e75ad86536bb9f94151773204c8da847304a2cc887a41be32727541c452f7ee8d542e52e8e09a42d6fcbd3f70ccdfffbc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flutter_polyglot_cli (1.0.2)
+    flutter_polyglot_cli (1.1.0)
       activesupport
       commander
       json_api_client

data/lib/flutter_polyglot_cli.rb

@@ -28,6 +28,7 @@ require 'flutter_polyglot_cli/serializers/localizations/loc_serializer'
 require 'flutter_polyglot_cli/serializers/localizations/localization_serializer'
 require 'flutter_polyglot_cli/serializers/localizations/localization_delegate_serializer'
 require 'flutter_polyglot_cli/serializers/localizations/localization_keys_serializer'
+require 'flutter_polyglot_cli/serializers/localizations/localization_strings_serializer'
 
 # Commands
 require 'flutter_polyglot_cli/commands/login'

data/lib/flutter_polyglot_cli/commands/pull.rb

@@ -22,16 +22,18 @@ module PolyglotFlutter
           languages = pull_languages(project_id)
           translation_keys = pull_translation_keys(project_id)
 
+          directory_path = project[:sourceFilesPath]
           write_translations(translation_keys, languages, project[:path])
-          write_localization(project[:sourceFilesPath])
-          write_localization_delegate(languages, project[:sourceFilesPath])
-          write_localization_keys(translation_keys, languages, project[:sourceFilesPath], mandatory_language)
+          write_localization(directory_path)
+          write_localization_delegate(languages, directory_path)
+          write_localization_keys(translation_keys, languages, directory_path, mandatory_language)
 
-          FileUtils.mkdir_p "#{project[:sourceFilesPath]}initialize_i18n"
-          script = "flutter pub pub run intl_translation:generate_from_arb --output-dir=#{project[:sourceFilesPath]}initialize_i18n  --no-use-deferred-loading #{project[:sourceFilesPath]}localization_keys.dart #{project[:path]}intl_*.arb"
+          FileUtils.mkdir_p "#{directory_path}initialize_i18n"
+          script = "flutter pub pub run intl_translation:generate_from_arb --output-dir=#{directory_path}initialize_i18n  --no-use-deferred-loading #{project[:sourceFilesPath]}localization_keys.dart #{project[:path]}intl_*.arb"
           `#{script}`
-
-          # josonaj command
+          
+          File.delete("#{directory_path}localization_keys.dart") if File.exist?("#{directory_path}localization_keys.dart")
+          write_localization_strings(translation_keys, languages, directory_path, mandatory_language)
         end
       end
 
@@ -70,6 +72,14 @@ module PolyglotFlutter
           .save(translations_path)
       end
 
+      def write_localization_strings(translation_keys, languages, translations_path, mandatory_language)
+        return if translations_path.to_s.empty?
+
+        PolyglotFlutter::Serializer::Localization::LocalizationStrings
+          .new(languages: languages, translation_keys: translation_keys, mandatory_language: mandatory_language)
+          .save(translations_path)
+      end
+
       # Pulling data
 
       def pull_languages(project_id)

data/lib/flutter_polyglot_cli/helpers/general.rb

@@ -84,12 +84,7 @@ module PolyglotFlutter
 
       def generate_localization_keys(languages, translation_keys, mandatory_language)
         result_string = ''
-        language = nil
-        languages.each do |lang|
-          if lang['locale'].split('_').first == mandatory_language
-            language = lang
-          end
-        end
+        language = find_app_language(languages, mandatory_language)
 
         dict = extract_translations(translation_keys, language)
         dict.each do |key, value|
@@ -128,6 +123,29 @@ module PolyglotFlutter
         locale_list = locale_names.each.map { |value| "AppLocales.#{value}" }.join(', ')
         result_string += "\n\tstatic List<Locale> get values => <Locale>[#{locale_list}];"
       end
+
+      def generate_strings(languages, translation_keys, mandatory_language)
+        result_string = ''
+        language = find_app_language(languages, mandatory_language)
+
+        dict = extract_translations(translation_keys, language)
+        dict.each do |key, value|
+          next if value.nil?
+
+          clean_var_name = clean_variable_name(key)
+          result_string += "\t#{clean_var_name},\n"
+        end
+
+        result_string
+      end
+
+      def find_app_language(languages, mandatory_language)
+        languages.each do |lang|
+          if lang['locale'].split('_').first == mandatory_language
+            return lang
+          end
+        end
+      end
     end
   end
 end

data/lib/flutter_polyglot_cli/serializers/localizations/localization_serializer.rb

@@ -17,7 +17,7 @@ module PolyglotFlutter
             import 'package:intl/intl.dart';
             import 'initialize_i18n/messages_all.dart';
 
-            part 'localization_keys.dart';
+            part 'localization_strings.dart';
 
             // AUTO GENERATED FILE. DO NOT CHANGE.
             class Localization {

data/lib/flutter_polyglot_cli/serializers/localizations/localization_strings_serializer.rb

@@ -0,0 +1,36 @@
+require_relative 'loc_serializer'
+
+module PolyglotFlutter
+  module Serializer
+    module Localization
+      class LocalizationStrings < Base
+        def save(sources_path)
+          FileUtils.mkdir_p sources_path unless File.exist? sources_path
+          output_path = File.join(sources_path, 'localization_strings.dart')
+          File.write(output_path, render)
+        end
+
+        def template
+          <<~TEMPLATE
+          part of 'localization.dart';
+
+          // AUTO GENERATED FILE. DO NOT CHANGE.
+          enum Strings {
+          <%= generate_strings(languages, translation_keys, mandatory_language) %>}
+
+          extension StringsValue on Strings {
+            String value() => toString().split('.').last;
+
+            String localized({BuildContext context, List<Object> args}) {
+              if (context != null) {
+                Localizations.of<Localization>(context, Localization);
+              }
+              return Intl.message('', name: value(), args: args);
+            }
+          }
+          TEMPLATE
+        end
+      end
+    end
+  end
+end

data/lib/flutter_polyglot_cli/version.rb

@@ -1,3 +1,3 @@
 module PolyglotFlutter
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flutter_polyglot_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Maroje Marcelic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,6 +161,7 @@ files:
 - lib/flutter_polyglot_cli/serializers/localizations/localization_delegate_serializer.rb
 - lib/flutter_polyglot_cli/serializers/localizations/localization_keys_serializer.rb
 - lib/flutter_polyglot_cli/serializers/localizations/localization_serializer.rb
+- lib/flutter_polyglot_cli/serializers/localizations/localization_strings_serializer.rb
 - lib/flutter_polyglot_cli/serializers/translations/translations_serializer.rb
 - lib/flutter_polyglot_cli/version.rb
 homepage: https://github.com/infinum/flutter-polyglot-cli