jekyll-l10n 1.3.16 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9b11bbd19ea0a06c6282c11b22319d49ec9a25060d7324d667e14c78f397881
-  data.tar.gz: 0b7c89696c593e771c2694090d0fcebb4c9414a07fc2474f568c5d298953667b
+  metadata.gz: 1c8edcdac30ed6d89b587d914f1b8038ffd3b10a95a0e15cc43965dd915e39f2
+  data.tar.gz: 513218e1e01c3814a2f7130f60a6b35463d0836659ee13d85ae3d7c9a0aaf6c5
 SHA512:
-  metadata.gz: fee23453215a6576799f774d9de4f94e870554b0c9fe9044ec7b0fd20477f20cb99d4d56d026005224774cdb4d332f0e493eb0bf8e8cf0750289a0028850fd8b
-  data.tar.gz: 0ac080acebbd08f462ee480f771804890111603e94f9c17aae24a12ec7e7d984659096c64e513e7c34c535fc5c2f0d127dad9a6038704ca9f4107b0c6d110115
+  metadata.gz: 24586cc374d7ad819cbda298c98d9dc70438b60bc7afafcc6d695190bb62dc6294ddfd4bb02fb4f04c57c3231cea3fe12047dc9bdf3eb0de5390c6e4fb7a0970
+  data.tar.gz: f5f5bb5755c8354794fd81090c74c0519f06fb15c216cc1b9ba748e5837dcef7b7a05c324d5f67feef8c544884e17a936d492c76132ac26cb7f0d6f0bafa22e6

data/lib/jekyll-l10n/translation/block_text_extractor.rb

@@ -39,6 +39,7 @@ module Jekyll
         return nil unless extractable?(node)
 
         clone = node.dup
+        HtmlTextUtils.remove_code_blocks(clone)
         HtmlTextUtils.remove_block_elements(clone)
         HtmlTextUtils.remove_empty_icon_tags(clone)
 

data/lib/jekyll-l10n/translation/html_translator.rb

@@ -147,9 +147,15 @@ module Jekyll
                              "[HtmlTranslator]   Translation: #{translation[0..truncate_length]}..."
         end
 
+        inject_translation_preserving_structure(parent, translation)
+      end
+
+      def inject_translation_preserving_structure(parent, translation)
+        preserved_blocks  = parent.css('pre').map(&:dup)
         preserved_anchors = parent.css('.heading-anchor').map(&:dup)
         parent.children.each(&:remove)
         parent.inner_html = translation
+        preserved_blocks.each  { |b| parent.add_child(b) }
         preserved_anchors.each { |a| parent.add_child(a) } if parent.css('.heading-anchor').empty?
       end
 
@@ -253,7 +259,8 @@ module Jekyll
 
       private :log_text_node_debug, :should_skip_translation?, :should_log_text_debug?,
               :apply_block_level_translation?, :select_block_translation,
-              :find_content_element_ancestor, :log_translation_debug_info
+              :find_content_element_ancestor, :log_translation_debug_info,
+              :inject_translation_preserving_structure
     end
   end
 end

data/lib/jekyll-l10n/utils/html_text_utils.rb

@@ -48,6 +48,22 @@ module Jekyll
             .gsub(''', "'")
       end
 
+      # Remove preformatted code blocks from a node.
+      #
+      # Removes all <pre> elements entirely. With highlighter: none in Jekyll config,
+      # fenced code blocks produce plain <pre><code> as direct children of content
+      # elements — no Rouge wrappers. Removing <pre> before extraction ensures raw
+      # code never appears in PO msgids.
+      #
+      # Must run before remove_block_elements_from_node so that <code> inside <pre>
+      # is gone before the general flattening pass.
+      #
+      # @param node [Nokogiri::XML::Node] Node to process (modified in place)
+      # @return [void]
+      def self.remove_code_blocks(node)
+        node.css('pre').each(&:remove)
+      end
+
       # Remove block-level elements from a cloned node.
       #
       # Replaces block-level element nodes with their children (flattening structure).
@@ -98,6 +114,7 @@ module Jekyll
       # @return [String] Extracted and normalized text
       def self.extract_with_inline_tags(node)
         clone = node.dup
+        remove_code_blocks(clone)
         remove_block_elements_from_node(clone)
         remove_empty_icon_tags(clone)
 

data/lib/jekyll-l10n/utils/translation_resolver.rb

@@ -47,7 +47,7 @@ module Jekyll
       # node alone doesn't have a direct translation but the entire block does.
       #
       # Security consideration: Returns nil if the block contains protected elements
-      # (script, style, pre tags) to prevent unsafe translation application.
+      # (script, style) to prevent unsafe translation application.
       #
       # @param node [Nokogiri::XML::Node] Text node being translated
       # @param text [String] Normalized text of the node
@@ -90,13 +90,11 @@ module Jekyll
 
       # Check if an element contains protected child elements that block translations.
       #
-      # Protected elements (script, style, pre) cannot have their surrounding text
-      # translated at the block level because:
-      # * script/style: Security and functionality reasons (executable content)
-      # * pre: Multi-line code blocks where translations break formatting
-      #
-      # This is a shared utility used by both HtmlTranslator and TranslationResolver
-      # to ensure consistent protection of sensitive content across the codebase.
+      # Protected elements (script, style) cannot have their surrounding text
+      # translated at the block level for security and functionality reasons.
+      # <pre> is not protected here — HtmlTextUtils.remove_code_blocks strips it
+      # before extraction so code content never reaches PO msgids, and
+      # HtmlTranslator preserves <pre> verbatim across translation injection.
       #
       # @param node [Nokogiri::XML::Node] Element to check
       # @return [Boolean] true if node contains protected elements, false otherwise
@@ -111,13 +109,12 @@ module Jekyll
       #   doc = Nokogiri::HTML('<p><code>inline</code> text</p>')
       #   para = doc.xpath('//p').first
       #   TranslationResolver.contains_protected_elements?(para)
-      #   # => false (code is allowed, only script/style/pre are protected)
+      #   # => false (code is allowed, only script/style are protected)
       def self.contains_protected_elements?(node)
         return false unless node.element?
 
-        # Block block-level translation for script, style (security/functionality),
-        # and pre (multi-line code blocks). These cannot be safely applied at block level.
-        protected_elements = %w[script style pre]
+        # Block block-level translation for script and style (security/functionality).
+        protected_elements = %w[script style]
         node.children.any? { |child| child.element? && protected_elements.include?(child.name) }
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-l10n
 version: !ruby/object:Gem::Version
-  version: 1.3.16
+  version: 1.4.1
 platform: ruby
 authors:
 - ReleaseBot