i18nize 0.4.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eb468fa514aca67d48cd8446b001d19a767c5a87f99040ae7361c833757d69f
-  data.tar.gz: 491459d40226d8d04a213c849609fdfde0ab1144b8a346c6e85cdb7c4a584f6a
+  metadata.gz: 592b298cbac45e06745596fe3b02025797d39f572214e2dd345ef6f9d39abe33
+  data.tar.gz: a661e6474225964f79d6d80a38c23f91d531e6c6c58b5c52e3b7b11de211d652
 SHA512:
-  metadata.gz: e1cf515c413fa8de3b46cbb35abdcea2cdf60ac7f52e5c1cddf705eae8e2a3875d9f8802642b33e553c1405978aa78b6fc8b05d2bcfa5d7edaa725840c801457
-  data.tar.gz: 07cd5ad618104d352c7124fe0add8dcb0ac0f7c2bd18a037239006c0ed5cd88532c011545aeabaf0dfea263b28cc0ad83977b39221ec9eda241ce03722713b00
+  metadata.gz: 210f54125ca483b27318abcdcb0647d947a83639d11e62ce4ca34506974d3cb0f65d2357954b81106eafd28874c64b1e774338548f48f3898d9e2fac84a1b85c
+  data.tar.gz: 21ed727606ee36a27b10ab94d7625f4b5deda616b3e4afd2fb745db7b69945b3a5688f0d6ba75d407d7fc4a82ee89eda49475c659f413c75bf03321594550ef0

data/lib/i18nize/comparer.rb

@@ -14,14 +14,21 @@ module I18nize
       from_data.each do |from_path, from_keys|
         dirname  = File.dirname(from_path)
         filename = File.basename(from_path)
