translation 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd5685e820858ee9272a66b6cefb5d85d82f01d8
-  data.tar.gz: 547c098280bc7db216d336c6bf676c0ec738a1c3
+  metadata.gz: b6ca60fd941e00c41f19220e38e4be7483513b03
+  data.tar.gz: e52d363d594a15f637c9d14b81eb9577b83cd4d2
 SHA512:
-  metadata.gz: 2f404426ef37f123acbf9957c9d96acc522c6e0f32e749b957ca0c9eca3204a0dba3c8791b109d42e2fcd20687a9902a249bed9f6a9d2bc8ddf230717febd080
-  data.tar.gz: 90d29c39095fb4234d850f8e34b1d4cf22b1fd06629f057481fe673e8cf78028bd0fd69ff9363c846fa022cfbc7b2e9e4715962048b07e07332bf5f7e3cd6b8f
+  metadata.gz: e6ed0c302456c4152e8ace2355d9036494a4d9a498ca924c9f0e8a0a304979cd067682c7f8684b425e08790f8af84c0b74bf03c0608bd9116508e6b686cc0d77
+  data.tar.gz: e7a5f82a5e66036dbc09ed1e5c29b408f630e340e6487bf8bb449ac08c02be700e3bd5210d7725025dfee7062f807f3b6583a5e4fe99c9ecfab61d3440233408

data/README.md

@@ -8,16 +8,16 @@ Add this gem to your [Rails](http://rubyonrails.org) app to translate it with [T
 
 ## Installation
 
-Add the gem to your project's Gemfile :
+Add the gem to your project's Gemfile:
 
     gem 'translation'
 
-Then :
+Then:
 
 * Create a translation project [from the UI](https://translation.io).
 * Copy the initializer into your Rails app (`config/initializers/translation.rb`)
 
-The initializer looks like this :
+The initializer looks like this:
 
     TranslationIO.configure do |config|
       config.api_key        = 'some api key which is very long'
@@ -25,7 +25,7 @@ The initializer looks like this :
       config.target_locales = ['fr', 'nl', 'de', 'es']
     end
 
-And finish by inititalizing your translation project with :
+And finish by inititalizing your translation project with:
 
     bundle exec rake translation:init
 
@@ -34,36 +34,46 @@ If you later need to add/remove target languages, please read our
 
 ## Sync
 
-To send new translatable keys/strings and get new translations from Translation.io, simply run :
+To send new translatable keys/strings and get new translations from Translation.io, simply run:
 
     bundle exec rake translation:sync
 
 ## Sync and Purge
 
-If you also 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:sync_and_purge
 
 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**.
+Warning: all keys that are not present in the current branch will be **permanently deleted both on Translation.io and in your app**.
 
 ## Advanced Configuration Options
 
 The `TranslationIO.configure` block in `config/initializers/translation.rb` can take several optional configuration options.
 
+### Disable GetText
 
+Sometimes, you only want to use YAML and don't want to be bothered by GetText at all.
+For these cases, you just have to add `disable_gettext` in the config file.
+
+For example:
+
+    TranslationIO.configure do |config|
+      ...
+      config.disable_gettext = true
+      ...
+    end
 
 ### Ignored YAML keys
 
 Sometimes you would like to ignore some YAML keys coming from gems or so.
 You can use the `ignored_key_prefixes` for that.
 
-For example :
+For example:
 
     TranslationIO.configure do |config|
       ...
-
       config.ignored_key_prefixes = [
         'number.human.',
         'admin.',
@@ -74,12 +84,13 @@ For example :
         'views.pagination.',
         'enumerize.visibility.'
       ]
+      ...
     end
 
 ### Custom localization key prefixes
 
 Rails YAML files contain not only translation strings but also localization values (integers, arrays, booleans)
-in the same place and that's bad. For example : date formats, number separators, default
+in the same place and that's bad. For example: date formats, number separators, default
 currency or measure units, etc.
 
 A translator is supposed to translate, not localize. That's not his role to choose how you want your dates or
@@ -92,28 +103,28 @@ That's why these localization keys are detected and separated on a dedicated YAM
 We automatically threat [known localization keys](lib/translation_io/yaml_entry.rb), but if you would like
 to add some more, use the `localization_key_prefixes` option.
 
-For example :
+For example:
 
     TranslationIO.configure do |config|
       ...
-
       config.localization_key_prefixes = ['my_gem.date.formats']
+      ...
     end
 
 ### Paths where locales are stored (not recommended)
 
-You can specify where your GetText and YAML files are on disk :
+You can specify where your GetText and YAML files are on disk:
 
     TranslationIO.configure do |config|
       ...
-
       config.locales_path      = 'some/path' # defaults to config/locales/gettext
       config.yaml_locales_path = 'some/path' # defaults to config/locales
+      ...
     end
 
 ## Tests
 
-To run the specs :
+To run the specs:
 
     bundle
     bundle exec rspec

data/lib/translation_io/client/init_operation.rb

@@ -29,15 +29,32 @@ module TranslationIO
         create_yaml_pot_files_step = CreateYamlPoFilesStep.new(source_locale, target_locales, yaml_file_paths)
         create_yaml_pot_files_step.run(params)
 
-        all_used_yaml_locales   = (create_yaml_pot_files_step.all_used_yaml_locales.to_a.map(&:to_s) - [config.source_locale.to_s]).sort.map(&:to_s)
-        yaml_locales_difference = (all_used_yaml_locales) - target_locales.sort.map(&:to_s)
+        all_used_yaml_locales    = (create_yaml_pot_files_step.all_used_yaml_locales.to_a.map(&:to_s) - [source_locale.to_s]).sort.map(&:to_s)
+        is_source_locale_unfound = !source_locale.in?(all_used_yaml_locales)
+        unfound_target_locales   = target_locales - all_used_yaml_locales
 
-        if yaml_locales_difference.any?
+        if is_source_locale_unfound
           puts
           puts "----------"
-          puts "Your `config.target_locales` are [#{target_locales.join(', ')}]."
-          puts "We have found some YAML keys for [#{all_used_yaml_locales.join(', ')}] and they don't match."
-          puts "Some of these locales may be coming from your gems."
+          puts "Your `config.source_locale` is \"#{source_locale}\" but no YAML keys were found for this locale."
+          puts "Check that you haven't misspelled the locale (ex. 'en-GB' instead of 'en')."
+          puts "----------"
+          puts "Do you want to continue anyway? (y/N)"
+
+          print "> "
+          input = STDIN.gets.strip
+
+          if input != 'y' && input != 'Y'
+            exit(0)
+          end
+        end
+
+        if unfound_target_locales.any?
+          puts
+          puts "----------"
+          puts "Your `config.target_locales` are [#{target_locales.sort.join(', ')}]."
+          puts "But we haven't found any YAML key for [#{unfound_target_locales.join(', ')}], is this normal?"
+          puts "If not, check that you haven't misspelled the locale (ex. 'en-GB' instead of 'en')."
           puts "----------"
           puts "Do you want to continue? (y/N)"
 

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

@@ -26,35 +26,39 @@ module TranslationIO
                 flat_yaml_hash = FlatHash.to_flat_hash(yaml_hash)
 
                 flat_yaml_hash.each do |key, value|
-                  if key == "#{@source_locale}.#{source_edit['key']}" && value == source_edit['old_text']
-                    TranslationIO.info "#{source_edit['key']} | #{source_edit['old_text']} -> #{source_edit['new_text']}", 2, 2
-
-                    if locale_file_path_in_project?(file_path)
-                      flat_yaml_hash[key] = source_edit['new_text']
-
-                      File.open(file_path, 'w') do |f|
-                        f.write(FlatHash.to_hash(flat_yaml_hash).to_yaml)
-                      end
-                    else
-                      yaml_path = File.join(TranslationIO.config.yaml_locales_path, "#{@source_locale}.yml")
-
-                      if File.exists?(yaml_path) # en.yml
-                        yaml_hash      = YAML::load(File.read(yaml_path))
-                        flat_yaml_hash = FlatHash.to_flat_hash(yaml_hash)
-                      else
-                        FileUtils::mkdir_p File.dirname(yaml_path)
-                        flat_yaml_hash = {}
+                  if key == "#{@source_locale}.#{source_edit['key']}"
+                    if value == source_edit['old_text']
+                      TranslationIO.info "#{source_edit['key']} | #{source_edit['old_text']} -> #{source_edit['new_text']}", 2, 2
+
+                      if locale_file_path_in_project?(file_path)
+                        flat_yaml_hash[key] = source_edit['new_text']
+
+                        File.open(file_path, 'w') do |f|
+                          f.write(FlatHash.to_hash(flat_yaml_hash).to_yaml)
+                        end
+                      else # override source text of gem
+                        yaml_path = File.join(TranslationIO.config.yaml_locales_path, "#{@source_locale}.yml")
+
+                        if File.exists?(yaml_path) # source yaml file
+                          yaml_hash      = YAML::load(File.read(yaml_path))
+                          flat_yaml_hash = FlatHash.to_flat_hash(yaml_hash)
+                        else
+                          FileUtils::mkdir_p File.dirname(yaml_path)
+                          flat_yaml_hash = {}
+                        end
+
+                        flat_yaml_hash["#{@source_locale}.#{source_edit['key']}"] = source_edit['new_text']
+
+                        File.open(yaml_path, 'w') do |f|
+                          f.write(FlatHash.to_hash(flat_yaml_hash).to_yaml)
+                        end
                       end
 
-                      flat_yaml_hash["#{@source_locale}.#{source_edit['key']}"] = source_edit['new_text']
-
-                      File.open(yaml_path, 'w') do |f|
-                        f.write(FlatHash.to_hash(flat_yaml_hash).to_yaml)
-                      end
+                      inserted = true
+                      break
+                    else
+                      TranslationIO.info "#{source_edit['key']} | Ignored because translation was updated directly in source YAML file", 2, 2
                     end
-
-                    inserted = true
-                    break
                   end
                 end
 
@@ -64,7 +68,7 @@ module TranslationIO
           end
 
           File.open(TranslationIO.config.metadata_path, 'w') do |f|
-            f.write({ 'timestamp' => Time.now.getutc.to_i }.to_yaml)
+            f.write({ 'timestamp' => Time.now.utc.to_i }.to_yaml)
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
 platform: ruby
 authors:
 - Aurelien Malisart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext