translation 1.8.4 → 1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc4d310a1304b751f3d62ee5163fd20afd5ae0bf
-  data.tar.gz: 059d55d777d7e0672c3e826db523440c7665f7dc
+  metadata.gz: 4c393ed07bd2bf4db910f2b89540920d86da3244
+  data.tar.gz: f82f7acf41fb97eccdc42eca985b6ae2b2724d21
 SHA512:
-  metadata.gz: 5476b81adeaaef13be180f18fc10aed9a006ca0f1b83aa453ea97f0c4ec7395779094a44debca5e06af75f1ad809c0ddbbab88a8806b55b15e397191910e5b2d
-  data.tar.gz: 626d298948f5ff3df4d1a6fa2dd0e83d76b44702432881d787fd55ade97d0656ebaeb7b9260a84dec16c641d2bff60a2f01c3e8a54f563746b996a10f59e203b
+  metadata.gz: 32fd1caaa72d9de52a640323cd3337609fa09d92044f2cd4747203d272b50010afde2ee97547b606f86f94c0c8d6a2b192834efc8f18822cbdf19cb3d41b7479
+  data.tar.gz: d1bd9c545975c64e8095ed7b484c2776891f61a7fd48de357b6bcde257c5444e865372ce22ff6b616d999ef9b9f5a4d660616f38dac3cadb8fd210f96958f7bc

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

@@ -21,12 +21,29 @@ module TranslationIO
                 file.puts "  #{entry}"
                 file.puts "end"
               end
+
+              # can happen sometimes if gettext parsing is wrong
+              if ruby_cmd_available?
+                remove_file_if_syntax_invalid(file_path, entry)
+              end
             end
           end
         end
 
         protected
 
+        def remove_file_if_syntax_invalid(file_path, entry)
+          if `ruby -c #{file_path} 2>/dev/null`.empty? # returns 'Syntax OK' if syntax valid
+            TranslationIO.info ""
+            TranslationIO.info "Warning - #{@markup_type.to_s.upcase} Gettext parsing failed: #{entry}"
+            TranslationIO.info "          This entry will be ignored until you fix it. Please note that"
+            TranslationIO.info "          this warning can sometimes be caused by complex interpolated strings."
+            TranslationIO.info ""
+
+            FileUtils.rm(file_path)
+          end
+        end
+
         def extracted_gettext_entries
           entries = []
 
@@ -41,6 +58,10 @@ module TranslationIO
 
           entries
         end
+
+        def ruby_cmd_available?
+          @ruby_cmd_available ||= `which ruby`.strip.length > 0
+        end
       end
     end
   end

data/lib/translation_io/client/init_operation.rb

@@ -46,6 +46,7 @@ module TranslationIO
           BaseOperation::CreateNewMoFilesStep.new(locales_path).run
 
           info_yaml_directory_structure
+          info_project_url(parsed_response)
         end
 
         cleanup
@@ -99,6 +100,14 @@ module TranslationIO
         puts "please check this article: https://translation.io/blog/dealing-with-yaml-files-and-their-directory-structure"
         puts "----------"
       end
+
+      def info_project_url(parsed_response)
+        puts
+        puts "----------"
+        puts "Use this URL to translate: #{parsed_response['project_url']}"
+        puts "Then use 'rake translation:sync' to send new keys to Translation.io and get new translations into your project."
+        puts "----------"
+      end
     end
   end
 end

data/lib/translation_io/client/sync_operation.rb

@@ -39,10 +39,19 @@ module TranslationIO
           BaseOperation::CreateNewMoFilesStep.new(locales_path).run
           BaseOperation::SaveNewYamlFilesStep.new(target_locales, yaml_locales_path, parsed_response).run
           BaseOperation::SaveSpecialYamlFilesStep.new(source_locale, target_locales, yaml_locales_path, yaml_file_paths).run
+
+          info_project_url(parsed_response)
         end
 
         cleanup
       end
+
+      def info_project_url(parsed_response)
+        puts
+        puts "----------"
+        puts "Use this URL to translate: #{parsed_response['project_url']}"
+        puts "----------"
+      end
     end
   end
 end

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

@@ -10,9 +10,7 @@ module TranslationIO
         def run(params)
           TranslationIO.info "Downloading YAML source editions."
 
-          timestamp = YAML::load(File.read(TranslationIO.config.metadata_path))['timestamp'] rescue 0
-
-          params.merge!({ :timestamp => timestamp })
+          params.merge!({ :timestamp => metadata_timestamp })
           parsed_response = perform_source_edits_request(params)
 
           unless parsed_response.nil?
@@ -74,6 +72,21 @@ module TranslationIO
 
         private
 
+        def metadata_timestamp
+          if File.exist?(TranslationIO.config.metadata_path)
+            metadata_content = File.read(TranslationIO.config.metadata_path)
+
+            if metadata_content.include?('>>>>') || metadata_content.include?('<<<<')
+              TranslationIO.info "[Error] #{TranslationIO.config.metadata_path} file is corrupted and seems to have unresolved versioning conflicts. Please resolve them and try again."
+              exit
+            else
+              return YAML::load(metadata_content)['timestamp'] rescue 0
+            end
+          else
+            return 0
+          end
+        end
+
         def perform_source_edits_request(params)
           uri             = URI("#{TranslationIO.client.endpoint}/projects/#{TranslationIO.client.api_key}/source_edits")
           parsed_response = BaseOperation.perform_request(uri, params)

data/lib/translation_io/config.rb

@@ -65,7 +65,7 @@ module TranslationIO
     end
 
     def slim_source_files
-      Dir['**/*.{slim}'].select do |p|
+      Dir['**/*.{slim,mjmlslim}'].select do |p|
         !p.start_with?('vendor/') && !p.start_with?('tmp/')
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translation
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: '1.9'
 platform: ruby
 authors:
 - Aurelien Malisart
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
@@ -68,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Rails translation made _("simple") with YAML and GetText. Localize your
   app using either t(".keys") or _("free text") and type "rake translation:sync" to
   synchronize with your translators.