jekyll-l10n 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa08de48acfcf87786537131118794ab409b95e3993cb34ad31af021774beceb
-  data.tar.gz: c3c0bc5a22a1ce203a7623be5217f8477b9d4b57f39918ca221a10f693bbd053
+  metadata.gz: c5a4a4261253d5efb8103b3d8896bff9960249f4d6ed69266c0016729b38da43
+  data.tar.gz: 582bb044c024621b3bee6407f0ef6f2c6d3f3de8cbca9df14c2449702aaeb446
 SHA512:
-  metadata.gz: 9e96fa4c27060bd4a68993d49f4e4a15a2122517a5739434dad81c57f30e712a144c6e15ce0972412ca09a6ffb2f57e3ed83011dbaeff3d456f232919448efd4
-  data.tar.gz: 74a6fa21f10fe87de0c8f891f9eedb77d36d0df2d50ccd23a794cc20d3a127c183ad6edd35b6284189beb7d0472928ee0bbea8a075fbdfd1abd016586354dbbc
+  metadata.gz: cb0212b0e62d331499629fe94eb3983dbaba9d4414804be1f1846873619935acbecf8f26d405b5c10cdc4400bdd246c23f35697ab67bc58deae24b506280f516
+  data.tar.gz: dde77b84bb811f0e08fb3bf4cf613cc8cef18bb39e907c7b0bf53a6c0993e33c399bf8b089cab60cbbe5e597725616aae1575b2c21fc9372c299759430c393ba

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

@@ -84,11 +84,11 @@ module Jekyll
           false
         end
 
-        def should_transform_href?(href, locale, _baseurl)
+        def should_transform_href?(href, locale, baseurl)
           return false if invalid_href?(href)
           return false if external_or_special_link?(href)
           return false if relative_path?(href)
-          return false if already_localized?(href, locale)
+          return false if already_localized?(href, locale, baseurl)
 
           true
         end
@@ -105,8 +105,14 @@ module Jekyll
           href.start_with?(".")
         end
 
-        def already_localized?(href, locale)
-          href.start_with?("/#{locale}/") || locale_prefix?(href)
+        def already_localized?(href, locale, baseurl = "")
+          # Normalize the path by stripping the baseurl if present
+          normalized_path = normalize_path(href, baseurl)
+
+          # Skip transformation if:
+          # 1. Path starts with the target locale: /es/page (prevent /es/es/page duplication)
+          # 2. Path contains any locale code: /fr/page (preserve language dropdown links)
+          normalized_path.start_with?("/#{locale}/") || locale_prefix?(normalized_path)
         end
 
         def language_dropdown_link?(link)
@@ -114,24 +120,46 @@ module Jekyll
           link_classes.split.any? { |c| c == "dropdown-item" }
         end
 
-        def locale_prefix?(href)
-          path_without_leading_slash = href.sub(%r!^/!, "")
-          return false if path_without_leading_slash.empty?
+        def normalize_path(href, baseurl)
+          # Strip the baseurl prefix if it's present, to get the actual path we're checking
+          return href if baseurl.nil? || baseurl.empty?
+
+          # SECURITY: Only strip if baseurl is followed by "/" (path component boundary)
+          # This prevents "/api" from matching "/api2/page" or "/apiurl/page"
+          if href == baseurl
+            # Exact match: return root path
+            "/"
+          elsif href.start_with?("#{baseurl}/")
+            # Proper path component: strip the baseurl but preserve leading slash
+            # href is "/base/es/page", baseurl is "/base"
+            # We want to return "/es/page"
+            href[baseurl.length..] # Returns "/es/page"
 
-          parts = path_without_leading_slash.split("/")
-          return false if parts.empty?
+          else
+            # Not a match: return as-is
+            href
+          end
+        end
 
-          first_part = parts.first
-          first_part.match?(%r!^[a-z]{2}(?:_[A-Z]{2})?$!)
+        def locale_prefix?(path)
+          # Check if the path contains a locale code
+          # After stripping baseurl, this detects: /es/, /fr/, /pt_BR/, /zh-CN/, etc.
+          path.match?(%r!/[a-z]{2}(?:[_-][A-Z]{2})?(?:/|$)!)
         end
 
         def add_locale_prefix(href, locale, baseurl)
           return "/#{locale}#{href}" unless baseurl && !baseurl.empty?
 
-          if href.start_with?(baseurl)
-            relative_path = href[baseurl.length..]
-            "#{baseurl}/#{locale}#{relative_path}"
+          # SECURITY: Only strip if baseurl is followed by "/" (path component boundary)
+          if href == baseurl
+            # Exact match: add locale after baseurl
+            "#{baseurl}/#{locale}"
+          elsif href.start_with?("#{baseurl}/")
+            # Proper path component: insert locale after baseurl
+            relative_path = href[(baseurl.length + 1)..]
+            "#{baseurl}/#{locale}/#{relative_path}"
           else
+            # Not a match: add locale before href
             "#{baseurl}/#{locale}#{href}"
           end
         end

metadata

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