extract_i18n 0.7.2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd69038581ae691be4cae64c1e320b3fb8c5c8bb60b9ef27bc4dd11f3394e6f9
-  data.tar.gz: 7bfdf2f5bdc0dce6c08c917ee92cd30c42f2f057ea87be8cd3aa124b404bd4bf
+  metadata.gz: 8d8ad8ad587b0c1b29c6da66a422145d8863cf8ab3d427c96a689412b33de731
+  data.tar.gz: d56c08e023298fab0d2fc897ed318d6e994a78432ceb8630f386ae212c941c9f
 SHA512:
-  metadata.gz: 75b0ce1094da7625e45dc043fcc487a9f29feea63b4530b599ef4d6a7fa00cc24d1a344b6ef95bc6de1339f80785984e0cf11ae95fc103df537547a31b022092
-  data.tar.gz: 26862c6a277ed348546507cd04a11b066271c73f7422c403bc62bd1870beb96b20793cb413fe1c1e38fe3526b25ee74ee346d47d51933f79dafda30b2aca5426
+  metadata.gz: 2c7abee0591c99c71382fd5bf1cc244ccecbcc143e64024c012ddf0ea1d9b76614dd893dcc334cff547cafa3c163ac9dcbe799d16b7e9597ccbeccddd11b65fe
+  data.tar.gz: 6b11f294e3123b136027d4e79b4f7f887fbeae7d41c15fb8e23e3b7d0382e8793da054c734a9f1b6866323f40e1bdff89df2caa02273dc1cceeb59dc49174528

data/lib/extract_i18n/file_processor.rb

@@ -98,7 +98,7 @@ module ExtractI18n
     end
 
     def original_content
-      @original_content ||= File.read(@file_path)
+      File.read(@file_path)
     end
   end
 end

data/lib/extract_i18n/html_extractor/erb_document.rb

@@ -70,9 +70,15 @@ module ExtractI18n
 
           ERB_REGEXPS.each do |regexp|
             regexp.replace!(text) do |string_format, data|
-              key = SecureRandom.uuid
-              erb_directives[key] = data[:inner_text]
-              string_format % { inner_text: key }
+              code = data[:inner_text].strip
+              # skip t(...) / I18n.t(...) calls
+              if code =~ /\A(?:I18n\.)?t\(\s*(['"]).+?\1\s*\)\z/
+                "<%=#{data[:inner_text]}%>"
+              else
+                key = SecureRandom.uuid
+                erb_directives[key] = data[:inner_text]
+                string_format % { inner_text: key }
+              end
             end
           end
           erb_directives

data/lib/extract_i18n/html_extractor/match/node_match.rb

@@ -17,6 +17,10 @@ module ExtractI18n
           raise NotImplementedError
         end
 
+        def to_s
+          text
+        end
+
         attr_writer :key
 
         def key

data/lib/extract_i18n/slimkeyfy/slim_transformer.rb

@@ -93,7 +93,9 @@ module ExtractI18n
             t_template: "#{before}#{html_tag}t('%s'%s)#{after}"
           )
           final_line = yield(change)
-          return parse_html_arguments(final_line, &block)
+          if final_line != @word.indentation + line
+            return parse_html_arguments(final_line, &block)
+          end
         end
       end
       if final_line == line

data/lib/extract_i18n/source_change.rb

@@ -34,7 +34,7 @@ module ExtractI18n
       @i18n_string = i18n_string
       @key = i18n_key
       @interpolate_arguments = interpolate_arguments
-      @source_line = source_line
+      @source_line = source_line.nil? ? "" : source_line
       @remove = remove
       @t_template = t_template
       @interpolation_type = interpolation_type
@@ -42,9 +42,9 @@ module ExtractI18n
 
     def format
       s = ""
-      s += PASTEL.cyan("replace:  ") + PASTEL.blue(@source_line).
+      s += PASTEL.cyan("\nreplace:  ") + PASTEL.blue(@source_line).
            gsub(@remove, PASTEL.red(@remove))
-      unless @source_line.include?("\n")
+      unless @source_line.end_with?("\n")
         s += "\n"
       end
       if @source_line[@remove]
@@ -53,7 +53,7 @@ module ExtractI18n
       else
         s += PASTEL.cyan("with:     ") + PASTEL.green(i18n_t)
       end
-      unless @source_line.include?("\n")
+      unless @source_line.end_with?("\n")
         s += "\n"
       end
       s += PASTEL.cyan("add i18n: ") + PASTEL.blue("#{@key}: #{@i18n_string}")

data/lib/extract_i18n/version.rb

@@ -1,3 +1,3 @@
 module ExtractI18n
-  VERSION = "0.7.2"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extract_i18n
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.1
 platform: ruby
 authors:
 - Stefan Wienert
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-27 00:00:00.000000000 Z
+date: 2025-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -164,7 +164,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -179,8 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Extact i18n from Ruby files using Ruby parser and slim files using regex
 test_files: []