-        expected_to_filename = filename.sub(/^#{from_locale}\.yml$/, "#{to_locale}.yml")
-        to_path = File.join(dirname, expected_to_filename)
+
+        locale_re = /(^|[._])#{Regexp.escape(from_locale)}\.(ya?ml)$/
+        expected_to_filename = filename.sub(locale_re) { "#{Regexp.last_match(1)}#{to_locale}.#{Regexp.last_match(2)}" }
+
+        to_path = if dirname == "." || dirname.empty?
+                    expected_to_filename
+                  else
+                    File.join(dirname, expected_to_filename)
+                  end
 
         to_keys = to_data[to_path] || {}
 
-        missing = from_keys.select do |key, _|
-          to_key = key.sub(/^#{from_locale}\./, "#{to_locale}.")
-          !to_keys.key?(to_key)
+        missing = from_keys.reject do |key, _|
+          to_key = key.sub(/^#{Regexp.escape(from_locale)}\./, "#{to_locale}.")
+          to_keys.key?(to_key)
         end
 
         result[from_path] = missing unless missing.empty?

data/lib/i18nize/inserter.rb

@@ -6,32 +6,32 @@ require_relative "comparer"
 
 module I18nize
   class Inserter
+    CONFLICT_POLICY = :overwrite # :overwrite | :skip
+
     def self.insert_missing(from_locale: "en", to_locale:, base_path: "config/locales", translator: nil)
       missing_data = Comparer.missing_translations(from_locale: from_locale, to_locale: to_locale)
 
       if translator
         char_count = missing_data.character_count
         puts "\n\e[33m[i18nize] Estimated character count: #{char_count}\e[0m"
-
-        if char_count > 500_000
-          puts "\e[31m[i18nize] Warning: DeepL Free has a 500,000 character monthly limit.\e[0m"
-        end
-
+        puts "\e[31m[i18nize] Warning: DeepL Free has a 500,000 character monthly limit.\e[0m" if char_count > 500_000
         print "\e[36mProceed with translation? [y/N]: \e[0m"
-        answer = $stdin.gets.strip.downcase
-
+        answer = $stdin.gets.to_s.strip.downcase
         unless answer == "y"
           puts "\e[90m[i18nize] Aborted by user.\e[0m"
           return
         end
       end
 
+      overwrites = []
+
       missing_data.data.each do |from_rel_path, translations|
         dirname  = File.dirname(from_rel_path)
         filename = File.basename(from_rel_path)
 
-        new_filename = filename.sub(/^#{from_locale}\.yml$/, "#{to_locale}.yml")
-        to_rel_path = File.join(dirname, new_filename)
+        locale_re = /(^|[._])#{Regexp.escape(from_locale)}\.(ya?ml)$/
+        new_filename = filename.sub(locale_re) { "#{Regexp.last_match(1)}#{to_locale}.#{Regexp.last_match(2)}" }
+        to_rel_path = dirname == "." || dirname.empty? ? new_filename : File.join(dirname, new_filename)
         to_full_path = File.join(base_path, to_rel_path)
 
         existing = File.exist?(to_full_path) ? YAML.load_file(to_full_path) : {}
@@ -39,16 +39,16 @@ module I18nize
 
         translation_map =
           if translator
-            en_values = translations.values
-            translated_values = translator.translate_texts(en_values)
-            translations.keys.zip(translated_values.values).to_h
+            src_values = translations.values
+            translated_values = translator.translate_texts(src_values) # => pole!
+            translations.keys.zip(translated_values).to_h
           else
             translations
           end
 
-        translation_map.each do |key, value|
-          path = key.sub(/^#{from_locale}\./, "").split(".")
-          insert_nested(existing[to_locale], path, value)
+        translation_map.each do |full_key, value|
+          path = full_key.sub(/^#{Regexp.escape(from_locale)}\./, "").split(".")
+          insert_nested(existing[to_locale], path, value, overwrites, to_rel_path, to_locale, CONFLICT_POLICY)
         end
 
         FileUtils.mkdir_p(File.dirname(to_full_path))
@@ -56,16 +56,41 @@ module I18nize
 
         puts "\e[32m[i18nize] Inserted #{translation_map.size} keys into #{to_full_path}\e[0m"
       end
+
+      if overwrites.any?
+        puts "\n\e[33m[i18nize] Overwrote #{overwrites.size} scalar node(s) to create nested structure:\e[0m"
+        overwrites.each do |c|
+          puts "  \e[33m- #{c[:file]}: #{c[:locale]}.#{c[:path].join('.')}\e[0m (was: #{c[:existing_class]})"
+        end
+      end
     end
 
-    def self.insert_nested(base, keys, value)
+    # conflict_policy: :overwrite (replace scalar with {}), :skip (leave as is)
+    def self.insert_nested(base, keys, value, overwrites, file, locale, conflict_policy)
       key = keys.shift
-      base[key] ||= {}
 
       if keys.empty?
         base[key] = value
+        return true
+      end
+
+      cur = base[key]
+
+      case cur
+      when nil
+        base[key] = {}
+        insert_nested(base[key], keys, value, overwrites, file, locale, conflict_policy)
+      when Hash
+        insert_nested(cur, keys, value, overwrites, file, locale, conflict_policy)
       else
-        insert_nested(base[key], keys, value)
+        if conflict_policy == :overwrite
+          overwrites << { file: file, locale: locale, path: [key, *keys], existing_class: cur.class.to_s }
+          base[key] = {}
+          insert_nested(base[key], keys, value, overwrites, file, locale, conflict_policy)
+        else
+          # :skip
+          false
+        end
       end
     end
   end

data/lib/i18nize/translator.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 require "net/http"
 require "uri"
 require "json"
@@ -7,42 +6,44 @@ require "json"
 module I18nize
   class Translator
     ENDPOINT = ENV.fetch("DEEPL_ENDPOINT", "https://api-free.deepl.com/v2/translate")
+    PLACEHOLDER_RE = /%{\s*[^}]+\s*}/
 
     def initialize(auth_key:, from_lang: "EN", to_lang:)
-      @auth_key = auth_key
+      @auth_key  = auth_key
       @from_lang = from_lang
-      @to_lang = to_lang
+      @to_lang   = to_lang
     end
 
     def translate_texts(texts)
-      return {} if texts.empty?
+      return [] if texts.empty?
+
+      placeholders = []
+      protected = texts.map do |t|
+        t.to_s.gsub(PLACEHOLDER_RE) do |m|
+          idx = placeholders.size
+          placeholders << m
+          "__I18NIZE_PLH_#{idx}__"
+        end
+      end
 
       uri = URI(ENDPOINT)
-
-      # Opakující se text parametry
       body_params = [
         ["auth_key", @auth_key],
         ["source_lang", @from_lang],
         ["target_lang", @to_lang],
-      ] + texts.map { |text| ["text", text] }
+      ] + protected.map { |text| ["text", text] }
 
-      request = Net::HTTP::Post.new(uri)
-      request["Content-Type"] = "application/x-www-form-urlencoded"
-      request.body = URI.encode_www_form(body_params)
+      req = Net::HTTP::Post.new(uri)
+      req["Content-Type"] = "application/x-www-form-urlencoded"
+      req.body = URI.encode_www_form(body_params)
 
-      response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-        http.request(request)
-      end
+      res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) { |h| h.request(req) }
+      raise "DeepL API Error: #{res.code} - #{res.body}" unless res.is_a?(Net::HTTPSuccess)
 
-      unless response.is_a?(Net::HTTPSuccess)
-        raise "DeepL API Error: #{response.code} - #{response.body}"
-      end
-
-      json = JSON.parse(response.body)
-      translated = json["translations"].map { |t| t["text"] }
+      json = JSON.parse(res.body)
+      out = json["translations"].map { |t| t["text"] }
 
-      Hash[texts.zip(translated)]
+      out.map { |s| s.gsub(/__I18NIZE_PLH_(\d+)__/) { placeholders[$1.to_i] } }
     end
   end
 end
-

data/lib/i18nize/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module I18nize
-  VERSION = "0.4.4"
+  VERSION = "0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18nize
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: '0.5'
 platform: ruby
 authors:
 - nikolas2145