translation 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 177d0f379cbac2f9d701245ed60658f36b038443
-  data.tar.gz: 6c58ffb3793de7ce6cc4c990815f73d2be59889f
+  metadata.gz: 61d74cef08246ebc2fb57c359957e82ea18c0024
+  data.tar.gz: 935f1c9c13da8244b0ece61700a3a07e76a79161
 SHA512:
-  metadata.gz: 3d769627f2f86828f676678c83a030a3ae38576b2c0357f9cdc5e08b5cbe5a8101a915d128264646426374d645cb1283d3bcb2c197ca537a6e4e700ccdd18e68
-  data.tar.gz: 9995cc00333af2cc1ba10e739efc1442b0a2314c5eaa96534f8fd0d1815d155d2280a0c67236c1fe4b1e2010fe3b92d91d6cc9e6bd79c813e4ce800234039c62
+  metadata.gz: 41b3cdfcee4610adce8f938c805ce18316e96871b57e4663297991d1fef4801d3d5e0b640030523d6b35d2c6fdf42299d38bc314cb6be95f6e0d398579b8c6cd
+  data.tar.gz: 67178106997e7b09f293beeaebd487f9e86b5e2babf73518bb8fb4383094d10d8bfa79a5e014ab1c8635893acbb80c2531cbd1fff43672c4d8fcc0bd7c5792c7

data/lib/translation_io/client/base_operation/save_special_yaml_files_step.rb

@@ -21,11 +21,11 @@ module TranslationIO
           end
 
           all_flat_special_translations = all_flat_translations.select do |key, value|
-            YamlEntry.localization?(key, value)
+            TranslationIO::YamlEntry.localization?(key, value)
           end
 
           source_flat_special_translations = all_flat_special_translations.select do |key|
-            YamlEntry.from_locale?(key, @source_locale) && !YamlEntry.ignored?(key)
+            TranslationIO::YamlEntry.from_locale?(key, @source_locale) && !TranslationIO::YamlEntry.ignored?(key)
           end
 
           @target_locales.each do |target_locale|

data/lib/translation_io/client/init_operation/create_yaml_po_files_step.rb

@@ -10,19 +10,26 @@ module TranslationIO
 
         def run(params)
           TranslationIO.info "Importing translations from YAML files."
-          all_flat_translations = {}
+
+          all_translations = {}
 
           @yaml_file_paths.each do |file_path|
             TranslationIO.info file_path, 2, 2
-            all_flat_translations.merge!(YAMLConversion.get_flat_translations_for_yaml_file(file_path))
+            file_translations = YAML::load(File.read(file_path))
+
+            unless file_translations.blank?
+              all_translations = all_translations.deep_merge(file_translations)
+            end
           end
 
+          all_flat_translations = FlatHash.to_flat_hash(all_translations)
+
           all_flat_string_translations = all_flat_translations.select do |key, value|
-            YamlEntry.string?(key, value) && !YamlEntry.localization?(key, value)
+            TranslationIO::YamlEntry.string?(key, value) && !TranslationIO::YamlEntry.localization?(key, value)
           end
 
           source_flat_string_tanslations = all_flat_string_translations.select do |key|
-            YamlEntry.from_locale?(key, @source_locale) && !YamlEntry.ignored?(key)
+            TranslationIO::YamlEntry.from_locale?(key, @source_locale) && !TranslationIO::YamlEntry.ignored?(key)
           end
 
           @target_locales.each do |target_locale|

data/lib/translation_io/client/sync_operation/create_yaml_pot_file_step.rb

@@ -9,17 +9,22 @@ module TranslationIO
 
         def run(params)
           TranslationIO.info "Generating POT file from YAML files."
-          all_flat_translations  = {}
+
+          all_translations = {}
 
           @yaml_file_paths.each do |file_path|
             TranslationIO.info file_path, 2, 2
-            all_flat_translations.merge!(
-              YAMLConversion.get_flat_translations_for_yaml_file(file_path)
-            )
+            file_translations = YAML::load(File.read(file_path))
+
+            unless file_translations.blank?
+              all_translations = all_translations.deep_merge(file_translations)
+            end
           end
 
+          all_flat_translations = FlatHash.to_flat_hash(all_translations)
+
           source_flat_string_tanslations = all_flat_translations.select do |key, value|
