jekyll-language-plugin 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09d08bc0bd9ace9e9ed14474e8f57ce0298e6779
-  data.tar.gz: a6ab1ecd54e36a03a986af23d5ee9b0f16f35af5
+  metadata.gz: b0a05d1d865dc59d54dada24d41de3c9d5d615de
+  data.tar.gz: 002e66f66fa993f0abbe721e71a31357562f5cb7
 SHA512:
-  metadata.gz: 91724843ebb69d1ad67e45b3ca8937f50b2cbb2bf5f8c2f1c1caf0803c8d86ddf6d959656b293bfa755f57354b58678ed3010a9baf340270fc8cf0b657e9d26e
-  data.tar.gz: 97201c70f08003ea0426e0009202d1153660a651f5a87535dc0a1c7fc18ed7c88ec157018d6a980bd6e308f2791b7b96aa68b35f53468abe257af57988bfc7ef
+  metadata.gz: 6410a6d6c6dce3fa4ec4e60bdf6492b4d8979a30930977144171c88734431da6a2fe1d10b85f6addd8ea3ea0005247fdda51dc0eea6c07886db044cfced54cc4
+  data.tar.gz: ae6919a539b02a056908dbb88bb7c28df9bd3f33457feb1ae4ca8993ffb88ead15b1c8c72adf9613a3ff852fba720638f600b9f44a51e37ef1047d35ea5aa4fb

data/lib/jekyll/tags/language_include.rb

@@ -2,7 +2,7 @@ module Jekyll
   module Tags
     class LanguageIncludeTag < IncludeTag
       def tag_includes_dir(context)
-        context.registers[:site].config['language_includes_dir'].freeze
+        (context.registers[:site].config['language_includes_dir'].to_s || '_i18n').freeze
       end
 
       def page_language(context)

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

@@ -4,7 +4,7 @@ module JekyllLanguagePlugin
       translation = JekyllLanguagePlugin::LiquidContext.get_language_data(context, 'date')
 
       # validate language translation
-      return nil if translation.nil? ||
+      raise JekyllLanguagePlugin::PluginError.new('Localized date is missing translation.') if translation.nil? ||
         !['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
@@ -25,7 +25,7 @@ module JekyllLanguagePlugin
                 when 'b'; translation['abbr_monthnames'][self.mon-1]
                 when 'B'; translation['monthnames'][self.mon-1]
                 else
-                  raise "Date#strftime: InputError"
+                  raise JekyllLanguagePlugin::PluginError.new('Internal error.')
               end
             })
         if defined? @@encoding_converter

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

@@ -2,16 +2,21 @@ module JekyllLanguagePlugin
   module LiquidContext
     def self.get_language_data(context, keys = nil)
       site = context.registers[:site]
-      language_data = site.config['language_data']
+      language_data = site.config['language_data'].to_s || 'data.lang.%%'
+
       page_language = context.registers[:page]['language']
-      return nil if language_data.to_s.empty? || page_language.to_s.empty?
+      return nil if page_language.to_s.empty?
 
       keys2 = language_data.gsub("%%", page_language).split('.')
       language_data = site.send(keys2.shift)
       language_data = self.traverse_hash(language_data, keys2)
+      raise JekyllLanguagePlugin::PluginError.new('Invalid language data configuration.') if language_data.nil?
 
       return language_data if keys.to_s.empty? # can also return nil
-      self.traverse_hash(language_data, keys)
+
+      language_data = self.traverse_hash(language_data, keys)
+      raise JekyllLanguagePlugin::PluginError.new("Language subset #{keys.to_s} not found.") if language_data.nil?
+      language_data
     end
 
     def self.get_language_string(context, key)
@@ -24,8 +29,8 @@ module JekyllLanguagePlugin
          !(str = traverse_hash(data, key)).to_s.empty?
         return str
       end
-      
-      ""
+
+      raise JekyllLanguagePlugin::PluginError.new("Language string #{key} not found.")
     end
 
     def self.traverse_hash(hash, keys)

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

@@ -0,0 +1,4 @@
+module JekyllLanguagePlugin
+  class PluginError < RuntimeError
+  end
+end

data/lib/jekyll-language-plugin.rb

@@ -1,4 +1,5 @@
 # require all files in jekyll-language-plugin subdirectory
+require 'jekyll-language-plugin/plugin_exception.rb'
 require 'jekyll-language-plugin/liquid_context.rb'
 require 'jekyll-language-plugin/date_localizer.rb'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-language-plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Vincent Wochnik
@@ -84,6 +84,7 @@ files:
 - lib/jekyll/tags/language_include.rb
 - lib/jekyll-language-plugin/date_localizer.rb
 - lib/jekyll-language-plugin/liquid_context.rb
+- lib/jekyll-language-plugin/plugin_exception.rb
 - README.md
 - LICENSE.md
 homepage: https://github.com/vwochnik/jekyll-language-plugin