academic 0.4.91 → 0.4.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f4a5f81f61135f7aab2420ceb33ded3446a8769
-  data.tar.gz: 4960a9e401050df0dd4b882257ffeba139811c59
+  metadata.gz: cc185ceb3b22e2275d99f9ba01277394376041e4
+  data.tar.gz: 7753f8175b8d6373c42c82480d406f8197bd9529
 SHA512:
-  metadata.gz: 8f5d52d47a7d378f7d2da61cd85c1fedd210c21e08fa2609c84ace241a09b1d3ef38c2cafcd7fb604c0c12543a5acbe5583c051fdf9f8208ac869b7b2d5be49b
-  data.tar.gz: 710480c7f084801d7776415a49d3b974769290839c0d448ee21324bc1f64aac09d8475b8f80dc4740a23f3767e5fac6b485aa92461dab77360081113be6252a0
+  metadata.gz: 62f103b8d96b13a452579b7eb0b9f9950c95007bf1b9be484da12ee07e9619e5b7a9a1fa2f6fe82ff84a013340e4060317eb4cd86fe83fe0379e9052d9c7c63e
+  data.tar.gz: f3503f67d6ca4a81fc40efa09d1ddeee6fd85a706524db9d9113c0e4066eba717b49165b15fd29b1631e4314a79c4c391ef74381bf5ae4bf633a177bb8dbf552

data/_includes/calltoaction.html

@@ -1,19 +1,20 @@
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
 <div class="colored-block">
   {% assign cta = site.data.academic_i18n.cta %}
   {% if page.layout == "home" or page.layout == "archive" %}
-    {{ cta.like[page.lang] | escape }}
+    {{ cta.like[plang] | escape }}
   {% else if page.layout == "post" %}
-    {{ cta.post[page.lang] | escape }}
+    {{ cta.post[plang] | escape }}
   {% else %}
   {% endif %}
 
-  {{ cta.rss[page.lang][0] }}
-  <a href="/feed.xml">{{ cta.rss[page.lang][1]}}</a>
-  {{ cat.rss[page.lang][2]}}
+  {{ cta.rss[plang][0] }}
+  <a href="/feed.xml">{{ cta.rss[plang][1]}}</a>
+  {{ cat.rss[plang][2]}}
 
   {% if site.twitter_username %}
-    {{ cta.twitter[page.lang][0] }}
+    {{ cta.twitter[plang][0] }}
     <a href="https://twitter.com/{{ site.twitter_username }}">@{{ site.twitter_username }}</a>
-    {{ cta.twitter[page.lang][1] }}
+    {{ cta.twitter[plang][1] }}
   {% endif %}.
 </div>

data/_includes/contactlist.html

@@ -1,5 +1,6 @@
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
 <span class="contact-list-title">
-  {{ site.data.academic_i18n.links[page.lang] }}
+  {{ site.data.academic_i18n.links[plang] }}
 </span>
 <ul class="contact-list {{ include.class }}">
   <li>

data/_includes/date.html

@@ -1,10 +1,11 @@
-{% if page.lang != "en" %}
-  {% assign dateformat = site.data.academic_i18n.dateformat[page.lang] %}
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
+{% if plang != "en" %}
+  {% assign dateformat = site.data.academic_i18n.dateformat[plang] %}
   {% assign date = include.date | date: dateformat %}
   {% assign eng_month = include.date | date: "%B" %}
   {% assign num_month = include.date | date: "%m" | minus: 1 %}
 
-  {{ date | replace:eng_month, site.data.academic_i18n.months[page.lang][num_month] }}
+  {{ date | replace:eng_month, site.data.academic_i18n.months[plang][num_month] }}
 {% else %}
-  {{ include.date | date: site.data.academic_i18n.dateformat[page.lang] }}
+  {{ include.date | date: site.data.academic_i18n.dateformat[plang] }}
 {% endif %}

data/_includes/footer.html

@@ -1,3 +1,4 @@
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
 {% assign i18n = site.data.academic_i18n %}
 <footer class="site-footer">
 
@@ -9,7 +10,7 @@
 
         {% if site.author_display %}
         <span class="author">
-          {{ i18n.by[page.lang] }}
+          {{ i18n.by[plang] }}
           {% if site.author_website %}
           <a target="_blank" href="{{ site.author_website }}">{{ site.author }}</a>
           {% else %}
@@ -55,11 +56,11 @@
       {% assign newest = site.time | date: "%Y" %}
       ({% if oldest != newest %}{{ oldest }}-{% endif %}{{ newest }})
       {% if site.author and site.author_display %}
-        {{ i18n.legal[page.lang][0] }}
+        {{ i18n.legal[plang][0] }}
         <a target="_blank" href="{{ site.author_website }}">{{ site.author }}</a> 
       {% endif %}
       {% if site.cc %}
-        {{ i18n.legal[page.lang][1] }}
+        {{ i18n.legal[plang][1] }}
         <a target="_blank" rel="license" href="https://creativecommons.org/licenses/{{ site.cc }}/4.0/" class="cc-licence">
           CC {{ site.cc }}
         </a>

data/_includes/head.html

@@ -1,3 +1,4 @@
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -19,7 +20,7 @@
   {% endif %}
 
   {% for t_lang in site.langs %}
