jekyll-locales 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa3a9eda7415b229d8e3e3a70c79a9b4df8ea967e3c5c24d71a98f41d5ffcecc
-  data.tar.gz: a62f6a4b330051558a4b93f7aa87e00700eb10469fdfbe07349cd510f9507454
+  metadata.gz: a7001f707bc9b90e87e3e3cf0bf9df320d9caf192a4dd3a3b8a521663fb7d673
+  data.tar.gz: 4df383de252c0609faace3eaf018f54652bb262b5238ed71e2b78d393cdde521
 SHA512:
-  metadata.gz: c3b2d4214a63d1c7da7b472edb2c997b808749e759e308bdb5704862b3705fa3bee0bcc242c7ef296da6e64133ef6b995e01ec436cec4499cde78c41f3eb8edb
-  data.tar.gz: faf5e2bf08714ae0c4b5c615f849600b747821238cb3c58d1020f85f4b17a28c3d61293d5b3b287ae5a0c40ebfa4c3b052377b52ac2c19ef0dbda6b87144f2c4
+  metadata.gz: 3fb401347ed58d7172981c1a403472047065c8a9992c84478f6202c4701c05676c3e6989077a5e2344530b5e7e1113eb800c3bc7a22fefa2da0a2e02a105fde9
+  data.tar.gz: f8086dae05728e41d661611a89e50fb26319c98a96bb8f72922b94f355c78408dbe863d4fec3c72f14d213967e6a5760f536b8f3f13c75fed40db1488bdab01a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-locales (0.1.6)
+    jekyll-locales (0.1.7)
 
 GEM
   remote: https://rubygems.org/
@@ -35,4 +35,4 @@ DEPENDENCIES
   rubocop (~> 0.74)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -33,10 +33,13 @@ locales:
 - en
 - ahr
 - brasileiro
+redirect: true
 ```
 
-**The first locale is going to be your default locale**.  It doesn't do
-much, but still have it in mind.
+**The first locale is going to be your default locale**.  If you use
+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.
 
 ## Posts
 

data/lib/jekyll/locales/site.rb

@@ -28,15 +28,19 @@ module Jekyll
 
         symlink
         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
+        self_symlink if default_locale? && !redirect?
       end
 
-      if locales?
-        copy_redirector
-        default_delete
-        default_symlink
-      else
-        self_symlink
-      end
+      # XXX: Default is expected by Sutty so we always create it
+      default_delete
+      default_symlink
+
+      # If we enable the redirector, the root of the site will consist
+      # of an index.html that allows visitors to select their locale.
+      copy_redirector if redirect?
     end
 
     private
@@ -50,7 +54,10 @@ module Jekyll
       config['locale'] = config['lang'] = locale
       config['default_locale'] = default_locale
 
+      # Don't touch the config unless there's more than one locale or we
+      # aren't using a redirector
       return unless locales?
+      return if default_locale? && !redirect?
 
       @dest = config['destination'] = locale_destination
       config['baseurl'] = locale_baseurl
@@ -62,7 +69,11 @@ module Jekyll
     end
 
     def default_locale
-      locales.first
+      @default_locale ||= locales.first
+    end
+
+    def default_locale?
+      default_locale == locale
     end
 
     # Cache original destination
@@ -92,6 +103,10 @@ module Jekyll
       FileUtils.ln_s("_#{locale}", '_posts')
     end
 
+    def redirect?
+      config.fetch('redirect', false)
+    end
+
     # TODO: Make configurable
     def redirector
       @redirector ||= File.join(locale_destination, 'redirector.html')

data/lib/jekyll/locales/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Locales
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-locales
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - f
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,8 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Jekyll plugin for localized sites