jekyll-polyglot 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0459aa05cc1025bea0ca2aef71ad7e3e4a0c33726b1f32e4d5f2e19d521a06aa'
-  data.tar.gz: 245aa4b72aa80fac516b0cc9b04c396ef0ec55366aadefbb73ba8fa9ca47df93
+  metadata.gz: b3ca341e67c10066675cb10c5ded127cf9126c5db547d2f3fdfc3d545c43bd6a
+  data.tar.gz: 32315c6551ac56da248adb7d465c130d8f0ec4f03a7d589eb5e2081c1a420821
 SHA512:
-  metadata.gz: d8f4162ee486ebf72f6c5be6714bb5aed0a60f5ca0798480efbc8a68f84cd94c40b9db9efbb6160317ca974f600cbe82ac82c0934a833d162135b873a3b000da
-  data.tar.gz: c5367a20ee1ea4983e5cc8485204f11da88d4a3914ccfc5aa62d76d78cd364fd15c223e99a4bbec5f27d306c7be4226232faa3c17b38951dd9102ead2e5e02c7
+  metadata.gz: b53d59e7090b20849d36cdfe6b54a6b0e40e40db839916f1df45c62f26b0ef541f43d30d88c3cbfcd0eb8e58ecc4e45b1f3ae1509cdd2aa0149aad4be41d9a95
+  data.tar.gz: 12a99dc155b5e4c7ba5f960e0267a90b547fa10576c9c3bf718784f139bf45b0da7554ac40e262b491aa113301eba5d1c16c2bb615fb901d26adf4cee90d0917

data/README.md

@@ -331,15 +331,15 @@ Feel free to open a PR and list your multilingual blog here you may want to shar
 
 ## 2.0 Roadmap
 * [x] - **site language**: portuguese Brazil `pt-BR`
-* [ ] - **site language**: portuguese Portugal `pt-PT`
-* [ ] - **site language**: arabic `ar`
-* [ ] - **site language**: japanese `ja`
+* [x] - **site language**: arabic `ar`
+* [x] - **site language**: japanese `ja`
 * [x] - **site language**: russian `ru`
 * [x] - **site language**: dutch `nl`
 * [x] - **site language**: korean `ko`
 * [x] - **site language**: hebrew `he`
 * [x] - **site language**: chinese China `zh-CN`
 * [ ] - **site language**: chinese Taiwan `zh-TW`
+* [ ] - **site language**: portuguese Portugal `pt-PT`
 * [ ] - get whitelisted as an official github-pages jekyll plugin
 * [x] - update CI provider
 

data/lib/jekyll/polyglot/liquid/tags/i18n_headers.rb

@@ -33,17 +33,29 @@ module Jekyll
           current_lang = site.active_lang
           current_permalink = lang_to_permalink[current_lang] || (permalink_lang && permalink_lang[current_lang]) || permalink
           current_permalink = "/#{current_permalink}" unless current_permalink.start_with?("/")
-          current_lang_prefix = current_lang == site.default_lang ? '' : "/#{current_lang}"
-          i18n += "<link rel=\"canonical\" href=\"#{site_url}#{current_lang_prefix}#{current_permalink}\"/>\n"
+          # Don't add language prefix if it's already in the permalink
+          canonical_permalink = if current_lang == site.default_lang
+            current_permalink
+          else
+            current_permalink.start_with?("/#{current_lang}/") ? current_permalink : "/#{current_lang}#{current_permalink}"
+          end
+          i18n += "<link rel=\"canonical\" href=\"#{site_url}#{canonical_permalink}\"/>\n"
+
+          # Get the default language permalink for x-default
+          default_lang_permalink = lang_to_permalink[site.default_lang] || (permalink_lang && permalink_lang[site.default_lang]) || permalink
+          default_lang_permalink = "/#{default_lang_permalink}" unless default_lang_permalink.start_with?("/")
 
           site.languages.each do |lang|
             alt_permalink = lang_to_permalink[lang] || (permalink_lang && permalink_lang[lang]) || permalink
             alt_permalink = "/#{alt_permalink}" unless alt_permalink.start_with?("/")
             i18n += if lang == site.default_lang
               "<link rel=\"alternate\" hreflang=\"#{lang}\" href=\"#{site_url}#{alt_permalink}\"/>\n" \
-                "<link rel=\"alternate\" hreflang=\"x-default\" href=\"#{site_url}#{alt_permalink}\"/>\n"
+                "<link rel=\"alternate\" hreflang=\"x-default\" href=\"#{site_url}#{default_lang_permalink}\"/>\n"
             else
-              "<link rel=\"alternate\" hreflang=\"#{lang}\" href=\"#{site_url}/#{lang}#{alt_permalink}\"/>\n"
+              # For non-default languages, use the language-specific permalink directly
+              # Don't add the language prefix if it's already in the permalink
+              lang_permalink = alt_permalink.start_with?("/#{lang}/") ? alt_permalink : "/#{lang}#{alt_permalink}"
+              "<link rel=\"alternate\" hreflang=\"#{lang}\" href=\"#{site_url}#{lang_permalink}\"/>\n"
             end
           end
           i18n

data/lib/jekyll/polyglot/patches/jekyll/site.rb

@@ -64,7 +64,7 @@ module Jekyll
           process_language lang
         end
       end
-      Jekyll::Hooks.trigger :polyglot, :post_write
+      Jekyll::Hooks.trigger :polyglot, :post_write, self
     end
 
     alias site_payload_orig site_payload
@@ -115,6 +115,16 @@ module Jekyll
       string.split(regex)
     end
 
+    # Convert glob pattern to regex pattern
+    # * matches any characters except /
+    # ? matches any single character except /
+    def glob_to_regex(pattern)
+      # Escape special regex characters first
+      escaped = Regexp.escape(pattern)
+      # Convert glob patterns to regex patterns
+      escaped.gsub("\\*", '.*').gsub("\\?", '.')
+    end
+
     def derive_lang_from_path(doc)
       unless @lang_from_path
         return nil
@@ -236,10 +246,12 @@ module Jekyll
       regex = ''
       unless disabled
         @exclude.each do |x|
-          regex += "(?!#{x})"
+          escaped_x = glob_to_regex(x)
+          regex += "(?!#{escaped_x})"
         end
         @languages.each do |x|
-          regex += "(?!#{x}/)"
+          escaped_x = Regexp.escape(x)
+          regex += "(?!#{escaped_x}/)"
         end
       end
       start = disabled ? 'ferh' : 'href'
@@ -254,10 +266,12 @@ module Jekyll
       regex = ''
       unless disabled
         @exclude.each do |x|
-          regex += "(?!#{x})"
+          escaped_x = glob_to_regex(x)
+          regex += "(?!#{escaped_x})"
         end
         @languages.each do |x|
-          regex += "(?!#{x}/)"
+          escaped_x = Regexp.escape(x)
+          regex += "(?!#{escaped_x}/)"
         end
       end
       start = disabled ? 'ferh' : 'href'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-polyglot
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Samuel Volin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-07 00:00:00.000000000 Z
+date: 2025-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll