jekyll-language-plugin 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b6c261bef7ca88520afb58ec4a1760617681229
-  data.tar.gz: fd4978a18ea984aacdccafb8b43b6c8b20cb6323
+  metadata.gz: 2a1bb3cff51451bb186fcf8ed868ca7d16163f5b
+  data.tar.gz: 85b13baa23d8917c28c2c5b0ecc61af64641a227
 SHA512:
-  metadata.gz: 1528ab446fa8b5446dfa068aa377f669d8933aa4fae6faab3f021fc9c502d1a9b53134398a6fa15e8490a150a3b8f2f1d101da30ad0c119427d20f4900e75986
-  data.tar.gz: 1782d0f93101c1a2dfceaf5783eaf859138f201153dceb0e8f486c2242e246b66106bc0b5bab28969b1c1bb90c7a2c585ecd6d981a337ab921a0d9b8ecba24ec
+  metadata.gz: 7a454dd37cfadf074becdb4554f5511b43d77b5b40f2390aafd226da7dfe5f03b64b6cff78b9f3f5c0a0c6aa394b165ac1a29a6ed7b11d23444febfa68051c0a
+  data.tar.gz: bad803fc855229a0ced531494dbe8b15884f5f9c21df72baa2c57f463f05c6b6946a6a4caeef8615231c4e75fa82fa3ef33d092ddc4929102ae2ee8d519c0e85

data/README.md

@@ -62,10 +62,10 @@ This is a page optimized for the language plugin, `home.html`:
 ```
 ---
 layout: default
-subset: home
 languages:
 - en
 - de
+subset: home
 ---
 <h1>{% t title %}</h1>
 <p>{% t description %}</p>
@@ -127,6 +127,8 @@ If you now run `jekyll build`, you will obtain two separate `home.html` files in
 
 Similar to pages, posts can also have the `languages` or `language` keys as well as the `subset` key in its YAML front-matter. You can use all supported liquid tags and filters to translate posts but you can also create multiple posts, one for each language.
 
+It is recommended not to make excessive use of the liquid tags in posts but instead create a post for each translation.
+
 ## Liquid tags
 
 Currently, there are two liquid tags provided by this plugin.

data/lib/jekyll-language-plugin.rb

@@ -11,6 +11,7 @@ require 'jekyll/readers/language_page_reader.rb'
 require 'jekyll/readers/language_post_reader.rb'
 require 'jekyll/filters/language_date.rb'
 require 'jekyll/tags/language.rb'
+require 'jekyll/tags/language_name.rb'
 require 'jekyll/tags/language_include.rb'
 
 # replace Jekyll::Reader upon page reset with Jekyll::LanguageReader extension

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

@@ -33,6 +33,15 @@ module JekyllLanguagePlugin
       raise JekyllLanguagePlugin::PluginError.new("Language string #{key} not found.")
     end
 
+    def self.get_language_name(context, name)
+      translation = self.get_language_data(context, 'lang')
+
+      raise JekyllLanguagePlugin::PluginError.new('Language name not found in translation.') if translation.nil? ||
+        !translation.key?(name)
+
+      translation[name]
+    end
+
     def self.traverse_hash(hash, keys)
       return nil if hash.nil? || keys.to_s.empty?
       keys = keys.split('.') if keys.is_a?(String)

data/lib/jekyll/tags/language.rb

@@ -3,15 +3,28 @@ module Jekyll
     class LanguageTag < Liquid::Tag
       def initialize(tag_name, markup, tokens)
         super
-        @params = markup.gsub(/\s+/m, ' ').strip.split(" ")
-        @lkey = @params.shift
+        @markup = markup
       end
 
       def render(context)
-        str = JekyllLanguagePlugin::LiquidContext.get_language_string(context, @lkey)
-        return "" if str.nil?
+        p = Liquid::Parser.new(@markup)
+        name = Liquid::Expression.parse(exp = p.expression)
+        key = context.evaluate(name)
+        raise Liquid::SyntaxError.new("Invalid language key expression: #{exp}") if key.nil?
 
-        @params.each { |p| str.sub!("%%", p) }
+        # get language string from evaluated key
+        str = JekyllLanguagePlugin::LiquidContext.get_language_string(context, key)
+
+        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 JekyllLanguagePlugin::PluginError.new("Language string is lacking parameter placeholder.") unless str.include?("%%")
+            str.sub!("%%", argstr)
+            break if !p.consume?(:comma)
+          end
+        end
         str
       end
     end

data/lib/jekyll/tags/language_name.rb

@@ -0,0 +1,22 @@
+module Jekyll
+  module Tags
+    class LanguageNameTag < Liquid::Tag
+      def initialize(tag_name, markup, tokens)
+        super
+        @markup = markup
+      end
+
+      def render(context)
+        p = Liquid::Parser.new(@markup)
+        name = Liquid::Expression.parse(exp = p.expression)
+        key = context.evaluate(name)
+        raise Liquid::SyntaxError.new("Invalid language key expression: #{exp}") if key.nil?
+
+        # get language name string from evaluated key
+        JekyllLanguagePlugin::LiquidContext.get_language_string(context, "lang.#{key}")
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('tl', Jekyll::Tags::LanguageNameTag)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-language-plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Vincent Wochnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -82,6 +82,7 @@ files:
 - lib/jekyll/readers/language_post_reader.rb
 - lib/jekyll/tags/language.rb
 - lib/jekyll/tags/language_include.rb
+- lib/jekyll/tags/language_name.rb
 - lib/jekyll-language-plugin/date_localizer.rb
 - lib/jekyll-language-plugin/liquid_context.rb
 - lib/jekyll-language-plugin/plugin_exception.rb