translation 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f401074ed1430b32c5c99538ce08de94f54288f0
-  data.tar.gz: 95b51e1d7e1baf634bd38338d14f538e798dab88
+  metadata.gz: 438a297a6cc07e0af97053bf03b98e5c5c0613dd
+  data.tar.gz: 433b5ab03bdd59005cf81dfc4c042e0aefb7ab0d
 SHA512:
-  metadata.gz: 34e7fef03073d4a3e7725ee4a762920fb46aee17c86492c15f3c1f216d549ae42dcc8346c05a9ce61dc851bb38585e0708054b61c02e213879eeb0e92ade819d
-  data.tar.gz: 2957860ddb4b052a3f6d4c3fe92d536c3f39ed74c8134908903ec414db76eb89bccde8359e9c6916beddf1a16e94a6459d7fdad80371988b6bfeaf19f0f10161
+  metadata.gz: 0fac9fb66470320c386ea22792953ccf164f1a05d2d759b2ec994fae468e6c6d9b96b12109ec0f379f2c2ec48ae391215d5d92c69569270b85fc63d62ca5718e
+  data.tar.gz: 2f88d12ab1f5cb1c724086b0cfc40bfe7c3bff4cca05d4078c90d5fef8e1c2ceb913d513eb677d7f317290bd7bdfe79a7a861370979af3ab08c37f6cd130ee56

data/README.md

@@ -1,5 +1,7 @@
 # Ruby/Rails gem for [Translation.io](http://translation.io).
 
+![Build Status](https://www.codeship.io/projects/f7cd4ac0-b73c-0131-51ea-522dcd2196ed/status)
+
 ## Description
 
 Add this gem to your [Rails](http://rubyonrails.org) app to translate it with [Translation.io](http://translation.io).

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

@@ -23,7 +23,7 @@ module TranslationIO
 # WARNING. THIS FILE WAS AUTO-GENERATED BY THE TRANSLATION GEM.
 # IF YOU UPDATE IT, YOUR CHANGES WILL BE LOST AT THE NEXT SYNC.
 #
-# To update this file, use this translation interface :
+# To update this file, use this translation interface:
 # #{@parsed_response['project_url']}/#{target_locale}
 #
 EOS

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

@@ -36,6 +36,7 @@ module TranslationIO
             yaml_data = YAMLConversion.get_yaml_data_from_flat_translations(target_flat_special_translations)
 
             File.open(yaml_path, 'wb') do |file|
+              file.write(self.class.top_comment)
               file.write(yaml_data)
             end
           end
@@ -57,6 +58,7 @@ module TranslationIO
                 yaml_path = File.join(@yaml_locales_path, "localization.#{target_locale}.yml")
 
                 File.open(yaml_path, 'wb') do |file|
+                  file.write(self.class.top_comment)
                   file.write(parsed_response["yaml_data_#{target_locale}"])
                 end
               end
@@ -64,6 +66,19 @@ module TranslationIO
           end
         end
 
+        def self.top_comment
+          <<EOS
+# THIS FILE CONTAINS LOCALIZATION KEYS : date and number formats, number precisions,
+# number separators and all other non-text values depending on the language.
+# These values must not reach the translator, so they are separated in this file.
+#
+# More info here: https://translation.io/blog/gettext-is-better-than-rails-i18n#localization
+#
+# You can edit and/or add new keys here, they won't be touched by Translation.io.
+#
+EOS
+        end
+
       end
     end
   end

data/lib/translation_io/client/init_operation.rb

@@ -24,7 +24,24 @@ module TranslationIO
 
         UpdatePotFileStep.new(pot_path, source_files).run(params)
         UpdateAndCollectPoFilesStep.new(target_locales, pot_path, locales_path).run(params)
-        CreateYamlPoFilesStep.new(source_locale, target_locales, yaml_file_paths).run(params)
+
+        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)
+
+        if yaml_locales_difference.any?
+          TranslationIO.info("[error] Your `config.target_locales` are [#{target_locales.join(', ')}] and we have found some YAML keys for [#{all_used_yaml_locales.join(', ')}] and they does not match.")
+          TranslationIO.info("[error] Do you really want to continue? (y/N)")
+
+          print "> "
+          input = STDIN.gets.strip
+
+          if input != 'y' && input != 'Y'
+            exit(0)
+          end
+        end
 
         TranslationIO.info "Sending data to server"
         uri             = URI("#{client.endpoint}/projects/#{client.api_key}/init")

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

@@ -2,10 +2,13 @@ module TranslationIO
   class Client
     class InitOperation < BaseOperation
       class CreateYamlPoFilesStep
+        attr_accessor :all_used_yaml_locales
+
         def initialize(source_locale, target_locales, yaml_file_paths)
-          @source_locale   = source_locale
-          @target_locales  = target_locales
-          @yaml_file_paths = yaml_file_paths
+          @source_locale    = source_locale
+          @target_locales   = target_locales
+          @yaml_file_paths  = yaml_file_paths
+          @all_used_yaml_locales = Set.new
         end
 
         def run(params)
@@ -25,6 +28,7 @@ module TranslationIO
           all_flat_translations = FlatHash.to_flat_hash(all_translations)
 
           all_flat_string_translations = all_flat_translations.select do |key, value|
+            all_used_yaml_locales << key.split('.').first
             YamlEntry.string?(key, value) && !YamlEntry.localization?(key, value)
           end
 

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

@@ -9,6 +9,7 @@ module TranslationIO
 
         def run(params)
           TranslationIO.info "Updating POT file."
+
           GetText::Tools::XGetText.run(*@source_files, '-o', @pot_path,
                                        '--msgid-bugs-address', TranslationIO.config.pot_msgid_bugs_address,
                                        '--package-name',       TranslationIO.config.pot_package_name,

data/lib/translation_io/config.rb

@@ -6,6 +6,7 @@ module TranslationIO
     attr_accessor :verbose
     attr_accessor :test
     attr_accessor :ignored_key_prefixes
+    attr_accessor :ignored_source_files
     attr_accessor :localization_key_prefixes
     attr_accessor :charset
     attr_accessor :metadata_path
@@ -25,6 +26,7 @@ module TranslationIO
       self.verbose                   = 1
       self.test                      = false
       self.ignored_key_prefixes      = []
+      self.ignored_source_files      = [] # Files not parsed for GetText entries
       self.localization_key_prefixes = []
       self.charset                   = 'UTF-8'
       self.metadata_path             = File.join('config', 'locales', '.translation_io')
@@ -47,9 +49,11 @@ module TranslationIO
     end
 
     def source_files
-      Dir['**/*.{rb,erb,ruby,rabl}'].select do |p|
+      file_paths = Dir['**/*.{rb,erb,ruby,rabl}'].select do |p|
         !p.start_with?('vendor/') && !p.start_with?('tmp/')
       end
+
+      file_paths - ignored_source_files
     end
 
     def haml_source_files

data/lib/translation_io/railtie.rb

@@ -4,6 +4,7 @@ require 'i18n/config'
 require 'gettext'
 require 'gettext/po'
 require 'gettext/po_parser'
+require 'gettext/tools/xgettext'
 
 module TranslationIO
   class Railtie < Rails::Railtie
@@ -39,4 +40,23 @@ module GetText
       @report_warning = false
     end
   end
+
+  module Tools
+    class XGetText
+      def parse(paths)
+        po = PO.new
+        paths = [paths] if paths.kind_of?(String)
+        paths.each do |path|
+          begin
+            parse_path(path, po)
+          rescue SystemExit => e
+            # puts(_("Error parsing %{path}") % {:path => path})
+            puts
+            puts
+          end
+        end
+        po
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Aurelien Malisart
@@ -9,28 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -49,20 +43,14 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency