jekyll-polyglot 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c41fff580d3b7b67c65668954a77168ecf5017f5c0ca7b3747bdcc67ddb7d8ed
-  data.tar.gz: 6666fb42d87a589c695229be0386cdd601511aee2115c6da472f2de3b829c8ef
+  metadata.gz: 431827884e33750d9871432f109f15ef806adc3c92ac12d69b4dd71d7f5b8c26
+  data.tar.gz: fbd2aa987e77785d37ad5578ef06b78fdd6f8de30e65007886c13f782605b51c
 SHA512:
-  metadata.gz: 446131b28c107601f59f17e4d630c800c6c6b4c64290f00ecf417c407cfd1e3bb960f36a1994d84d7b438cd862d358216090556f198b89ab31a1f6043f842bc9
-  data.tar.gz: 4902c0e1a8de5060c667eade6806a3e3932eae52475c1a0ad1f4cb5fcb984086080e4c08bf7551eb923098c152e6a46ffe7d63475ec27f9acbe948bee48d8adb
+  metadata.gz: 6b28158712094d6870f20bec2882608de81f0188087a8c609da85a6fd7c94f2a12769a220448696984e2464d34b9eadacdd55732b4a84e767d812d153bf69cb5
+  data.tar.gz: 9280111b1d14364adf562230d8e84512224ad880c88d9797771ce9fdaf3a5fe474ba803b9cfb691687f81ea92b9d21b4bcd90b3a7950d1d2b46268f666081c4d

data/README.md

@@ -30,13 +30,14 @@ languages: ["en", "sv", "de", "fr"]
 default_lang: "en"
 exclude_from_localization: ["javascript", "images", "css", "public", "sitemap", "CNAME"]
 parallel_localization: true
+serial_default_lang: true
 url: https://polyglot.untra.io
 ```
 These configuration preferences indicate
 - what i18n languages you wish to support
 - what is your default "fallback" language for your content
 - what root level files/folders are excluded from localization, based on if their paths start with any of the excluded regexp substrings. (this is different from the jekyll `exclude: [ .gitignore ]` ; you should `exclude` files and directories in your repo you dont want in your built site at all, and `exclude_from_localization` files and directories you want to see in your built site, but not in your sublanguage sites.)
-- whether to run language processing in parallel or serial. Set to `false` if building on Windows hosts, or if Polyglot collides with other Jekyll plugins.
+- whether to run language processing in parallel or serial. Set to `false` if building on Windows hosts, or if Polyglot collides with other Jekyll plugins. - If `parallel_localization` collides with other jekyll plugins, this setting makes polyglot build the default language first before processing the other language sites.
 - your jekyll website production url. Make sure this value is set; Polyglot requires this to relative site urls correctly, and to make functioning language switchers.
 
 The optional `lang_from_path: true` option enables getting the page language from a filepath segment seperated by `/` or `.`, e.g `de/first-one.md`, or `_posts/zh_HK/use-second-segment.md` , if the lang frontmatter isn't defined.
@@ -461,7 +462,7 @@ These are talented and considerate software developers across the world that hav
 * [@george-gca](https://github.com/george-gca) [pt-BR support](https://polyglot.untra.io/pt-BR/2024/02/29/localized-variables.md)
 * [@PanderMusubi](https://github.com/PanderMusubi) - 1.12 / jekyll-minimal-mistakes-polyglot demo
 * [@GruberMarkus](https://github.com/GruberMarkus) - redirect anchor support
-* [@rathboma](https://github.com/rathboma) - page.rendered_lang / sublanguage redirects
+* [@rathboma](https://github.com/rathboma) - page.rendered_lang / sublanguage redirects / serial_default_lang
 * [@manabu-nakamura](https://github.com/manabu-nakamura) - Japanese strings
 
 ### Other Websites Built with Polyglot
@@ -496,10 +497,12 @@ Feel free to open a PR and list your multilingual blog here you may want to shar
 * [x] - **site language**: turkish `tk`
 * [x] - **site language**: ukrainian `uk`
 * [x] - **site language**: hindi `hi`
-* [ ] - **site language**: chinese Taiwan `zh-TW`
-* [ ] - **site language**: portuguese Portugal `pt-PT`
-* [ ] - get whitelisted as an official github-pages jekyll plugin
+* [x] - **site language**: chinese Taiwan `zh-TW`
+* [x] - **site language**: portuguese Portugal `pt-PT`
 * [x] - update CI provider
+* [ ] - get to 512 github stars
+* [ ] - get whitelisted as an official github-pages jekyll plugin
+
 
 ## Copyright
 Copyright (c) Samuel Volin 2025. License: MIT

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

@@ -3,13 +3,14 @@ require 'etc'
 include Process
 module Jekyll
   class Site
-    attr_reader :default_lang, :languages, :exclude_from_localization, :lang_vars, :lang_from_path, :fallback_canonical_to_default_lang
+    attr_reader :default_lang, :languages, :exclude_from_localization, :lang_vars, :lang_from_path, :fallback_canonical_to_default_lang, :serial_default_lang
     attr_accessor :file_langs, :active_lang
 
     def prepare
       @file_langs = {}
       fetch_languages
       @parallel_localization = config.fetch('parallel_localization', true)
+      @serial_default_lang = config.fetch('serial_default_lang', false)
       @lang_from_path = config.fetch('lang_from_path', false)
       @fallback_canonical_to_default_lang = config.fetch('fallback_canonical_to_default_lang', false)
       @exclude_from_localization = config.fetch('exclude_from_localization', []).map do |e|
@@ -34,14 +35,21 @@ module Jekyll
       prepare
       all_langs = ([@default_lang] + @languages).uniq
       if @parallel_localization
+        if @serial_default_lang
+          # Run the default language in the parent first to prime
+          process_language @default_lang
+          langs_to_fork = @languages - [@default_lang]
+        else
+          langs_to_fork = all_langs
+        end
         nproc = Etc.nprocessors
         pids = {}
         begin
-          all_langs.each do |lang|
+          langs_to_fork.each do |lang|
             pids[lang] = fork do
               process_language lang
             end
-            while pids.length >= (lang == all_langs[-1] ? 1 : nproc)
+            while pids.length >= (lang == langs_to_fork[-1] ? 1 : nproc)
               sleep 0.1
               pids.map do |pid_lang, pid|
                 next unless waitpid pid, Process::WNOHANG
@@ -52,7 +60,7 @@ module Jekyll
             end
           end
         rescue Interrupt
-          all_langs.each do |lang|
+          langs_to_fork.each do |lang|
             next unless pids.key? lang
 
             puts "Killing #{pids[lang]} : #{lang}"
@@ -154,12 +162,7 @@ module Jekyll
         explicit_lang = doc.data['lang'] || derive_lang_from_path(doc)
         lang = explicit_lang || @default_lang
 
-        # FILTER: Skip documents whose explicit lang is not in configured languages.
-        # Check the explicit value (not the fallback) so that documents with an
-        # unconfigured lang like 'de' are excluded even if normalization would
-        # map them to default_lang. Compare case-insensitively so case-mismatched
-        # frontmatter (e.g. 'pt-br' vs configured 'pt-BR') is normalized below
-        # rather than rejected here.
+        # Skip documents whose explicit lang is not in configured languages.
         if explicit_lang && valid_languages.none? { |l| l.downcase == explicit_lang.downcase }
           Jekyll.logger.warn "Polyglot:", "Skipping #{doc.relative_path} - lang '#{explicit_lang}' not in configured languages #{valid_languages.inspect}"
           next
@@ -211,11 +214,12 @@ module Jekyll
         user_redirects = user_redirects.map do |redirect_path|
           # Normalize path to start with /
           redirect_path = "/#{redirect_path}" unless redirect_path.start_with?('/')
-          # Only prefix if not already prefixed with this language
-          if redirect_path.start_with?("/#{doc_lang}/")
-            redirect_path
+          if redirect_path == "/#{doc_lang}"
+            '/'
+          elsif redirect_path.start_with?("/#{doc_lang}/")
+            redirect_path.delete_prefix("/#{doc_lang}")
           else
-            "/#{doc_lang}#{redirect_path}"
+            redirect_path
           end
         end
       end
@@ -305,7 +309,10 @@ module Jekyll
       non_rel_regex = relative_url_regex(true)
       non_abs_regex = absolute_url_regex(url, true)
       docs.each do |doc|
-        unless @active_lang == @default_lang then relativize_urls(doc, rel_regex) end
+        unless @active_lang == @default_lang || doc.output.nil?
+          localize_redirect_target(doc)
+          relativize_urls(doc, rel_regex)
+        end
         correct_nonrelativized_urls(doc, non_rel_regex)
         if url
           unless @active_lang == @default_lang then relativize_absolute_urls(doc, abs_regex, url) end
@@ -314,6 +321,26 @@ module Jekyll
       end
     end
 
+    # jekyll-redirect-from renders its target into (script location=, meta refresh url=)
+    # rewrite the redirect target before language lookaheads in the href regexes skip
+    def localize_redirect_target(doc)
+      return if @active_lang == @default_lang || doc.output.nil?
+
+      redirect = doc.data['redirect']
+      return unless redirect.is_a?(Hash)
+
+      target = redirect['to'].to_s
+      origin = "#{config['url']}#{@baseurl}"
+      return unless target.start_with?("#{origin}/")
+
+      path = target.delete_prefix(origin)
+      return if path.start_with?("/#{@active_lang}/")
+
+      localized = "#{origin}/#{@active_lang}#{path}"
+      doc.output = doc.output.gsub(target, localized)
+      redirect['to'] = localized
+    end
+
     # a regex that matches urls or permalinks with i18n prefixes or suffixes
     # matches /en/foo , .en/foo , foo.en/ and other simmilar default urls
     # made by jekyll when parsing documents without explicitly set permalinks

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-polyglot
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Samuel Volin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-16 00:00:00.000000000 Z
+date: 2026-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -65,14 +65,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: I18n plugin for Jekyll Blogs