jekyll-polyglot 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2ef2e09c9f5884d0093bef2c8d97b756297a4842
-  data.tar.gz: 7813f910f0ac8679f1c64e6b3c65130d8a9a9beb
+SHA256:
+  metadata.gz: e3f7773339c45333233f02e73f7e7c96e87a6609ebdb6e6c1082b3adebf679d0
+  data.tar.gz: 5d8bdce1424b3be47d4e1dc07d1dba638436c2c65674e00845c354352b118387
 SHA512:
-  metadata.gz: a828887248c4bd3673429193223ac91ccdb046cd0369df470ba1a973382e88a9e9a98a53407bc67a6ac8975719a0a4bc1eb85df84a4bc94ba8c6a3cd78adfe57
-  data.tar.gz: 9195927833fd833472aaa04671ad48ee812d2e8febb27e421deddd87a8a19c9cd9d93657df95a5259fcf6df657d8cc17ad620ce02264fa3fe6a1990436b64de4
+  metadata.gz: 154f29a20360f6db96f4be7c8584158c9d71c723ae306ad4093ab306eb6b52877bf75ebd5cf222251ebbadfada6c075d1dda06b65f0108b0eddbc8621e05b016
+  data.tar.gz: 240fdec79c5f4188d46a3ec160b17b8fc57fd5341564e105464bf877aa0d8bfe7b69d1f1bbc51c56d03c2a85499f33143ed77eb9131e62891e2c7f76147065c1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 - 2017 Samuel Volin
+Copyright (c) 2015 - 2020 Samuel Volin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -27,15 +27,20 @@ In your `_config.yml` file, add the following preferences
 ```YAML
 languages: ["en", "sv", "de", "fr"]
 default_lang: "en"
-exclude_from_localization: ["javascript", "images", "css"]
+exclude_from_localization: ["javascript", "images", "css", "README.md"]
 parallel_localization: true
 ```
 These configuration preferences indicate
 - what i18n languages you wish to support
 - what is your default "fallback" language for your content
-- what root level folders are you excluding from localization
+- what root level files/folders are excluded from localization, based
+  on if their paths start with any of the excluded regexp substrings
 - whether to run language processing in parallel or serial
 
+The optional `lang_from_path: true` option enables getting page
+language from the first or second path segment, e.g `de/first-one.md`, or
+`_posts/zh_Hans_HK/use-second-segment.md` , if the lang frontmatter isn't defined.
+
 ## How To Use It
 When adding new posts and pages, add to the YAML front matter:
 ```
@@ -152,13 +157,21 @@ Jekyll-polyglot has a few spectacular [Search Engine Optimization techniques](ht
 
 ### Other Websites Built with Polyglot
 let us know if you make a multilingual blog you want to share:
-* [Polyglot example project website](http://polyglot.untra.io)
+* [Polyglot project website](http://polyglot.untra.io)
 * [LogRhythm Corporate Website](http://logrhythm.com)
 * [All Over Earth](https://allover.earth/)
+* [Hanare Cafe in Toshijima, Japan](https://hanarecafe.com)
+* [F-Droid](https://f-droid.org)
 
 ## Compatibility
-Currently supports Jekyll 3.0 .
-Windows users will need to disable parallel_localization on their machines by setting `parallel_localization: false` in the `_config.yml`
+Currently supports Jekyll 3.0 , and Jekyll 4.0 (for the most part)
+
+* *Windows users will need to disable parallel_localization on their machines by setting `parallel_localization: false` in the `_config.yml`
+* In Jekyll 4.0 , SCSS source maps will generate improperly due to how Polyglot operates. The workaround is to disable the CSS sourcemaps. Adding rhe following to your `config.yml` will disable sourcemap generation:
+```yaml
+sass:
+    sourcemap: never
+```
 
 ## Copyright
-Copyright (c) Samuel Volin 2017. License: MIT
+Copyright (c) Samuel Volin 2020. License: MIT

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

@@ -8,7 +8,15 @@ module Jekyll
       @file_langs = {}
       fetch_languages
       @parallel_localization = config.fetch('parallel_localization', true)
-      @exclude_from_localization = config.fetch('exclude_from_localization', [])
+      @lang_from_path = config.fetch('lang_from_path', false)
+      @exclude_from_localization = config.fetch('exclude_from_localization', []).map do |e|
+        if File.directory?(e) and e[-1] != '/'
+          e + '/'
+        else
+          e
+        end
+      end
+
     end
 
     def fetch_languages
@@ -88,13 +96,32 @@ module Jekyll
       @exclude = old_exclude
     end
 
+    def derive_lang_from_path(doc)
+      if !@lang_from_path
+        return nil
+      end
+      segments = doc.relative_path.split('/')
+      if doc.relative_path[0] == '_' \
+        and segments.length > 2 \
+        and segments[1] =~ /^[a-z]{2,3}(:?[_-](:?[A-Za-z]{2}){1,2}){0,2}$/
+        return segments[1]
+      elsif segments.length > 1 \
+        and segments[0] =~ /^[a-z]{2,3}(:?[_-](:?[A-Za-z]{2}){1,2}){0,2}$/
+        return segments[0]
+      else
+        return nil
+      end
+    end
+
     # assigns natural permalinks to documents and prioritizes documents with
-    # active_lang languages over others
+    # active_lang languages over others.  If lang is not set in front matter,
+    # then this tries to derive from the path, if the lang_from_path is set.
+    # otherwise it will assign the document to the default_lang
     def coordinate_documents(docs)
       regex = document_url_regex
       approved = {}
       docs.each do |doc|
-        lang = doc.data['lang'] || @default_lang
+        lang = doc.data['lang'] || derive_lang_from_path(doc) || @default_lang
         url = doc.url.gsub(regex, '/')
         doc.data['permalink'] = url
         next if @file_langs[url] == @active_lang
@@ -133,10 +160,14 @@ module Jekyll
 
     # a regex that matches relative urls in a html document
     # matches href="baseurl/foo/bar-baz" and others like it
-    # avoids matching excluded files
+    # avoids matching excluded files.  prepare makes sure
+    # that all @exclude dirs have a trailing slash.
     def relative_url_regex
       regex = ''
-      (@exclude + @languages).each do |x|
+      (@exclude).each do |x|
+        regex += "(?!#{x})"
+      end
+      (@languages).each do |x|
         regex += "(?!#{x}\/)"
       end
       %r{href=\"?#{@baseurl}\/((?:#{regex}[^,'\"\s\/?\.#]+\.?)*(?:\/[^\]\[\)\(\"\'\s]*)?)\"}
@@ -144,7 +175,10 @@ module Jekyll
 
     def absolute_url_regex(url)
       regex = ''
-      (@exclude + @languages).each do |x|
+      (@exclude).each do |x|
+        regex += "(?!#{x})"
+      end
+      (@languages).each do |x|
         regex += "(?!#{x}\/)"
       end
       %r{href=\"?#{url}#{@baseurl}\/((?:#{regex}[^,'\"\s\/?\.#]+\.?)*(?:\/[^\]\[\)\(\"\'\s]*)?)\"}

data/lib/jekyll/polyglot/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Polyglot
-    VERSION = '1.3.1'.freeze
+    VERSION = '1.3.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-polyglot
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Samuel Volin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-02 00:00:00.000000000 Z
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -63,8 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: I18n plugin for Jekyll Blogs