jekyll-polyglot 1.10.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0459aa05cc1025bea0ca2aef71ad7e3e4a0c33726b1f32e4d5f2e19d521a06aa'
-  data.tar.gz: 245aa4b72aa80fac516b0cc9b04c396ef0ec55366aadefbb73ba8fa9ca47df93
+  metadata.gz: 36484f859398f365dc36080eb9a72a170606e0150726a6447349062ee5bbba66
+  data.tar.gz: f09be79e1c07abc021f7d16fd6fc52da4f8dd04d0a424557163bebd6be509d99
 SHA512:
-  metadata.gz: d8f4162ee486ebf72f6c5be6714bb5aed0a60f5ca0798480efbc8a68f84cd94c40b9db9efbb6160317ca974f600cbe82ac82c0934a833d162135b873a3b000da
-  data.tar.gz: c5367a20ee1ea4983e5cc8485204f11da88d4a3914ccfc5aa62d76d78cd364fd15c223e99a4bbec5f27d306c7be4226232faa3c17b38951dd9102ead2e5e02c7
+  metadata.gz: 3bb811b6db49a5db36edfa1aade491de2cb4c068f8e7a255c9b636a682525fd525a98dedaa83666957b0f539ad51a32c512e2ffd494811b3e36583bd6b078ebd
+  data.tar.gz: 002ffded1c695403ce4f9c036facd6235cac6c3e7764a4cf9c33c2a5a383918153283f923b4ee02dcdc34d1b118cf0434595369e7896b33d3dc6d16b58b6a6cd

data/README.md

@@ -28,7 +28,7 @@ In your `_config.yml` file, add the following preferences
 ```YAML
 languages: ["en", "sv", "de", "fr"]
 default_lang: "en"
-exclude_from_localization: ["javascript", "images", "css", "public", "sitemap"]
+exclude_from_localization: ["javascript", "images", "css", "public", "sitemap", "CNAME"]
 parallel_localization: true
 url: https://polyglot.untra.io
 ```
@@ -59,8 +59,7 @@ _posts/2010-03-01-salad-recipes-sv.md
 _posts/2010-03-01-salad-recipes-fr.md
 ```
 
-Organized names will generate consistent permalinks when the post is rendered, and Polyglot will know to build separate language versions of
-the website using only the files with the correct `lang` variable in the front matter.
+Organized names will generate consistent permalinks when the post is rendered, and Polyglot will know to build separate language versions of the website using only the files with the correct `lang` variable in the front matter.
 
 In short:
 * Be consistent with how you name and place your *posts* files
@@ -114,6 +113,8 @@ Estos somos nosotros!
 Additionally, if you are also using the `jekyll-redirect-from` plugin, pages coordinated this way will automatically have redirects created between pages.
 So `/es/about` will automatically redirect to `/es/acerca-de` and `/acerca-de` can redirect to `/about`. If you use this approach, be sure to also employ a customized [redirect.html](https://github.com/untra/polyglot/blob/main/site/_layouts/redirect.html).
 
+As of version 1.12, Polyglot also properly supports `redirect_from` frontmatter across sublanguages. When you add redirect paths to pages in non-default languages, Polyglot will correctly scope those redirects to each language's prefix, preventing duplicate redirects and ensuring proper routing.
+
 #### Fallback Language Support
 Lets say you are building your website. You have an `/about/` page written in *english*, *german* and
 *swedish*. You are also supporting a *french* website, but you never designed a *french* version of your `/about/` page!
@@ -260,11 +261,48 @@ This plugin stands out from other I18n Jekyll plugins.
 - provides the liquid tag `{{ site.languages }}` to get an array of your I18n strings.
 - provides the liquid tag `{{ site.default_lang }}` to get the default_lang I18n string.
 - provides the liquid tag `{{ site.active_lang }}` to get the I18n language string the website was built for. Alternative names for `active_lang` can be configured via `config.lang_vars`.
+- provides the liquid tag `{{ page.rendered_lang }}` to get the language the page content is actually rendered in (useful for detecting fallback pages).
 - provides the liquid tag `{{ I18n_Headers }}` to append SEO bonuses to your website.
 - provides the liquid tag `{{ Unrelativized_Link href="/hello" }}` to make urls that do not get influenced by url correction regexes.
 - provides `site.data` localization for efficient rich text replacement.
 - a creator that will answer all of your questions and issues.
 
+### Detecting Fallback Pages with `page.rendered_lang`
+
+The `page.rendered_lang` variable indicates the actual language of a page's content. This is different from `site.active_lang`, which indicates the language version of the site currently being built.
+
+- `site.active_lang`: The language the site is being built for (e.g., `es` for the Spanish site)
+- `page.rendered_lang`: The language of the page's actual content (e.g., `en` if no Spanish translation exists)
+
+When `page.rendered_lang != site.active_lang`, the page is a **fallback page** - it's being served in the default language because no translation exists.
+
+**Example: Showing a "not translated" notice:**
+```liquid
+{% if page.rendered_lang != site.active_lang %}
+<div class="translation-notice">
+  This page is not yet available in {{ site.active_lang }}.
+  Showing {{ page.rendered_lang }} version.
+</div>
+{% endif %}
+```
+
+**Example: Conditional content based on translation status:**
+```liquid
+{% if page.rendered_lang == site.active_lang %}
+  <!-- This is an actual translation -->
+  <p>Welcome to our {{ site.active_lang }} content!</p>
+{% else %}
+  <!-- This is fallback content -->
+  <p>Content available in {{ page.rendered_lang }} only.</p>
+{% endif %}
+```
+
+This is useful for:
+- Displaying notices when content hasn't been translated
+- Tracking translation coverage
+- Applying different styling to fallback pages
+- Building translation status dashboards
+
 ## SEO Recipes
 Jekyll-polyglot has a few spectacular [Search Engine Optimization techniques](https://untra.github.io/polyglot/seo) to ensure your Jekyll blog gets the most out of its multilingual audience. Check them out!
 
@@ -310,6 +348,10 @@ These are talented and considerate software developers across the world that hav
 * [@obfusk](https://github.com/obfusk) [1.5.0](https://polyglot.untra.io/2021/07/17/polyglot-1.5.0/)
 * [@eighthave](https://github.com/eighthave) [1.5.0](https://polyglot.untra.io/2021/07/17/polyglot-1.5.0/)
 * [@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
+* [@manabu-nakamura](https://github.com/manabu-nakamura) - Japanese strings
 
 ### Other Websites Built with Polyglot
 Feel free to open a PR and list your multilingual blog here you may want to share:
@@ -328,18 +370,21 @@ Feel free to open a PR and list your multilingual blog here you may want to shar
 * [AnotherTurret just another study note blog](https://aturret.space/)
 * [Diciotech is a collaborative online tech dictionary](https://diciotech.netlify.app/)
 * [Yunseo Kim's Study Notes](https://www.yunseo.kim/)
+* [Beekeeper Studio](https://www.beekeeperstudio.io/)
 
 ## 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`
+* [x] - **site language**: italian `it`
+* [x] - **site language**: turkish `tk`
 * [ ] - **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

@@ -18,7 +18,7 @@ module Jekyll
           permalink_lang = page['permalink_lang']
           baseurl = site.config['baseurl'] || ''
           site_url = @url.empty? ? site.config['url'] + baseurl : @url
-          i18n = "<meta http-equiv=\"Content-Language\" content=\"#{site.active_lang}\">\n"
+          i18n = ""
 
           # Find all documents with the same page_id
           docs_with_same_id = site.collections.values
@@ -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
@@ -144,6 +154,9 @@ module Jekyll
         url = doc.url.gsub(regex, '/')
         page_id = doc.data['page_id'] || url
         doc.data['permalink'] = url if doc.data['permalink'].to_s.empty? && !doc.data['lang'].to_s.empty?
+        # Set rendered_lang to indicate what language this page is actually rendered in
+        # This allows templates to detect fallback pages (rendered_lang != active_lang)
+        doc.data['rendered_lang'] = lang
 
         # skip entirely if nothing to check
         next if @file_langs.nil?
@@ -165,22 +178,42 @@ module Jekyll
     end
 
     def assignPageRedirects(doc, docs)
+      # Preserve and normalize user-defined redirect_from
+      user_redirects = doc.data['redirect_from'] || []
+      user_redirects = [user_redirects] unless user_redirects.is_a?(Array)
+
+      # Determine document language
+      doc_lang = doc.data['lang'] || derive_lang_from_path(doc) || @default_lang
+
+      # Scope user-defined redirects to document's language if non-default
+      if doc_lang != @default_lang && !user_redirects.empty?
+        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
+          else
+            "/#{doc_lang}#{redirect_path}"
+          end
+        end
+      end
+
+      # Compute page_id based redirects (cross-language)
+      computed_redirects = []
       pageId = doc.data['page_id']
       if !pageId.nil? && !pageId.empty?
-        redirects = []
-
         docs_with_same_id = docs.select { |dd| dd.data['page_id'] == pageId }
-
-        # For each document with the same page_id
         docs_with_same_id.each do |dd|
-          # Add redirect if it's a different permalink
           if dd.data['permalink'] != doc.data['permalink']
-            redirects << dd.data['permalink']
+            computed_redirects << dd.data['permalink']
           end
         end
-
-        doc.data['redirect_from'] = redirects
       end
+
+      # Merge user-defined and computed redirects, removing duplicates
+      all_redirects = (user_redirects + computed_redirects).uniq
+      doc.data['redirect_from'] = all_redirects unless all_redirects.empty?
     end
 
     def assignPageLanguagePermalinks(doc, docs)
@@ -236,10 +269,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 +289,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.12.0
 platform: ruby
 authors:
 - Samuel Volin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-07 00:00:00.000000000 Z
+date: 2026-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.1.0
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: I18n plugin for Jekyll Blogs