Merge branch 'master' into i18n-support

eleven-labs · Oct 28, 2017 · 9a1bfbc · 9a1bfbc
2 parents bac51f5 + 5f5f149
commit 9a1bfbc
Show file tree

Hide file tree

Showing 14 changed files with 457 additions and 27 deletions.
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem 'rouge', '1.11.1'
 gem 'jekyll-feed', '0.9.2'
 gem 'scss_lint', require: false
 gem 'elevenlabs-amp-jekyll', '1.1'
-gem 'jekyll-multiple-languages-plugin', '1.5.1'
+gem 'jekyll-multiple-languages-plugin', :git => "git://github.com/eko/jekyll-multiple-languages-plugin.git"
 
 group :test do
   gem 'rake'

diff --git a/Rakefile b/Rakefile
@@ -26,7 +26,8 @@ end
 # push to algolia
 task :algolia_push do
   if ENV['TRAVIS_BRANCH'] == 'master' && ENV['TRAVIS_PULL_REQUEST'] == "false"
-    jekyll('algolia push')
+    sh 'sed'
+    jekyll('algolia push --config _config.yml,_algolia.yml')
   end
 end
 

diff --git a/_algolia.yml b/_algolia.yml
@@ -0,0 +1,11 @@
+# ALGOLIA
+algolia:
+    application_id: '5IGTHBX5JS'
+    index_name:     'blog_eleven'
+    excluded_files:
+        - amp
+
+# LANGUAGE-SPECIFIC: Trick to do not index multiple times for each language
+default_lang: fr
+languages: ["fr"]
+exclude_from_localizations: ["authors", "css", "fonts", "img", "js", "_posts"]
diff --git a/_config.yml b/_config.yml
@@ -71,13 +71,6 @@ theme_settings:
 paginate: 10
 paginate_path: "/blog/page:num"
 
-# ALGOLIA
-algolia:
-    application_id: '5IGTHBX5JS'
-    index_name:     'blog_eleven'
-    excluded_files:
-        - amp
-
 exclude: [vendor, _authors/TEMPLATE-AUTOR]
 
 # BUILD SETTINGS

diff --git a/_i18n/en.yml b/_i18n/en.yml
@@ -7,4 +7,10 @@ global:
   prev: Previous
   continue_reading: Read article
   newsletter_subscribe: Subscribe to our newsletter!
-  search_input: Search
+  search_input: Search
+authors:
+  by: by
+  and: and
+  from_same_author: "From the same author:"
+reading:
+  time: "Reading time:"
diff --git a/_i18n/fr.yml b/_i18n/fr.yml
@@ -7,4 +7,10 @@ global:
   prev: Précédent
   continue_reading: Lire l'article
   newsletter_subscribe: Abonnez-vous à notre newsletter !
-  search_input: Rechercher
+  search_input: Rechercher
+authors:
+  by: par
+  and: et
+  from_same_author: "Du même auteur :"
+reading:
+  time: "Lecture :"
diff --git a/_includes/author_link.html b/_includes/author_link.html
@@ -1,5 +1,5 @@
 <!-- _includes/author_link.html -->
-- par
+- {% translate authors.by %}
 
 {% for author in include.authors %}
   {% assign isFirstAuthor = forloop.first %}
@@ -9,11 +9,11 @@
     {% if existingAuthor.login == author %}
       {% if isFirstAuthor %}
       {% elsif isLastAuthor %}
-         et
+      {% translate authors.and %}
       {% else %}
          ,
       {% endif %}
-      <a class="author-link" href="{{ '/authors/:author' | prepend: site.baseurl_root | replace: '//', '/' | replace: ':author', author }}">{{ existingAuthor.title }}</a>
+      <a class="author-link" href="{{ '/authors/:author' | prepend: site.baseurl | replace: '//', '/' | replace: ':author', author }}">{{ existingAuthor.title }}</a>
     {% endif %}
   {% endfor %}
 {% endfor %}
diff --git a/_includes/header.html b/_includes/header.html
@@ -18,8 +18,8 @@ <h1 class="site-title visually-hidden">
                         {% assign link = language %}
                     {% endif %}
                     <li>
-                        <a class="page-link no-link-style" href="/{{ link }}">
-                            <img src="/img/flags/{{ language }}.png" alt="{{ language }}" title="{{ language }}" />
+                        <a class="page-link no-link-style" href="{{ site.baseurl_root }}/{{ link }}">
+                            <img src="{{ site.baseurl_root }}/img/flags/{{ language }}.png" alt="{{ language }}" title="{{ language }}" />
                         </a>
                     </li>
                 {% endif %}

diff --git a/_includes/reading_time.html b/_includes/reading_time.html
@@ -1,8 +1,8 @@
 <span class="reading-time" title="Estimated read time">
   {% assign words = include.content | number_of_words %}
   {% if words < 360 %}
-    lecture: 1 min
+    {% translate reading.time %} 1 min
   {% else %}
-    lecture: {{ words | divided_by:180 }} mins
+    {% translate reading.time %} {{ words | divided_by:180 }} mins
   {% endif %}
 </span>
diff --git a/_layouts/author.html b/_layouts/author.html
@@ -22,7 +22,7 @@ <h1 class="page-heading-title">{{ page.title }}</h1>
 
     <section class="slice">
         <div class="read-also container">
-            <h3 class="read-also-title">Du même auteur :</h3>
+            <h3 class="read-also-title">{% translate authors.from_same_author %}</h3>
             <ul class="posts read-also-list">
                 {% for post in site.posts %}
                 {% if post.authors contains page.login %}

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js">
+<html class="no-js" lang="{{ site.lang }}">
     <script type="text/javascript">
         window.site = {
             lang: '{{ site.lang }}',