i18n-migrations 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2789bfb627b7453b272680ee6eede9f6bedbfacf
-  data.tar.gz: fc625101156e0217ece5a1fe2379686e7f4401a6
+  metadata.gz: 6e160f560c0c12fbeee0964487c4c97331322fd3
+  data.tar.gz: 2ae060da78791f019f5d01b4cd8b9548dce4fe3c
 SHA512:
-  metadata.gz: 0e74ac7d4a4e593cca6422d7be921ec73b3e3a188190bed95a097a54adafd1f9942858724a3cfc548329f6083941575f6bc3b8a598929d548908e766eb5cfa96
-  data.tar.gz: 85815a347cb2fc71bdba8ef5d0ffb711336b90c9a6d15d26d4b539487acb3c23ff73a313a408f47e2e2f0e97ee6b4374424cbe196cdf679f870eeb0cc051c8a4
+  metadata.gz: 0b8d3f5051949f55344f93668ffb69ad5b5339208d7d56a616f3981093406e4709365558f86e0c0dd3ee798a2f7b06a53b55510a3c8ec7ed0b7374560aa74fad
+  data.tar.gz: 17290e0d50f6ab9028f905337d21bb6ad4c5e1f29857b1d5f87b9f503589c67fd6294d04791c8bfbc40b3671baf8ba23510ed5c4cd3e3b45e03c225cd74658a0

data/lib/i18n/migrations/google_translate_dictionary.rb

@@ -20,7 +20,7 @@ module I18n
         unless errors.empty?
           STDERR.puts "'#{term}' => '#{translated_term}'\n#{errors.join(', ').red}"
         end
-        [translated_term, (errors.map{|e| "[error: #{e}]"} + ['[autotranslated]']).join("\n")]
+        [translated_term, (errors.map { |e| "[error: #{e}]" } + ['[autotranslated]']).join("\n")]
       end
 
       VARIABLE_STRING = /%\{[^\}]+\}/
@@ -46,7 +46,24 @@ module I18n
         before_variables = before.scan(VARIABLE_STRING)
         after_variables = after.scan(VARIABLE_STRING)
 
-        if before_variables.sort != after_variables.sort
+        if before_variables.sort == after_variables.sort
+          # we have all of our variables, let's make sure spacing before them is correct
+
+          before_variables.each do |variable|
+            before_index = before =~ /(.?)#{variable}/
+            before_leading = $1
+            after_index = after =~ /(.?)#{variable}/
+            after_leading = $1
+
+            if before_index && after_index &&
+                before_leading == ' ' && after_leading != ' ' &&
+                after_index != 0
+              after = after.sub(variable, " #{variable}")
+            end
+          end
+
+        else
+          # we don't have all the variables we should have
           missing = before_variables - after_variables
           extra = after_variables - before_variables
 

data/lib/i18n/migrations/migrator.rb

@@ -134,7 +134,7 @@ end
         notes = all_notes[key]
         notes = notes.present? ? notes.split("\n") : []
         notes = notes.reject { |n| n.start_with?("[error:") }
-        all_notes[key] = (errors + notes).join("\n")
+        all_notes[key] = (errors.map{|e| "[error: #{e}]"} + notes).join("\n")
       end
 
       def update_locale_info(locale)

data/lib/i18n/migrations/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Migrations
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-migrations
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jeremy Lightsmith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler