i18n-migrations 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 531a223b03e63c6f9d34aaf078bb147680e52750
-  data.tar.gz: ca7e31d8322a7a7adf7d3ccefec0e3819707f22f
+  metadata.gz: 984613105aadaa3012093105cf6b8b7eee28fabb
+  data.tar.gz: 9afd01228bdf3753fcd03e69ab14ba0eb983be02
 SHA512:
-  metadata.gz: ae393c640c0e3310c84c8a048cbef260b5dc9f21b494730fc97c6040992f800ad9b80d2ea4b9aeabf876b0f4956fedac9fce2a6be1457650f0eca0d7e6f6f35f
-  data.tar.gz: c530be9f465eea4c245932e339e9bc19d3b2edf63a04658758d3dfb06f7e45ef165643da9ad5dffd2befebd7b6281b458ca643ab5deef55af911d010b69138fb
+  metadata.gz: 6445cac5c4818520ed0c95955012a53ddd3f51fa7af55374b8c06613b38b459d9c01fdd44819f62e68fee551eb88f9a172dbed626bfb7b407c1b20f3ed24a4aa
+  data.tar.gz: 4aeb4db1c7a99c94e97c9aeb1fd3d3f14e7f2ccd45df3a09be51999bb2cfc5e8a6bd0c53dba21abf95608087efe189176bf0fc95a9e37478925d20e0e830dfb1

data/lib/i18n/migrations/google_translate_dictionary.rb

@@ -7,25 +7,43 @@ module I18n
         @from_locale, @to_locale, @key, @do_not_translate = from_locale, to_locale, key, do_not_translate
       end
 
+      # key is provided so we can figure out if this is text or html
       # returns [translated term, notes]
-      def lookup(term)
+      def lookup(term, key: nil)
         return [term, ''] if @from_locale == @to_locale
 
         response = RestClient.get 'https://www.googleapis.com/language/translate/v2', {
             accept: :json,
-            params: { key: @key, source: @from_locale, target: @to_locale, q: term }
+            params: { key: @key,
+                      source: @from_locale,
+                      target: @to_locale,
+                      format: format(key),
+                      q: term }
         }
         translated_term = JSON.parse(response.body)['data']['translations'].first['translatedText']
-        translated_term, errors = fix(term, translated_term)
+        translated_term, errors = fix(term, translated_term, key: key)
         unless errors.empty?
           STDERR.puts "'#{term}' => '#{translated_term}'\n#{errors.join(', ').red}"
         end
         [translated_term, (errors.map { |e| "[error: #{e}]" } + ['[autotranslated]']).join("\n")]
       end
 
-      VARIABLE_STRING = /%\{[^\}]+\}/
+      VARIABLE_STRING_REGEX = /%\{[^\}]+\}/
+      HTML_ESCAPE_REGEX = /&[A-Za-z#0-9]+;/
+      HTML_ESCAPES = {
+          ''' => "'",
+          '&' => '&',
+          '&lt;' => '<',
+          '&gt;' => '>',
+          '&quot;' => '"',
+          '&nbsp;' => ' ',
+          '&#8594;' => '→',
+          '&#8592;' => '←',
+          '&hellip;' => '…',
+      }
       # returns updated after term, errors
-      def fix(before, after)
+      def fix(before, after, key: nil)
+        is_html = format(key) == :html
         errors = []
 
         # do not translate
@@ -43,8 +61,8 @@ module I18n
         after = after.gsub('% {', '%{')
 
         # match up variables, should have same variable in before and after
-        before_variables = before.scan(VARIABLE_STRING)
-        after_variables = after.scan(VARIABLE_STRING)
+        before_variables = before.scan(VARIABLE_STRING_REGEX)
+        after_variables = after.scan(VARIABLE_STRING_REGEX)
 
         if before_variables.sort == after_variables.sort
           # we have all of our variables, let's make sure spacing before them is correct
@@ -76,11 +94,33 @@ module I18n
           end
         end
 
+        # fix html escapes
+        escapes = after.scan(HTML_ESCAPE_REGEX)
+        if escapes.present?
+          before_escapes = before.scan(HTML_ESCAPE_REGEX)
+          escapes.each do |escape|
+            if is_html && before_escapes.include?(escape)
+              # leave it
+            else
+              if (replace_with = HTML_ESCAPES[escape])
+                after = after.sub(escape, replace_with)
+              else
+                errors << "Don't know how to clean up #{escape}"
+              end
+            end
+          end
+        end
+
+
         [after, errors]
       end
 
       private
 
+      def format(key)
+        key&.index('_html') ? :html : :text
+      end
+
       def find_included_translation(after, bad_translations)
         bad_translations.each do |translation|
           return translation if after.include?(translation)

data/lib/i18n/migrations/locale.rb

@@ -20,7 +20,7 @@ module I18n
         main_data = main_locale.read_data
         main_data.each do |key, main_term|
           old_term = data[key]
-          new_term, errors = @dictionary.fix(main_term, old_term)
+          new_term, errors = @dictionary.fix(main_term, old_term, key: key)
           if new_term != old_term
             data[key] = new_term
             puts "#{"Fix".green} #{key.green}:"
@@ -120,7 +120,7 @@ module I18n
         count = 0
         main_data = main_locale.read_data
         main_data.each do |key, term|
-          new_data[key], new_notes[key] = @dictionary.lookup(term)
+          new_data[key], new_notes[key] = @dictionary.lookup(term, key: key)
           print '.'.green
           break if limit && limit < (count += 1)
         end

data/lib/i18n/migrations/migration.rb

@@ -93,7 +93,7 @@ module I18n
         if overrides[@locale.to_sym]
           @data[key] = overrides[@locale.to_sym]
         else
-          @data[key], @notes[key] = @dictionary.lookup(term)
+          @data[key], @notes[key] = @dictionary.lookup(term, key: key)
         end
       end
     end

data/lib/i18n/migrations/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Migrations
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-migrations
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jeremy Lightsmith