jekyll-polyglot 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 804d1b4413eead1b3cb2ba61cf7756cf1ca5b474
-  data.tar.gz: f128e8f07eb56bcb3efe4c4e9f2c5190d1c5b759
+  metadata.gz: ca5555c293e66a474d1e376be77e2734c3306f4a
+  data.tar.gz: 4c4c2f6caa77f7571ba4274964873e598ff7cb29
 SHA512:
-  metadata.gz: 9aaaf216dfc22f58e87f45ec21c8b8e7e03009374b4600ddee87b3576270f4c4c902a56ceb5a65e8c154a3ae3a8c7cffa7414c430a6801d66b2125ea07574abd
-  data.tar.gz: 47b49166bb5fc8a3eee76a86d6ebd9ac4ecd096028443d99fb38306ee95956e029465c10ac5d4aa5ace94b54daea072139ef5b137ff669240d86dc6e3839399c
+  metadata.gz: e4a344bd2433929d60bd767747a8366e3beefef1152e1ee0fe2f5e8ee2be5fed005ed14875b3f99e9f94197eb8c9f8b147c38433d7578b84ca6e1917b7d2cba8
+  data.tar.gz: af745ab17521284b5dfc294de4666dc80b8a0eaca237817d61099e7bb342c460bb69fffdb169b5b2926c51371d68043fcd521526c20cbbe7f3bb7079357a0713

data/lib/polyglot.rb

@@ -1,3 +1,8 @@
+# Jekyll Polyglot v1.1.1
+# Fast, painless, open source i18n plugin for Jekyll 3.0 Blogs.
+#   author: Samuel Volin (@untra)
+#   github: https://github.com/untra/polyglot
+#   license: MIT
 include Process
 module Jekyll
   # Alteration to Jekyll Site class
@@ -8,7 +13,6 @@ module Jekyll
     attr_accessor :file_langs, :active_lang
 
     def prepare
-      @start_time = time
       @file_langs = {}
       @default_lang = config['default_lang'] || 'en'
       @languages = config['languages'] || ['en']
@@ -50,44 +54,38 @@ module Jekyll
     def process_language(lang)
       @active_lang = lang
       config['active_lang'] = @active_lang
-      return build_language(@active_lang) if @active_lang == @default_lang
+      return process_orig if @active_lang == @default_lang
       process_active_language
     end
 
     def process_active_language
-      dest_orig = dest
-      exclude_orig = exclude
       @dest = @dest + '/' + @active_lang
       @exclude += config['exclude_from_localization']
-      build_language(@active_lang)
-      @dest = dest_orig
-      @exclude = exclude_orig
+      process_orig
     end
 
-    def build_language(lang)
-      reset
-      read
-      filter
-      generate
-      render
-      cleanup
-      puts "Building #{lang} Site"
-      write
-    end
-
-    def filter
+    # hook to coordinate blog posts into distinct urls,
+    # and remove duplicate multilanguage posts
+    Jekyll::Hooks.register :site, :post_read do |site|
       langs = {}
       approved = {}
-      posts.each do |post|
-        language = post.data['lang'] || @default_lang
-        next if langs[post.url] == @active_lang
-        if langs[post.url] == @default_lang
-          next if language != @active_lang
+      n = ''
+      site.languages.each do |lang|
+        n += "([\/\.]#{lang}[\/\.])|"
+      end
+      n.chomp! '|'
+      site.posts.docs.each do |doc|
+        language = doc.data['lang'] || site.default_lang
+        url = doc.url.gsub(%r{#{n}}, '/')
+        doc.data['permalink'] = url
+        next if langs[url] == site.active_lang
+        if langs[url] == site.default_lang
+          next if language != site.active_lang
         end
-        approved[post.url] = post
-        langs[post.url] = language
+        approved[url] = doc
+        langs[url] = language
       end
-      @posts = approved.values
+      site.posts.docs = approved.values
     end
   end
 
@@ -143,7 +141,7 @@ module Jekyll
         n += "(?!#{x}\/)"
       end
       # regex that looks for all relative urls except for excluded files
-      %r{href=\"\/#{site.baseurl.gsub(%r{\/}, '')}\/((?:#{n}[^,'\"\s\/?\.#-]+\.?)*(?:\/[^\]\[\)\(\"\'\s]*)?)\"}
+      %r{href=\"#{site.baseurl}\/((?:#{n}[^,'\"\s\/?\.#-]+\.?)*(?:\/[^\]\[\)\(\"\'\s]*)?)\"}
     end
   end
 

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-polyglot
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Samuel Volin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+date: 2015-12-20 00:00:00.000000000 Z
+dependencies: []
 description: Fast open source internationalization plugin for Jekyll blogs.
 email: untra.sam@gmail.com
 executables: []