awesome_translations 0.0.65 → 0.0.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a064cb6ccd392d08ccc04527a80a5b5926d7e49597f05560a6a0168d1498d1d
-  data.tar.gz: 151f20aed7e4142f9446894ce8d5f11ad02e20e3d51df242d7a4b264dc1102cf
+  metadata.gz: 4033166fa0b00db136066ec3ec9c798b308fbb1c6e482dc5772d04c00c4288ff
+  data.tar.gz: 358aa1cdebc81ae4c702786fbe446e052a0aa74e8d5dcfbe3c286f8cc32db8fe
 SHA512:
-  metadata.gz: 16dbaadb429667549c1ab80bd40fe24086ef8bfb47018b4e248dd2e401e4de97a217ebe26a58dfaf4ed29f614b9403516ab79e075140a8b5c8e8b80be2d96db3
-  data.tar.gz: 7c70d4067de4bad81339467c0e5f270a9146f02fd4b9947f5b07c812f2682b1933f1e768fe8c8707909cd1bcf7fedceb5646e3f072fac43df3ab7e59673f9656
+  metadata.gz: 18ed1ea722ffced49ac7629f534ca1f05ec4046527424e5e9617c15ce01f371068e5728bf5fb969070960a799f2f97d4b23fb8324bb32b826cfc5415a46214ef
+  data.tar.gz: 8624f507e834e4089fcf380102335b0c85a39c13fa93f284fca25300756a3cbdb3613af85a1026702802086ff9a3875b8b7d0bd74064f73647fff88b9789cda8

data/app/models/awesome_translations/translated_value.rb

@@ -34,25 +34,67 @@ class AwesomeTranslations::TranslatedValue
     match[2].to_i
   end
 
-  def save!
-    dir = File.dirname(@file)
-    FileUtils.mkdir_p(dir) unless File.exist?(dir)
-    File.write(@file, "#{@locale}:\n") unless File.exist?(@file)
+  def file_extension
+    @file_extension ||= File.extname(@file)
+  end
+
+  def save! # rubocop:disable Metrics/AbcSize
+    if file_extension == ".yml"
+      translations = YAML.safe_load(File.read(file)) if File.exist?(file)
+    elsif file_extension == ".json"
+      translations = JSON.parse(File.read(file)) if File.exist?(file)
+    else
+      raise "Unhandled file extension: #{file_extension}"
+    end
 
-    translations = YAML.safe_load(File.read(@file))
     translations ||= {}
     translations[@locale.to_s] ||= {}
 
     insert_translation_into_hash(translations)
+    number_of_translactions = count_translations(translations)
 
     update_models
 
-    I18n.load_path << file unless I18n.load_path.include?(file)
-    File.write(file, YAML.dump(translations))
+    if number_of_translactions.positive?
+      dir = File.dirname(file)
+      FileUtils.mkdir_p(dir) unless File.exist?(dir)
+
+      if file_extension == ".yml"
+        File.write(file, YAML.dump(translations))
+      elsif file_extension == ".json"
+        File.write(file, JSON.pretty_generate(translations))
+      else
+        raise "Unhandled file extension: #{file_extension}"
+      end
+
+      I18n.load_path << file unless I18n.load_path.include?(file)
+    else
+      File.unlink(file) if File.exist?(file)
+
+      I18n.load_path.reject! do |load_path_value|
+        load_path_value == file
+      end
+    end
   end
 
 private
 
+  def count_translations(translations)
+    count = 0
+
+    translations.each_value do |value|
+      if value.is_a?(Hash)
+        count += count_translations(value)
+      elsif value.is_a?(Array)
+        count += value.length
+      else
+        count += 1
+      end
+    end
+
+    count
+  end
+
   def insert_translation_into_hash(translations)
     current = translations[@locale.to_s]
 

data/app/models/awesome_translations/translation.rb

@@ -55,7 +55,7 @@ class AwesomeTranslations::Translation
       next unless value_for?(locale)
 
       result << AwesomeTranslations::TranslatedValue.new(
-        file: "#{dir}/#{locale}.yml",
+        file: "#{dir}/#{locale}.#{AwesomeTranslations.config.format}",
         key: @key,
         locale: locale,
         value: value(locale: locale)
@@ -77,7 +77,7 @@ class AwesomeTranslations::Translation
 
   def translated_value_for_locale(locale)
     AwesomeTranslations::TranslatedValue.new(
-      file: "#{dir}/#{locale}.yml",
+      file: "#{dir}/#{locale}.#{AwesomeTranslations.config.format}",
       key: @key,
       locale: locale,
       value: value_for?(locale) ? value(locale: locale) : ""

data/app/views/awesome_translations/groups/show.html.erb

@@ -53,7 +53,7 @@
               </td>
               <% I18n.available_locales.each do |locale| %>
                 <td class="translation">
-                  <%= text_field "t", "#{translation.key}[#{locale}]", class: "translation-input", lang: locale, value: translation.translation_value(locale: locale) %>
+                  <%= text_field "t", "#{translation.key}[#{locale}]", class: "translation-input", lang: locale, name: "t[#{translation.key}][#{locale}]", value: translation.translation_value(locale: locale) %>
                 </td>
               <% end %>
             </tr>

data/app/views/awesome_translations/movals/index.html.erb

@@ -29,7 +29,7 @@
                 <%= path_without_root_or_locales moval.file_path %>
               </td>
               <td>
-                <%= path_without_root_or_locales "#{handler_translation.dir}/#{moval.locale}.yml" %>
+                <%= path_without_root_or_locales "#{handler_translation.dir}/#{moval.locale}.#{AwesomeTranslations.config.format}" %>
               </td>
             </tr>
           <% end %>

data/lib/awesome_translations/cache_database_generator.rb

@@ -204,6 +204,8 @@ private
 
         if File.directory?(full_path)
           cache_translations_in_dir(full_path)
+        elsif File.extname(full_path) == ".json"
+          cache_translations_in_file_from_json(full_path)
         elsif File.extname(full_path) == ".yml"
           cache_translations_in_file(full_path)
         end
@@ -226,6 +228,21 @@ private
     debug "Done caching translations in #{file_path}"
   end
 
+  def cache_translations_in_file_from_json(file_path)
+    @translation_keys_found ||= {}
+
+    debug "Cache translations in #{file_path}"
+
+    i18n_hash = JSON.parse(File.read(file_path))
+    debug "Hash: #{i18n_hash}"
+
+    i18n_hash.each do |locale, translations|
+      cache_translations_in_hash(file_path, locale, translations) if locale && translations
+    end
+
+    debug "Done caching translations in #{file_path}"
+  end
+
   def cache_translations_in_hash(file_path, locale, i18n_hash, keys = [])
     i18n_hash.each do |key, value|
       current_key = keys.clone

data/lib/awesome_translations/config.rb

@@ -1,7 +1,8 @@
 class AwesomeTranslations::Config
-  attr_accessor :ignored_paths, :paths_to_translate
+  attr_accessor :format, :ignored_paths, :paths_to_translate
 
   def initialize
+    @format = "yml"
     @ignored_paths = [
       Rails.root.join(".git").to_s,
       Rails.root.join("config/locales").to_s,

data/lib/awesome_translations/erb_inspector/file_inspector.rb

@@ -2,7 +2,7 @@ class AwesomeTranslations::ErbInspector::FileInspector
   JS_FILE_EXTS = [".cjs", ".coffee", ".coffee.erb", ".es6", ".es6.erb", ".js", ".js.erb", ".jsx", ".mjs"].freeze
   METHOD_NAMES = %w[t controller_t helper_t].freeze
   VALID_BEGINNING = '(^|\s+|\(|\{|\[|<%=\s*|I18n\.)'.freeze
-  VALID_BEGINNING_JS = '(^|\s+|\(|\[|\.)'.freeze
+  VALID_BEGINNING_JS = '(^|\s+|\(|\[|\{|\.)'.freeze
 
   attr_reader :root_path, :file_path
 

data/lib/awesome_translations/translation_migrator.rb

@@ -12,7 +12,7 @@ class AwesomeTranslations::TranslationMigrator
     @locale = @translation_value.locale
 
     @old_path = @translation_value.file_path
-    @new_path = "#{@handler_translation.dir}/#{@translation_value.locale}.yml" if @handler_translation
+    @new_path = "#{@handler_translation.dir}/#{@translation_value.locale}.#{AwesomeTranslations.config.format}" if @handler_translation
   end
 
   def execute

data/lib/awesome_translations/version.rb

@@ -1,3 +1,3 @@
 module AwesomeTranslations
-  VERSION = "0.0.65".freeze
+  VERSION = "0.0.67".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awesome_translations
 version: !ruby/object:Gem::Version
-  version: 0.0.65
+  version: 0.0.67
 platform: ruby
 authors:
 - Kasper Stöckel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-25 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-record-transactioner