jekyll-locales 0.3.0rc0 → 0.3.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f668c6aa02d494fba7095d17c67c8ddb174880fe49e0a1bf2539b87aa7b76052
-  data.tar.gz: 99bc10ba30dc7d49ed82363c1d400e1dae2d9d8e2e2d68878d24e5e88e46817f
+  metadata.gz: 4f070d48205919668af087050035f6b31f84ab19a98cc4d05ed76b64ca979631
+  data.tar.gz: be3496f7b5ed7d16e7054f3edc2f0272aec6579e8a2d363d736514e8694c80d7
 SHA512:
-  metadata.gz: b1b4b658762aa1bc3cd096e0debc31547017dc61cc0fddd48fdd848146c0ab5b8df4a5883f8606a67b5d37fc4b3c01351c5e5165cebb5f2bd99f3f8068007926
-  data.tar.gz: 8f5f076a341f854c6502ffd5d7615d03d3ce0378027949104ed693f670c12a775e861c6558464d444f0e9af7008564139b7693168138d1449afd5a4f224d87de
+  metadata.gz: bf6c153118dc7a27aa5f60c5ca5aa8a4391797118eeccca427a055fa964ea8077c8c14f0bf5f7ef09dedd62b787a0b6be4173eb09c9b78a610a13f881ec3e642
+  data.tar.gz: c853ad53b2621f71031b569a9ea6931c5fe326fa0b7602a51fc3a546d5fc3146532e3e447528f116a50cfcfcb7cc583a8031e6e1b67003d5efc3ec67023805ef

data/README.md

@@ -34,6 +34,7 @@ locales:
 - ahr
 - brasileiro
 redirect: true
+fallback_locale: true
 ```
 
 **The first locale is going to be your default locale**.  If you use
@@ -41,6 +42,19 @@ a redirector.html, it will be the locale it will redirector to.  If you
 don't use a redirector, the default locale will be at the root of the
 site.
 
+#### Fallback locales
+
+If you don't want build errors or missing messages on your theme for
+missing locales, you can setup fallbacks in any of these ways:
+
+```yaml
+fallback_locale: true # defaults to first locale
+fallback_locale: en # defaults to first en
+fallback_locale: # maps locales to existing options
+  fr: en
+  pt: es
+```
+
 ## Posts
 
 Put your posts into directories named after the locales, prefixed by an

data/lib/jekyll/locales/site.rb

@@ -1,27 +1,6 @@
 # frozen_string_literal: true
 
-require 'digest'
-
 module Jekyll
-  # Calculate the config changes based on the _config.yml digest instead
-  # of the contents.
-  class Cache
-    class << self
-      def clear_if_config_changed(_)
-        config = Digest::SHA2.file('_config.yml').hexdigest
-        cache = Jekyll::Cache.new "Jekyll::Cache"
-        return if cache.key?("config_digest") && cache["config_digest"] == config
-
-        Jekyll.logger.warn 'Cache:', 'Config changed, clearing caches'
-
-        clear
-        cache = Jekyll::Cache.new "Jekyll::Cache"
-        cache["config_digest"] = Digest::SHA2.file('_config.yml').hexdigest
-        nil
-      end
-    end
-  end
-
   # Jekyll multilingual support
   #
   # * Posts are put under _LANGUAGE/ directories
@@ -34,6 +13,18 @@ module Jekyll
 
     # We don't monkey patch because the Site is already instantiated
     alias process_single process
+    alias original_reset reset
+
+    # Makes sure the configuration is set but it doesn't invalidate the
+    # cache.
+    def reset
+      @original_config ||= Marshal.load(Marshal.dump(config))
+      @config = Marshal.load(Marshal.dump(@original_config))
+
+      original_reset
+
+      locale_config
+    end
 
     # Process the site once per available locale
     def process
@@ -43,16 +34,12 @@ module Jekyll
         Jekyll.logger.info 'Generating locale:', locale
 
         locale_create
-        locale_config
-
-        Jekyll.logger.info 'Destination:', config['destination']
-        Jekyll.logger.info 'Base URL:', config['baseurl']
 
         symlink
         @filter_cache = {}
-        reset
-        setup
+
         process_single
+
         # The default locale is placed at the root of the
         # site and everything else is under a subdirectory, but we symlink
         # root to default_locale for compatibility
@@ -88,6 +75,22 @@ module Jekyll
       default_locale == locale
     end
 
+    # There's always a fallback!
+    #
+    # @return [String]
+    def fallback_locale
+      @fallback_locale ||= {}
+      @fallback_locale[locale] ||=
+        case config['fallback_locale']
+        when TrueClass, FalseClass, NilClass then default_locale
+        when Hash then config['fallback_locale'][locale]
+        when String then config['fallback_locale']
+        else
+          Jekyll.logger.warn 'Locales:', "Configuration `fallback_locale` is #{config['fallback_locale'].class}, it should be boolean, Hash or String"
+          nil
+        end || default_locale
+    end
+
     private
 
     # Redefine #render_docs so it doesn't render the locale collections

data/lib/jekyll/locales/site_drop.rb

@@ -7,7 +7,13 @@ module Jekyll
     # Make i18n available to Liquid as site.i18n
     class SiteDrop
       def i18n
-        @i18n ||= @obj.data[@obj.config['lang']]
+        @i18n ||=
+          if @obj.data.key?(@obj.config['lang'])
+            @obj.data[@obj.config['lang']]
+          else
+            Jekyll.logger.warn 'Locales:', "Using #{@obj.fallback_locale} as fallback of #{@obj.config['lang']}"
+            @obj.data[@obj.fallback_locale]
+          end
       end
     end
   end

data/lib/jekyll/locales/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Locales
-    VERSION = '0.3.0rc0'
+    VERSION = '0.3.0rc2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-locales
 version: !ruby/object:Gem::Version
-  version: 0.3.0rc0
+  version: 0.3.0rc2
 platform: ruby
 authors:
 - f
@@ -35,7 +35,7 @@ cert_chain:
   cpurTQHNJfL/ah+9dYbgDXdG5HAAjRMAsWSvERw95YdN9XzQZCdUk5wUs+A6cNtO
   AZZUMTVYNx8JqUeemxlXBRjsD/s=
   -----END CERTIFICATE-----
-date: 2025-03-14 00:00:00.000000000 Z
+date: 2025-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler