jekyll-language-plugin 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5fb5ec3d91366e33ef3249fe444732578a19a58
-  data.tar.gz: 021ac231fcf5c00641237f732664ac5d9dae7665
+  metadata.gz: 474a7a7e024e8fdae812794d6970da82887655c2
+  data.tar.gz: 4a8f30df701b2530cda2ce3339a95bb234983a25
 SHA512:
-  metadata.gz: 0f94e8808c97c02c5971cdd91ee8246ae9531b37f57b03c5a898292bd231c8b65e9460e4a7b4df8ffeeaf699ad2a1fe500a76c80ba2814420f6aeeb7b69dfb38
-  data.tar.gz: af646f2a74818cc0deab7e3d49214126872d0eb88b19288be7b6bc1fc44dadc83d6f83995324460c20e943750974eee2dea4bc3500f0b3e9721be27e65a96ef1
+  metadata.gz: b029db16f1aa3a05c7e4d60a0d60d849bdac2ca87541cdea1d71308c71d5c336b841642f750b52261e62e11438f75026d4cd242e54fbdb27ead31789fee6d635
+  data.tar.gz: 5146e49851e0bd2e50bc124e446c4ee41faae2cf992f1854784cac6d848c0637746fe440b43b2e7680b3978bc8cf99aeab5577ce3b557abcaef8b2daf71319cd

data/README.md

@@ -17,6 +17,7 @@ This plugin has been developed with user-simplicity in mind. It does not require
 * Supports localized URLs
 * Works with `jekyll serve --watch`
 * Supports includes translated into multiple languages
+* Includes language and date translations for 27 languages
 
 ## Installation
 

data/lib/jekyll-language-plugin.rb

@@ -22,12 +22,8 @@ module Jekyll
     end
 
     class << self
-      def loaders
-        @loaders ||= []
-      end
-
       def register_loader(loader)
-        loaders.push(loader)
+        LanguageData.register_loader(loader)
       end
     end
   end
@@ -41,9 +37,17 @@ require 'jekyll/language-plugin/loaders/builtin_data_loader.rb'
 Dir[File.join(File.dirname(__FILE__), 'jekyll/language-plugin/tags/*.rb')].each{ |f| require f }
 require 'jekyll/language-plugin/filters/language_date.rb'
 
-# replace Jekyll::Reader upon page reset with Jekyll::LanguageReader extension
 Jekyll::Hooks.register :site, :after_reset do |site|
+  # replace Jekyll::Reader with Jekyll::LanguageReader extension
   site.reader = Jekyll::LanguageReader.new(site)
+
+  # add dynamic languageData property
+  unless site.respond_to?(:languageData) && site.respond_to?(:languageData=)
+    site.class.module_eval { attr_accessor :languageData }
+  end
+
+  # create new language data instance
+  site.languageData = Jekyll::LanguagePlugin::LanguageData.new(site)
 end
 
 # monkey patch URL.sanitize_url for handling of triple slashes

data/lib/jekyll/language-plugin/date_localizer.rb

@@ -1,17 +1,18 @@
 module Jekyll
   module LanguagePlugin
-    module DateLocalizer
-      def self.localize_date(date, format, context)
-        language_data = Jekyll::LanguagePlugin::LiquidContext.get_language_data(context)
-        translation = language_data.get('date')
+    class DateLocalizer
+      attr_reader :translation
 
-        raise Jekyll::LanguagePlugin::PluginError.new('No localized date available.') if translation.nil?
+      def initialize(translation)
+        @translation = translation
+      end
 
+      def localize_date(date, format)
         # validate language translation
         if !['abbr_daynames', 'daynames', 'abbr_monthnames', 'monthnames'].all? {|s| translation.key?(s) && translation[s].is_a?(Array) } ||
            translation['abbr_daynames'].size < 7 || translation['daynames'].size < 7 ||
            translation['abbr_monthnames'].size < 12 || translation['monthnames'].size < 12
-          raise Jekyll::LanguagePlugin::PluginError.new('Invalid localized date translation.')
+          raise Jekyll::LanguagePlugin::PluginError.new('Invalid date translation.')
         end
 
         date.strftime(

data/lib/jekyll/language-plugin/filters/language_date.rb

@@ -19,10 +19,7 @@ module Jekyll
           end
 
           return "" if !date.is_a?(Time)
-          format = LiquidContext.get_language_string(@context, fkey)
-          return "" if format.nil?
-
-          Jekyll::LanguagePlugin::DateLocalizer.localize_date(date, format, @context).to_s
+          LiquidContext.get_localized_date(@context, date, fkey)
         end
       end
     end

data/lib/jekyll/language-plugin/language_data.rb

@@ -1,23 +1,46 @@
 module Jekyll
   module LanguagePlugin
     class LanguageData
-      attr_reader :language
+      attr_reader :site, :language
 
-      def initialize(site, language)
-        @language = language
-        @loaders = Jekyll::LanguagePlugin.loaders.map{ |l| l.new(site) }
+      def initialize(site)
+        @site = site
+        @l_inst_ary = Array.new
       end
 
-      def get(key)
-        @loaders.inject(nil) do |result, loader|
-          loader.load(@language) unless loader.loaded?(@language)
-          result = loader.get(key, @language)
+      def get(key, language)
+        inject_loaders(language) do |result, loader|
+          loader.get(key, language)
+        end
+      end
+
+      def get_with_placeholders(key, tokens, language)
+        inject_loaders(language) do |result, loader|
+          loader.get_with_placeholders(key, tokens, language)
+        end
+      end
+
+      def inject_loaders(language)
+        self.class.loaders.inject(nil) do |result, loader|
+          unless l_inst = @l_inst_ary.detect { |l| l.is_a?(loader) }
+            l_inst = loader.new(@site)
+            @l_inst_ary.push(l_inst)
+          end
+
+          l_inst.load(language) unless l_inst.loaded?(language)
+          result = yield result, l_inst
           break result unless result.nil?
         end
       end
 
-      def has?(key)
-        !get(key).nil?
+      class << self
+        def loaders
+          @loaders ||= []
+        end
+
+        def register_loader(loader)
+          loaders.push(loader)
+        end
       end
     end
   end

data/lib/jekyll/language-plugin/liquid_context.rb

@@ -2,38 +2,77 @@ module Jekyll
   module LanguagePlugin
     module LiquidContext
       def self.get_language_data(context)
-        if !context.registers[:language_data].nil?
-          return context.registers[:language_data]
-        end
+        context.registers[:site].languageData
+      end
 
+      def self.get_language(context)
         language = context.registers[:page]['language']
+
         if language.to_s.empty?
           raise Jekyll::LanguagePlugin::PluginError.new('No language specified for current page or post.')
         end
 
-        site = context.registers[:site]
-        context.registers[:language_data] = LanguageData.new(site, language)
+        language
       end
 
-      def self.get_language_string(context, key)
+      def self.get_language_string(context, key, tokens=nil)
         language_data = self.get_language_data(context)
+        language = self.get_language(context)
 
         subset = context.registers[:page]['subset']
-        str = language_data.get([subset, key]) unless subset.to_s.empty?
-        str ||= language_data.get(key)
 
-        raise Jekyll::LanguagePlugin::PluginError.new("Key #{key} not found in translation.") if str.nil?
+        if tokens.is_a?(Array) && tokens.length > 0
+          unless subset.to_s.empty?
+            str = language_data.get_with_placeholders([subset, key], tokens, language)
+          end
+          str ||= language_data.get_with_placeholders(key, tokens, language)
+        else
+          unless subset.to_s.empty?
+            str = language_data.get([subset, key], language)
+          end
+          str ||= language_data.get(key, language)
+        end
+
+        if str.nil?
+          raise Jekyll::LanguagePlugin::PluginError.new("Key #{key} not found in translation.")
+        end
+
         str
       end
 
+      def self.get_localized_date(context, date, format_key)
+        language_data = self.get_language_data(context)
+        language = self.get_language(context)
+
+        subset = context.registers[:page]['subset']
+        format_str = language_data.get([subset, format_key], language) unless subset.to_s.empty?
+        format_str ||= language_data.get(format_key, language)
+
+        if format_str.nil?
+          raise Jekyll::LanguagePlugin::PluginError.new("Date format key #{key} not found in translation.")
+        end
+
+        date_translation = language_data.get('date', language)
+
+        if date_translation.nil?
+          raise Jekyll::LanguagePlugin::PluginError.new('No localized date available for translation.')
+        end
+
+        date_localizer = DateLocalizer.new(date_translation)
+        date_localizer.localize_date(date, format_str)
+      end
+
       def self.get_language_name(context, name)
         language_data = self.get_language_data(context)
-        translation = language_data.get('lang')
+        language = self.get_language(context)
 
-        raise Jekyll::LanguagePlugin::PluginError.new('Language name not found in translation.') if translation.nil? ||
-          !translation.key?(name)
+        str = language_data.get(['lang', name])
 
-        translation[name]
+        if str.nil?
+          raise Jekyll::LanguagePlugin::PluginError.new("Language name #{name} not found in translation.")
+        end
+
+        str
       end
     end
   end

data/lib/jekyll/language-plugin/loaders/base_loader.rb

@@ -10,7 +10,7 @@ module Jekyll
         end
 
         def loaded?(language)
-          false
+          true
         end
 
         def load(language)
@@ -21,13 +21,16 @@ module Jekyll
           nil
         end
 
+        def get_with_placeholders(key, tokens, language)
+          res = get(key, language)
+          return nil if res.nil?
+          res.gsub(/%%/).with_index { |m, i| tokens[i] || m }
+        end
+
         def traverse_hash(hash, keys)
           for key in keys
-            if !hash.is_a?(Hash)
-              return hash
-            elsif !hash.key?(key)
-              return nil
-            end
+            return hash unless hash.is_a?(Hash)
+            return nil unless hash.key?(key)
             hash = hash[key]
           end
           hash

data/lib/jekyll/language-plugin/loaders/builtin_data_loader.rb

@@ -35,4 +35,5 @@ module Jekyll
   end
 end
 
+$stdout.puts("Registering!")
 Jekyll::LanguagePlugin.register_loader(Jekyll::LanguagePlugin::Loaders::BuiltinDataLoader)

data/lib/jekyll/language-plugin/tags/language.rb

@@ -13,20 +13,18 @@ module Jekyll
           key = context.evaluate(name)
           raise Liquid::SyntaxError.new("Invalid language key expression: #{exp}") if key.nil?
 
-          # get language string from evaluated key
-          str = Jekyll::LanguagePlugin::LiquidContext.get_language_string(context, key)
-
+          tokens = Array.new
           if p.consume?(:colon)
             loop do
               arg = Liquid::Expression.parse(exp = p.expression)
-              argstr = context.evaluate(arg)
-              raise Liquid::SyntaxError.new("Invalid parameter expression: #{exp}") if argstr.nil?
-              raise Jekyll::LanguagePlugin::PluginError.new("Language string is lacking parameter placeholder.") unless str.include?("%%")
-              str.sub!("%%", argstr)
+              token = context.evaluate(arg)
+              raise Liquid::SyntaxError.new("Invalid parameter expression: #{exp}") if token.nil?
+              tokens.push(token)
               break if !p.consume?(:comma)
             end
           end
-          str
+
+           Jekyll::LanguagePlugin::LiquidContext.get_language_string(context, key, tokens)
         end
       end
     end

data/lib/jekyll/language-plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module LanguagePlugin
-    VERSION = '1.2.2'
+    VERSION = '1.2.3'
   end
 end

data/lib/jekyll/language_page.rb

@@ -17,9 +17,9 @@ module Jekyll
       })
 
       if !language.nil? && !subset.nil?
-        @language_data ||= LanguagePlugin::LanguageData.new(@site, language)
+        language_data = @site.languageData || LanguagePlugin::LanguageData.new(@site)
 
-        data = @language_data.get(subset)
+        data = language_data.get(subset, language)
 
         if !data.nil?
           filtered = data.reject{ |k, v| v.is_a?(Enumerable) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-language-plugin
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Vincent Wochnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll