* Enables Liquid expansions within Liquid Tags.

* The example website post language switchers were rewritten in an algorithmic way.
kurtsson · Aug 14, 2016 · 532c713 · 532c713
1 parent 2c78dde
commit 532c713
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 72 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ Table of Contents
 
 ## 1. Current Release Notice
 
-1.4.1 is the current stable release.
+1.5.0 is the current stable release.
 
 Users that update from older versions to 1.4.0 or newer must change their `_config.yml` for the plugin to be loaded. Please see the `Installation` section bellow for the new string used to load the plugin.
 
@@ -357,6 +357,9 @@ Then, create a file named `about.md` under `_i18n/en` with the English content.
 
 
 ## 8. Changelog
+* 1.5.0
+  * Enables Liquid expansions within Liquid Tags.
+  * The example website post language switchers were rewritten in an algorithmic way.
 * 1.4.2
   * Exposes the `site.translations` hash containing the translated strings to Liquid.
 * 1.4.1

diff --git a/example/_i18n/en.yml b/example/_i18n/en.yml
@@ -1,11 +1,12 @@
 global:
-  italian: Italiano
-  english: English
-  spanish: Español
   tagline: English
   about: About
   twitter: Twitter
   github: GitHub
+langs:
+  it: Italiano
+  en: English
+  es: Español
 pages:
   example: example
   includeexample: The following text is a Jekyll include liquid tag parameter

diff --git a/example/_i18n/es.yml b/example/_i18n/es.yml
@@ -1,11 +1,12 @@
 global:
-  italian: Italiano
-  english: English
-  spanish: Español
   tagline: Español
   about: Sobre
   twitter: Twitter
   github: GitHub
+langs:
+  it: Italiano
+  en: English
+  es: Español
 pages:
   example: Ejemplo
   includeexample: El siguiente texto es un parámetro de Jekyll include liquid tag

diff --git a/example/_i18n/it.yml b/example/_i18n/it.yml
@@ -1,11 +1,12 @@
 global:
-  italian: Italiano
-  english: English
-  spanish: Español
   tagline: Italiano
   about: Riquardo
   twitter: Twitter
   github: GitHub
+langs:
+  it: Italiano
+  en: English
+  es: Español
 pages:
   example: Esempio
   includeexample: Il testo che segue è un parametro di Jekyll include liquid tag

diff --git a/example/_includes/post.html b/example/_includes/post.html
@@ -12,26 +12,25 @@ <h1 id="title">{{ page.title }}</h1>
   </div>
 
   <div class="post">
-	{% if site.lang == "it" %}
-		{% capture link1 %}{{ site.baseurl_root }}/en{{ page.url}}{% endcapture %}
-		{% capture link3 %}{{ site.baseurl_root }}/es{{ page.url}}{% endcapture %}
-		<div align="right">
-			<a href="{{ link1 }}" >{% t global.english %}</a><span class="separator"> &bull; </span><a href="{{ link3 }}" >{% t global.spanish %}</a>
-		</div>	
-	{% elsif site.lang == "en" %}
-		{% capture link2 %}{{ site.baseurl_root }}{{ page.url  }}{% endcapture %}
-		{% capture link3 %}{{ site.baseurl_root }}/es{{ page.url}}{% endcapture %}
-		<div align="right">
-			<a href="{{ link3 }}" >{% t global.spanish %}</a><span class="separator"> &bull; </span><a href="{{ link2 }}" >{% t global.italian %}</a>
-		</div>	
-	{% elsif site.lang == "es" %}
-		{% capture link2 %}{{ site.baseurl_root }}{{ page.url  }}{% endcapture %}
-		{% capture link1 %}{{ site.baseurl_root }}/en{{ page.url}}{% endcapture %}
-		<div align="right">
-			<a href="{{ link1 }}" >{% t global.english %}</a><span class="separator"> &bull; </span><a href="{{ link2 }}" >{% t global.italian %}</a>
-		</div>	
-
-	{% endif %}
+    <div align="right">
+      <!-- Adds links to other languages on the post -->
+      {% for lang in site.languages %}
+        {% unless site.lang == lang %}
+          {% if lang == site.default_lang %}
+            <a href="{{ site.baseurl_root }}{{ page.url }}" >{% t langs.{{ lang }} %}</a>
+          {% else %}
+            <a href="{{ site.baseurl_root }}/{{ lang }}{{ page.url }}" >{% t langs.{{ lang }} %}</a>
+          {% endif %}
+
+          {% assign next = forloop.index | plus: 1 %}
+
+          {% if forloop.last != true and site.languages[forloop.index] != site.lang or site.languages[forloop.index] == site.lang and next < forloop.length %}
+            <span class="separator"> &bull; </span>
+          {% endif %}
+
+        {% endunless %}
+      {% endfor %}
+    </div>
 
     <p>{% t pages.includeexample %}: <b>{{ include.param }}</b></p>
 

diff --git a/example/pagination/index.html b/example/pagination/index.html
@@ -20,25 +20,25 @@ <h1 id="title">{{ title }}</h1>
   </div>
 
   <div class="post">
-    {% if site.lang == "it" %}
-      {% capture link1 %}{{ site.baseurl_root }}/en{{ page.url}}{% endcapture %}
-      {% capture link3 %}{{ site.baseurl_root }}/es{{ page.url}}{% endcapture %}
-      <div align="right">
-        <a href="{{ link1 }}" >{% t global.english %}</a><span class="separator"> &bull; </span><a href="{{ link3 }}" >{% t global.spanish %}</a>
-      </div>  
-    {% elsif site.lang == "en" %}
-      {% capture link2 %}{{ site.baseurl_root }}{{ page.url }}{% endcapture %}
-      {% capture link3 %}{{ site.baseurl_root }}/es{{ page.url }}{% endcapture %}
-      <div align="right">
-        <a href="{{ link3 }}" >{% t global.spanish %}</a><span class="separator"> &bull; </span><a href="{{ link2 }}" >{% t global.italian %}</a>
-      </div>  
-    {% elsif site.lang == "es" %}
-      {% capture link2 %}{{ site.baseurl_root }}{{ page.url }}{% endcapture %}
-      {% capture link1 %}{{ site.baseurl_root }}/en{{ page.url }}{% endcapture %}
-      <div align="right">
-        <a href="{{ link1 }}" >{% t global.english %}</a><span class="separator"> &bull; </span><a href="{{ link2 }}" >{% t global.italian %}</a>
-      </div>
-    {% endif %}
+    <div align="right">
+      <!-- Adds links to other languages on the post -->
+      {% for lang in site.languages %}
+        {% unless site.lang == lang %}
+          {% if lang == site.default_lang %}
+            <a href="{{ site.baseurl_root }}{{ page.url }}" >{% t langs.{{ lang }} %}</a>
+          {% else %}
+            <a href="{{ site.baseurl_root }}/{{ lang }}{{ page.url }}" >{% t langs.{{ lang }} %}</a>
+          {% endif %}
+          
+          {% assign next = forloop.index | plus: 1 %}
+          
+          {% if forloop.last != true and site.languages[forloop.index] != site.lang or site.languages[forloop.index] == site.lang and next < forloop.length %}
+            <span class="separator"> &bull; </span>
+          {% endif %}
+          
+        {% endunless %}
+      {% endfor %}
+    </div>
 
     <!-- This loops through the paginated posts -->
     {% for post in paginator.posts %}

diff --git a/example/permalink.html b/example/permalink.html
@@ -25,28 +25,22 @@ <h1 id="title">{{ page.title }}</h1>
   </div>
 
   <div class="post">
-    {% if site.lang == "it" %}
-        {% capture link_en %}{{page.namespace}} en{% endcapture %}
-        {% capture link_es %}{{page.namespace}} es{% endcapture %}
-        <div align="right">
-            <a href="{% tl {{ link_en }} %}" >{% t global.english %}</a><span class="separator"> &bull; </span><a href="{% tl {{ link_es }} %}" >{% t global.spanish %}</a>
-        </div>
-    {% elsif site.lang == "en" %}
-        {% capture link_it %}{{page.namespace}} it{% endcapture %}
-        {% capture link_es %}{{page.namespace}} es{% endcapture %}
-        <div align="right">
-            <a href="{% tl {{ link_it }} %}" >{% t global.italian %}</a><span class="separator"> &bull; </span><a href="{% tl {{ link_es }} %}" >{% t global.spanish %}</a>
-        </div>
-    {% elsif site.lang == "es" %}
-        {% capture link_en %}{{page.namespace}} en{% endcapture %}
-        {% capture link_it %}{{page.namespace}} it{% endcapture %}
-        <div align="right">
-            <a href="{% tl {{ link_en }} %}" >{% t global.english %}</a><span class="separator"> &bull; </span><a href="{% tl {{ link_it }} %}" >{% t global.italian %}</a>
-        </div>
-    {% endif %}
-
-
-
+    <div align="right">
+      <!-- Adds links to other languages on the post -->
+      {% for lang in site.languages %}
+        {% unless site.lang == lang %}
+          <a href="{% tl {{ page.namespace }} {{ lang }} %}" >{% t langs.{{ lang }} %}</a>
+
+          {% assign next = forloop.index | plus: 1 %}
+
+          {% if forloop.last != true and site.languages[forloop.index] != site.lang or site.languages[forloop.index] == site.lang and next < forloop.length %}
+            <span class="separator"> &bull; </span>
+          {% endif %}
+
+        {% endunless %}
+      {% endfor %}
+    </div>
+
     {% tf permalink.md %}
   </div>
 </div>

diff --git a/lib/jekyll-multiple-languages-plugin.rb b/lib/jekyll-multiple-languages-plugin.rb
@@ -270,6 +270,8 @@ def render(context)
         key =            @key
       end
 
+      key = Liquid::Template.parse(key).render(context)  # Parses and renders some Liquid syntax on arguments (allows expansions)
+
       site = context.registers[:site] # Jekyll site object
 
       lang = site.config['lang']
@@ -313,6 +315,8 @@ def render(context)
           file =            @file
         end
 
+        file = Liquid::Template.parse(file).render(context)  # Parses and renders some Liquid syntax on arguments (allows expansions)
+
         site = context.registers[:site] # Jekyll site object
 
         includes_dir = File.join(site.source, '_i18n/' + site.config['lang'])
@@ -375,6 +379,8 @@ def render(context)
         key = @key
       end
 
+      key = Liquid::Template.parse(key).render(context)  # Parses and renders some Liquid syntax on arguments (allows expansions)
+
       site = context.registers[:site] # Jekyll site object
 
       key          = key.split

diff --git a/lib/plugin/version.rb b/lib/plugin/version.rb
@@ -1,6 +1,6 @@
 module Jekyll
   module MultipleLanguagesPlugin
-    VERSION = "1.4.2"
+    VERSION = "1.5.0"
   end
 end