awesome_translations 0.0.63 → 0.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9ed16ef4e8875b37a380944c539d17d07c53a1344aa7dad547ed883cc91bbdb
-  data.tar.gz: f305b5327c5ac17fd9a2e3b0f5671badb9e2aa0e3c84c32813f7159682fc8387
+  metadata.gz: 62035170a703c453f82d55eae3b2703bc5d8e356568d47935f4cac04fbc253a0
+  data.tar.gz: 21e2067c0fd54de04c7cfbaeb5be1d0bb614ff1426ee3fa943a88840bfadd713
 SHA512:
-  metadata.gz: cdc74dbb6c544e79bb8a4d4c029b6278301556d8199f6c7d62f1f8295209e649de17cd18aaefdf674589dcb537d68e46ed3eaddfd8c9d69b9aa335cfae7917a7
-  data.tar.gz: 20385ca733b110411e364cfcbe475bbef097784c607496a714b4016f1a7e5b0b4e6b9a4b5f15693157c53db41d3904c5e5c72abf1bd72ed7f7307e8949996625
+  metadata.gz: af3499ac5a0426e95277ddcc395757fbfcb6a1616cd24a62178cd66996acaafbade9b5f134a56122322e1122a0cd92b809900498a4bbc2fa048db72c3fbb8e56
+  data.tar.gz: 49f979fd7db8e6316bd4ebe1535080725fd360f1e8fc25f13947c2e87475c8545c441139ecde536d2f214181795dd3aafe5218307e80c5fc814597be5e4cbc13

data/app/controllers/awesome_translations/clean_ups_controller.rb

@@ -22,7 +22,7 @@ private
 
   helper_method :translations_to_clean_up
   def translations_to_clean_up
-    @translations_to_migrate ||= AwesomeTranslations::CacheDatabaseGenerator::TranslationValue
+    @translations_to_clean_up ||= AwesomeTranslations::CacheDatabaseGenerator::TranslationValue
       .joins(:translation_key)
       .includes(:translation_key)
       .joins("LEFT JOIN handler_translations ON handler_translations.translation_key_id = translation_keys.id")

data/app/controllers/awesome_translations/movals_controller.rb

@@ -11,7 +11,7 @@ class AwesomeTranslations::MovalsController < AwesomeTranslations::ApplicationCo
   end
 
   def create
-    params[:m].each do |translation_value_id, _handler_translation_id|
+    params[:m].each_key do |translation_value_id|
       translation_value = AwesomeTranslations::CacheDatabaseGenerator::TranslationValue.find(translation_value_id)
       translation_value.migrate_to_awesome_translations_namespace!
     end

data/lib/awesome_translations/erb_inspector/file_inspector.rb

@@ -1,7 +1,8 @@
 class AwesomeTranslations::ErbInspector::FileInspector
-  JS_FILE_EXTS = [".coffee", ".coffee.erb", ".es6", ".es6.erb", ".js", ".js.erb", ".jsx"].freeze
+  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+|\(|\[|I18n\.)'.freeze
 
   attr_reader :root_path, :file_path
 
@@ -18,6 +19,7 @@ class AwesomeTranslations::ErbInspector::FileInspector
         extname = File.extname(full_path)
         translations_found = []
         line_no = 0
+        @namespace = nil
 
         fp.each_line do |line|
           line_no += 1
@@ -68,12 +70,16 @@ private
   end
 
   def parse_content_js(line_no, line, translations_found, yielder)
-    line.scan(/I18n\.t\('(.+?)'\s*(\)|,)/) do |match|
-      add_translation(line_no, "I18n-js.t", match[0], translations_found, yielder)
+    line.scan(/useI18n\(\s*\{\s*namespace:\s*"(.+)"/) do |match|
+      @namespace = match[0]
     end
 
-    line.scan(/I18n\.t\("(.+?)"\s*(\)|,)/) do |match|
-      add_translation(line_no, "I18n-js.t", match[0], translations_found, yielder)
+    line.scan(/#{VALID_BEGINNING_JS}t\('(.+?)'\s*(\)|,)/o) do |match|
+      add_translation(line_no, "I18n-js.t", match[1], translations_found, yielder)
+    end
+
+    line.scan(/#{VALID_BEGINNING_JS}t\("(.+?)"\s*(\)|,)/o) do |match|
+      add_translation(line_no, "I18n-js.t", match[1], translations_found, yielder)
     end
   end
 
@@ -103,6 +109,8 @@ private
   end
 
   def add_translation(line_no, method, key, translations_found, yielder)
+    key = "#{@namespace}#{key}" if key.start_with?(".") && @namespace
+
     translation_inspector = AwesomeTranslations::ErbInspector::TranslationInspector.new(
       last_method: @last_method,
       root_path: @root_path,

data/lib/awesome_translations/handlers/devise_handler.rb

@@ -22,7 +22,7 @@ class AwesomeTranslations::Handlers::DeviseHandler < AwesomeTranslations::Handle
   def translations_for_group(group)
     ArrayEnumerator.new do |yielder|
       dir = Rails.root.join("config", "locales", "awesome_translations", group.id).to_s
-      __send__("translations_for_#{group.id}", dir, group, yielder)
+      __send__(:"translations_for_#{group.id}", dir, group, yielder)
     end
   end
 

data/lib/awesome_translations/handlers/rails_handler.rb

@@ -18,7 +18,7 @@ class AwesomeTranslations::Handlers::RailsHandler < AwesomeTranslations::Handler
   def translations_for_group(group)
     ArrayEnumerator.new do |yielder|
       dir = Rails.root.join("config", "locales", "awesome_translations", group.id).to_s
-      __send__("translations_for_#{group.id}", dir, group, yielder)
+      __send__(:"translations_for_#{group.id}", dir, group, yielder)
     end
   end
 

data/lib/awesome_translations/handlers/will_paginate_handler.rb

@@ -22,7 +22,7 @@ class AwesomeTranslations::Handlers::WillPaginateHandler < AwesomeTranslations::
   def translations_for_group(group)
     ArrayEnumerator.new do |yielder|
       dir = Rails.root.join("config", "locales", "awesome_translations", group.id).to_s
-      __send__("translations_for_#{group.id}", dir, group, yielder)
+      __send__(:"translations_for_#{group.id}", dir, group, yielder)
     end
   end
 

data/lib/awesome_translations/version.rb

@@ -1,3 +1,3 @@
 module AwesomeTranslations
-  VERSION = "0.0.63".freeze
+  VERSION = "0.0.64".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awesome_translations
 version: !ruby/object:Gem::Version
-  version: 0.0.63
+  version: 0.0.64
 platform: ruby
 authors:
-- Kasper Johansen
-autorequire: 
+- Kasper Stöckel
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-30 00:00:00.000000000 Z
+date: 2024-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-record-transactioner
@@ -124,7 +124,7 @@ dependencies:
         version: 0.0.3
 description: Semi-automatic maintenance of most translations in a Rails app.
 email:
-- kaspernj@gmail.com
+- k@spernj.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -204,7 +204,7 @@ homepage: https://www.github.com/kaspernj/awesome_translations
 licenses: []
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -219,8 +219,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Semi-automatic maintenance of most translations in a Rails app.
 test_files: []