translation 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26c222c8c1149a0c4bd21129c4f3a9dd7e723978
-  data.tar.gz: 739654aa93c95f0ab8e1a1bc8a95bcc44e87fd03
+  metadata.gz: 76f06309119b4856d8334ab42dd1a79600415e9b
+  data.tar.gz: 97ca726e59f4a331f41f03b6644b0c4accb09298
 SHA512:
-  metadata.gz: 7e79d8d3234aa840421148ec31c0d155f91fc3db730eef3d72a5e2de7ccacc348935e522400d65a20ee8159ac727e298bd7ddceae5dce57daaf6b176283fa976
-  data.tar.gz: d265300164c4341f64929c21f4dbdd79ab3543be228962e2555b37e4dbfb5ee2cb4f60daa8bc77923f0fea96856480778ceab345a9e7e1f4e07df4a63dc76c03
+  metadata.gz: 1bee96e7ec136d640da01c9ea420f8c07f9d38ce40d73289059da10890a060345255b8f9d088e400223b492b49cc8a83aee60cfab8e521008c8ff12c198162ff
+  data.tar.gz: 50a456aab2431ca613b0233f92bb05ba8a4435fae29d26812b00d87b87d0bdfa9ebfbd0602e894fcb3e241e7e9e4db7924abdc2667d4b35840928987f9551f21

data/README.md

@@ -19,19 +19,19 @@ And finish by inititalizing your translation project with :
 
     bundle exec rake translation:init
 
-## Synchronization
+## Sync
 
 To send new translatable keys/strings and get new translations from Translation.io, simply run :
 
     bundle exec rake translation:sync
 
-## Purge
+## Sync and Purge
 
-If you need to remove unused keys/strings from Translation.io using the current branch as reference :
+If you also need to remove unused keys/strings from Translation.io using the current branch as reference :
 
-    bundle exec rake translation:purge
+    bundle exec rake translation:sync_and_purge
 
-Note that this operation will also perform a sync at the same time.
+As the name says, this operation will also perform a sync at the same time.
 
 Warning : all keys that are not present in the current branch will be **permanently deleted both on Translation.io and in your app**.
 

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

@@ -32,11 +32,9 @@ module TranslationIO
             yaml_path = File.join(@yaml_locales_path, "localization.#{target_locale}.yml")
 
             TranslationIO.info yaml_path, 2, 2
-            flat_translations = {}
 
-            source_flat_special_translations.each_pair do |key, value|
-              target_key = key.gsub(/\A#{@source_locale}\./, "#{target_locale}.")
-              flat_translations[target_key] = all_flat_special_translations[target_key]
+            flat_translations = all_flat_special_translations.select do |key|
+              TranslationIO::YamlEntry.from_locale?(key, target_locale) && !TranslationIO::YamlEntry.ignored?(key)
             end
 
             yaml_data = YAMLConversion.get_yaml_data_from_flat_translations(flat_translations)

data/lib/translation_io/client.rb

@@ -19,7 +19,7 @@ module TranslationIO
       TranslationIO::Client::SyncOperation.new(self).run
     end
 
-    def purge
+    def sync_and_purge
       TranslationIO::Client::SyncOperation.new(self).run(true)
     end
   end

data/lib/translation_io/config.rb

@@ -6,17 +6,19 @@ module TranslationIO
     attr_accessor :verbose
     attr_accessor :test
     attr_accessor :ignored_key_prefixes
+    attr_accessor :localization_key_prefixes
     attr_accessor :charset
 
     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.ignored_key_prefixes = []
-      self.charset              = 'UTF-8'
+      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      = []
+      self.localization_key_prefixes = []
+      self.charset                   = 'UTF-8'
     end
 
     def pot_path

data/lib/translation_io/tasks.rb

@@ -2,9 +2,10 @@ require 'gettext/tools'
 
 namespace :translation do
 
-  DESCRIPTIONS = { :init  => "Initialize your Translation.io project",
-    :sync  => "Send new translatable keys/strings and get new translations from Translation.io",
-    :purge => "Remove unused keys/strings from Translation.io using the current branch as reference"
+  DESCRIPTIONS = {
+    :init           => "Initialize your Translation.io project",
+    :sync           => "Send new translatable keys/strings and get new translations from Translation.io",
+    :sync_and_purge => "Remove unused keys/strings from Translation.io using the current branch as reference"
   }
 
   desc "Get configuration infos of Translation gem"
@@ -26,4 +27,8 @@ EOS
       end
     end
   end
+
+  task :purge => :environment do
+    TranslationIO.info("Purge is deprecated, please use rake 'translation:sync_and_purge' instead.")
+  end
 end

data/lib/translation_io/yaml_entry.rb

@@ -1,5 +1,9 @@
 module TranslationIO
-  module TranslationIO::YamlEntry
+  module YamlEntry
+
+    IGNORED_KEY_PREFIXES = [
+      'faker.'
+    ]
 
     LOCALIZATION_KEY_PREFIXES = [
       'date.formats',
@@ -13,7 +17,8 @@ module TranslationIO
       'number.human.format',
       'number.human.storage_units.format',
       'number.human.decimal_units.format',
-      'number.human.decimal_units.units.unit'
+      'number.human.decimal_units.units.unit',
+      'i18n.transliterate'
     ]
 
     class << self
@@ -34,15 +39,27 @@ module TranslationIO
       end
 
       def localization_prefix?(key)
-        LOCALIZATION_KEY_PREFIXES.any? do |prefix|
+        localization_key_prefixes.any? do |prefix|
           key_without_locale(key).start_with?(prefix)
         end
       end
 
       private
 
+      def localization_key_prefixes
+        if TranslationIO.config
+          LOCALIZATION_KEY_PREFIXES + TranslationIO.config.localization_key_prefixes
+        else
+          LOCALIZATION_KEY_PREFIXES
+        end
+      end
+
       def ignored_key_prefixes
-        ['faker.'] + TranslationIO.config.ignored_key_prefixes
+        if TranslationIO.config
+          IGNORED_KEY_PREFIXES + TranslationIO.config.ignored_key_prefixes
+        else
+          LOCALIZATION_KEY_PREFIXES
+        end
       end
 
       def key_without_locale(key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Aurelien Malisart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-12-12 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.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Rails translation made _("simple") with YAML and GetText.