-            YamlEntry.string?(key, value) && YamlEntry.from_locale?(key, @source_locale) && !YamlEntry.ignored?(key) && !YamlEntry.localization?(key, value)
+            TranslationIO::YamlEntry.string?(key, value) && TranslationIO::YamlEntry.from_locale?(key, @source_locale) && !TranslationIO::YamlEntry.ignored?(key) && !TranslationIO::YamlEntry.localization?(key, value)
           end
 
           pot_representation = GetText::PO.new

data/lib/translation_io/config.rb

@@ -5,14 +5,16 @@ module TranslationIO
     attr_accessor :endpoint
     attr_accessor :verbose
     attr_accessor :test
+    attr_accessor :ignored_key_prefixes
 
     def initialize
-      self.locales_path   = File.join('config', 'locales', 'gettext')
-      self.source_locale  = :en
-      self.target_locales = []
-      self.endpoint       = 'https://translation.io/api'
-      self.verbose        = 1
-      self.test           = false
+      self.locales_path         = File.join('config', 'locales', 'gettext')
+      self.source_locale        = :en
+      self.target_locales       = []
+      self.endpoint             = 'https://translation.io/api'
+      self.verbose              = 1
+      self.test                 = false
+      self.ignored_key_prefixes = []
     end
 
     def pot_path

data/lib/translation_io/flat_hash.rb

@@ -77,7 +77,7 @@ module TranslationIO
                 current_object[current_key] = {}
               end
               current_object          = current_object[current_key]
-              current_object[new_key] = value
+              current_object[new_key] = value if current_object.respond_to? :each
 
               key_string = ''
             end

data/lib/translation_io/yaml_entry.rb

@@ -1,51 +1,53 @@
-module YamlEntry
-
-  IGNORED_KEY_PREFIXES = [
-    'faker.'
-  ]
-
-  LOCALIZATION_KEY_PREFIXES = [
-    'date.formats',
-    'date.order',
-    'time.formats',
-    'support.array',
-    'number.format',
-    'number.currency',
-    'number.percentage',
-    'number.precision',
-    'number.human.format',
-    'number.human.storage_units.format',
-    'number.human.decimal_units.format',
-    'number.human.decimal_units.units.unit'
-  ]
-
-  class << self
-    def string?(key, value)
-      key.present? && value.is_a?(String)
-    end
+module TranslationIO
+  module TranslationIO::YamlEntry
+
+    LOCALIZATION_KEY_PREFIXES = [
+      'date.formats',
+      'date.order',
+      'time.formats',
+      'support.array',
+      'number.format',
+      'number.currency',
+      'number.percentage',
+      'number.precision',
+      'number.human.format',
+      'number.human.storage_units.format',
+      'number.human.decimal_units.format',
+      'number.human.decimal_units.units.unit'
+    ]
+
+    class << self
+      def string?(key, value)
+        key.present? && value.is_a?(String)
+      end
 
-    def from_locale?(key, locale)
-      key.present? && key.start_with?("#{locale}.")
-    end
+      def from_locale?(key, locale)
+        key.present? && key.start_with?("#{locale}.")
+      end
 
-    def ignored?(key)
-      key.present? && IGNORED_KEY_PREFIXES.any? { |p| key_without_locale(key).start_with?(p) }
-    end
+      def ignored?(key)
+        key.present? && ignored_key_prefixes.any? { |p| key_without_locale(key).start_with?(p) }
+      end
 
-    def localization?(key, value)
-      key.present? && (localization_prefix?(key) || (!YamlEntry.string?(key, value) && !value.nil?))
-    end
+      def localization?(key, value)
+        key.present? && (localization_prefix?(key) || (!TranslationIO::YamlEntry.string?(key, value) && !value.nil?))
+      end
 
-    def localization_prefix?(key)
-      LOCALIZATION_KEY_PREFIXES.any? do |prefix|
-        key_without_locale(key).start_with?(prefix)
+      def localization_prefix?(key)
+        LOCALIZATION_KEY_PREFIXES.any? do |prefix|
+          key_without_locale(key).start_with?(prefix)
+        end
       end
-    end
 
-    private
+      private
 
-    def key_without_locale(key)
-      key.split('.', 2).last
+      def ignored_key_prefixes
+        ['faker.'] + TranslationIO.config.ignored_key_prefixes
+      end
+
+      def key_without_locale(key)
+        key.split('.', 2).last
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Aurelien Malisart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails translation made _("simple") with YAML and GetText.