-    {% unless t_lang == page.lang %}
+    {% unless t_lang == plang %}
       {% assign t = i18n_posts | where:"lang",t_lang | first %}
 
       {% if t %}

data/_includes/i18n.html

@@ -1,7 +1,8 @@
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
 {% assign val = include.value %}
 
-{% if val[page.lang] %}
-  {% assign v = val[page.lang] %}
+{% if val[plang] %}
+  {% assign v = val[plang] %}
 {% else %}
   {% assign v = val %}
 {% endif %}

data/_includes/icon-rss.html

@@ -1,6 +1,7 @@
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
 <a href="/feed.xml" title="RSS"><span class="icon icon--feed">{% include icon-rss.svg %}</span>
   <span class="username">
-    {{ site.data.academic_i18n.feed[page.lang] }}
+    {{ site.data.academic_i18n.feed[plang] }}
   </span>
 </a>
 

data/_includes/lang_selector.html

@@ -1,3 +1,4 @@
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
 {% assign pagename = page.path | split:"." | first %}
 {% assign versions = site.data.academic_i18n.versions %}
 {% assign no_versions = site.data.academic_i18n.no_versions %}
@@ -10,16 +11,16 @@
 
 <ul class="lang-selector">
   <span class="lang-intro">
-    {{ site.data.academic_i18n.langs_avail[page.lang] }}
+    {{ site.data.academic_i18n.langs_avail[plang] }}
   </span>
   <li class="lang">
-    <a href="{{ page.url }}" title="{{ versions[page.lang] }} {{ page.title }}">
-      {{ page.lang }}
+    <a href="{{ page.url }}" title="{{ versions[plang] }} {{ page.title }}">
+      {{ plang }}
     </a>
   </li>
 
 {% for t_lang in site.langs %}
-  {% unless t_lang == page.lang %}
+  {% unless t_lang == plang %}
     {% assign t = i18n_posts | where:"lang",t_lang | first %}
     <li class="lang">
     {% if t %}

data/_includes/link.html

@@ -1,2 +1,3 @@
-{% assign object = site.pages | where_exp:"p","p.path contains include.path" | where:"lang",page.lang | first %}
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
+{% assign object = site.pages | where_exp:"p","p.path contains include.path" | where:"lang",plang | first %}
 {{ object.url }}

data/_includes/nav_menu.html

@@ -1,4 +1,5 @@
-<span class="nav-list-title">{{ site.data.academic_i18n.menu[page.lang] }}</span>
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
+<span class="nav-list-title">{{ site.data.academic_i18n.menu[plang] }}</span>
 <ul class="nav-list {{ include.class }}">
 {% for link in site.nav_ext_links %}
   {% if link.url and link.name %}
@@ -8,7 +9,7 @@
   {% endif %}
 {% endfor %}
 
-{% assign pages = site.pages | where:"lang",page.lang %}
+{% assign pages = site.pages | where:"lang",plang %}
 
 {% for my_page in pages %}
 {% unless my_page.invisible %}

data/_includes/post-ul.html

@@ -1,3 +1,4 @@
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
 {% if include.limit %}
   {% assign limit = site.nb_posts_page %}
 {% else %}
@@ -5,7 +6,7 @@
 {% endif %}
 
 <ul class="post-list">
-  {% assign posts = site.posts | where:"lang",page.lang %}
+  {% assign posts = site.posts | where:"lang",plang %}
   {% for post in posts limit:limit %}
     {% include post-li.html %}
   {% endfor %}

data/_layouts/archive.html

@@ -2,9 +2,10 @@
 layout: default
 ---
 
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
 <div class="home">
   <div class="colored-block">
-    {{ site.data.academic_i18n.archive[page.lang] }}
+    {{ site.data.academic_i18n.archive[plang] }}
   </div>
 
   {{ content }}

data/_layouts/home.html

@@ -2,6 +2,7 @@
 layout: default
 ---
 
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
 {% if site.pitch == null %}
   {% assign div_class = "home" %}
 {% else %}
@@ -23,8 +24,8 @@ layout: default
 
   {% if nb_posts > site.nb_posts_page %}
   <div class="archive">
-    {{ site.data.academic_i18n.all_posts[page.lang][0] }}
-    <a href="{% include link.html path="archive" %}">{{ site.data.academic_i18n.all_posts[page.lang][1] }}</a>.</div>
+    {{ site.data.academic_i18n.all_posts[plang][0] }}
+    <a href="{% include link.html path="archive" %}">{{ site.data.academic_i18n.all_posts[plang][1] }}</a>.</div>
   {% endif %}
 
 </div>

data/_layouts/pagenotfound.html

@@ -2,9 +2,10 @@
 layout: default
 ---
 
+{% assign plang = page.lang | default: site.langs[0] | default: "en" %}
 <div class="msg-404">
   <div class="title">404</div>
-  <div class="description">{{ site.data.academic_i18n.notfound[page.lang] }}</div>
+  <div class="description">{{ site.data.academic_i18n.notfound[plang] }}</div>
 </div>
 
 {{ page.content }}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: academic
 version: !ruby/object:Gem::Version
-  version: 0.4.91
+  version: 0.4.92
 platform: ruby
 authors:
 - gaalcaras
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: jekyll-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement