jekyll-multiple-languages-plugin 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adae9df614a152254acf133ff446366b93806ae3
-  data.tar.gz: ebea05c05297138b66975622c9e1141b410c8310
+  metadata.gz: 2f0345608e574787a5648224db9b1384ecce2152
+  data.tar.gz: 254fca0b56af9ce8ac43441e1d6bd7927ed4305b
 SHA512:
-  metadata.gz: 3cca64fa57399de3656aeb5261c4d6d56500f89483e885b80068876cf53efdc2e540518be3bbe79e2348bc3ccafcd05985fdae6ba39e3c962b9e9c6dd5e6ce64
-  data.tar.gz: cc3dd268294b7ca2d310d39d954af09e053722bb7a60a06e4dc882896e963b5a6ad5fb36a0afd45c2f2cb652901fe48aed63085e9acfb9188b3bbcf424e2c2dd
+  metadata.gz: 2d9a024e2b68882f4ecd9e9d4c1b110e081ed7459ef0ac027e85020e8544576578ecf5347cf9b7a4b1e3458f2820ea7e6dee4c180ec99a137f39de69481ea209
+  data.tar.gz: ef680666a151cd316cc0171a2c8e501c466e9b65197dc20f7563fddea7ed21d1cecd37f5b208386cb89f01c550e8f336676d62f010ab81c1cb5769610baba3de

data/README.md

@@ -40,7 +40,7 @@ Table of Contents
 
 ## 1. Current Release Notice
 
-1.5.0 is the current stable release.
+1.5.1 is the current stable release.
 
 Users that update from older versions to 1.4.0 or newer must change their `_config.yml` for the plugin to be loaded. Please see the `Installation` section bellow for the new string used to load the plugin.
 
@@ -325,7 +325,7 @@ Inside each of the language folders, you should create mirror pages to provide t
 ## 7. Example website
 
 This repository has an example website where you can test the plugin.
-After downloading the repository, get into the `example` directory and run: `bundle install` to install the newest version of Jekyll (change the Gemfile to install another version), the plugin, and all other dependencies.
+After downloading the repository, get into the `example` directory and run: `bundle install` to install the newest version of Jekyll (edit the Gemfile to install another version) and all other dependencies.
 
 Then run `bundle exec jekyll serve` to start the Jekyll server. Using your web browser, access the address `http://localhost:4000`.
 
@@ -357,6 +357,10 @@ Then, create a file named `about.md` under `_i18n/en` with the English content.
 
 
 ## 8. Changelog
+* 1.5.1
+  * Fix a bug (#70) where `site.static_files` would be empty on subsites if `exclude_from_localizations` is used.
+  * Some overall project enhancements and minor fixes.
+  * A simple Rake task is available to test the plugin, CI services now have something to run.
 * 1.5.0
   * Enables Liquid expansions within Liquid Tags.
   * The example website post language switchers were rewritten in an algorithmic way.

data/lib/jekyll-multiple-languages-plugin.rb

@@ -16,6 +16,41 @@ require_relative "plugin/version"
 
 module Jekyll
 
+  #*****************************************************************************
+  # :site, :post_render hook
+  #*****************************************************************************
+  Jekyll::Hooks.register :site, :post_render do |site, payload|
+    
+    # Removes all static files that should not be copied to translated sites.
+    #===========================================================================
+    default_lang  = payload["site"]["default_lang"]
+    current_lang  = payload["site"][        "lang"]
+    
+    static_files  = payload["site"]["static_files"]
+    exclude_paths = payload["site"]["exclude_from_localizations"]
+    
+    
+    if default_lang != current_lang
+      static_files.delete_if do |static_file|
+          
+        # Remove "/" from beginning of static file relative path
+        static_file_r_path    = static_file.instance_variable_get(:@relative_path).dup
+        static_file_r_path[0] = ''
+        
+        exclude_paths.any? do |exclude_path|
+          Pathname.new(static_file_r_path).descend do |static_file_path|
+            break(true) if (Pathname.new(exclude_path) <=> static_file_path) == 0
+          end
+        end
+      end
+    end
+    
+    #===========================================================================
+    
+  end
+
+
+
   ##############################################################################
   # class Site
   ##############################################################################
@@ -53,7 +88,6 @@ module Jekyll
       
       # Original Jekyll configurations
       baseurl_org                 = self.config[ 'baseurl' ] # Baseurl set on _config.yml
-      exclude_org                 = self.exclude             # List of excluded paths
       dest_org                    = self.dest                # Destination folder where the website is generated
       
       # Site building only variables
@@ -86,10 +120,6 @@ module Jekyll
         self.config['baseurl'] = baseurl_org + "/" + lang
         self.config['lang']    =                     lang
         
-        # exclude folders or files from being copied to all the language folders
-        exclude_from_localizations =  self.config['exclude_from_localizations']
-        self.exclude               = exclude_org + exclude_from_localizations
-        
         puts "Building site for language: \"#{self.config['lang']}\" to: #{self.dest}"
         
         process_org
@@ -97,7 +127,6 @@ module Jekyll
       
       # Revert to initial Jekyll configurations (necessary for regeneration)
       self.config[ 'baseurl' ] = baseurl_org  # Baseurl set on _config.yml
-      self.exclude             = exclude_org  # List of excluded paths
       @dest                    = dest_org     # Destination folder where the website is generated
       
       puts 'Build complete'

data/lib/plugin/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module MultipleLanguagesPlugin
-    VERSION = "1.5.0"
+    VERSION = "1.5.1"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-multiple-languages-plugin
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Martin Kurtsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-14 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler