Support the latest Jekyll

pgroonga · May 31, 2016 · 18d7b62 · 18d7b62
1 parent 4172268
commit 18d7b62
Show file tree

Hide file tree

Showing 142 changed files with 37 additions and 219 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,6 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
     activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
@@ -15,20 +14,19 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     colorator (0.1)
-    ethon (0.8.1)
+    ethon (0.9.0)
       ffi (>= 1.3.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
     gemoji (2.1.0)
     gettext (3.2.2)
       locale (>= 2.0.5)
       text (>= 1.3.0)
-    github-pages (75)
-      RedCloth (= 4.2.9)
+    github-pages (80)
       github-pages-health-check (= 1.1.0)
-      jekyll (= 3.0.4)
+      jekyll (= 3.1.6)
       jekyll-coffeescript (= 1.0.1)
       jekyll-feed (= 0.5.1)
       jekyll-gist (= 1.4.0)
@@ -37,16 +35,13 @@ GEM
       jekyll-paginate (= 1.1.0)
       jekyll-redirect-from (= 0.10.0)
       jekyll-sass-converter (= 1.3.0)
-      jekyll-seo-tag (= 1.3.3)
+      jekyll-seo-tag (= 1.4.0)
       jekyll-sitemap (= 0.10.0)
-      jekyll-textile-converter (= 0.1.0)
       jemoji (= 0.6.2)
       kramdown (= 1.10.0)
       liquid (= 3.0.6)
       listen (= 3.0.6)
       mercenary (~> 0.3)
-      rdiscount (= 2.1.8)
-      redcarpet (= 3.3.3)
       rouge (= 1.10.1)
       terminal-table (~> 1.4)
     github-pages-health-check (1.1.0)
@@ -55,11 +50,11 @@ GEM
       octokit (~> 4.0)
       public_suffix (~> 1.4)
       typhoeus (~> 0.7)
-    html-pipeline (2.4.0)
+    html-pipeline (2.4.1)
       activesupport (>= 2, < 5)
       nokogiri (>= 1.4)
     i18n (0.7.0)
-    jekyll (3.0.4)
+    jekyll (3.1.6)
       colorator (~> 0.1)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
@@ -83,16 +78,14 @@ GEM
       jekyll (>= 2.0)
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
-    jekyll-seo-tag (1.3.3)
+    jekyll-seo-tag (1.4.0)
       jekyll (~> 3.0)
     jekyll-sitemap (0.10.0)
     jekyll-task-i18n (1.0.2)
       gettext (>= 3.1.1)
       yard
-    jekyll-textile-converter (0.1.0)
-      RedCloth (~> 4.0)
-    jekyll-watch (1.3.1)
-      listen (~> 3.0)
+    jekyll-watch (1.4.0)
+      listen (~> 3.0, < 3.1)
     jemoji (0.6.2)
       gemoji (~> 2.0)
       html-pipeline (~> 2.2)
@@ -106,7 +99,7 @@ GEM
     locale (2.1.2)
     mercenary (0.3.6)
     mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    minitest (5.9.0)
     multipart-post (2.0.0)
     net-dns (0.8.0)
     nokogiri (1.6.7.2)
@@ -118,8 +111,6 @@ GEM
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rdiscount (2.1.8)
-    redcarpet (3.3.3)
     rouge (1.10.1)
     safe_yaml (1.0.4)
     sass (3.4.22)
@@ -147,4 +138,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.11.2
+   1.12.4
diff --git a/_config.yml b/_config.yml
@@ -18,3 +18,19 @@ kramdown:
 
 sass:
   sass_dir: assets/stylesheets
+
+defaults:
+  - scope:
+      path: "ja"
+    values:
+      path_prefix: /ja/
+      layout: "base"
+      language: ja
+      country: JP
+  - scope:
+      path: ""
+    values:
+      path_prefix: /
+      layout: "base"
+      language: en
+      country: US
diff --git a/_layouts/en.html b/_layouts/en.html
diff --git a/_layouts/ja.html b/_layouts/ja.html
diff --git a/_po/ja/community/index.po b/_po/ja/community/index.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: Community\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: コミュニティー\n"
-"layout: ja\n"
 "---"
 
 msgid "# Community"

diff --git a/_po/ja/how-to/index.po b/_po/ja/how-to/index.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: How to\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: ハウツー\n"
-"layout: ja\n"
 "---"
 
 msgid "# How to"

diff --git a/_po/ja/how-to/travis-ci.po b/_po/ja/how-to/travis-ci.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: How to use PGroonga on Travis CI\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: Travis CI上でPGroongaを使う方法\n"
-"layout: ja\n"
 "---"
 
 msgid "# How to use PGroonga on Travis CI"

diff --git a/_po/ja/index.po b/_po/ja/index.po
@@ -10,11 +10,9 @@ msgstr ""
 
 msgid ""
 "---\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
-"layout: ja\n"
 "---"
 
 msgid ""

diff --git a/_po/ja/install/centos.po b/_po/ja/install/centos.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: Install on CentOS\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: CentOSにインストール\n"
-"layout: ja\n"
 "---"
 
 msgid "# Install on CnetOS"

diff --git a/_po/ja/install/debian.po b/_po/ja/install/debian.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: Install on Debian GNU/Linux\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: Debian GNU/Linuxにインストール\n"
-"layout: ja\n"
 "---"
 
 msgid "# Install on Debian GNU/Linux"

diff --git a/_po/ja/install/index.po b/_po/ja/install/index.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: Install\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: インストール\n"
-"layout: ja\n"
 "---"
 
 msgid "# Install"

diff --git a/_po/ja/install/os-x.po b/_po/ja/install/os-x.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: Install on OS X\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: OS Xにインストール\n"
-"layout: ja\n"
 "---"
 
 msgid "# Install on OS X"

diff --git a/_po/ja/install/source.po b/_po/ja/install/source.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: Install from source\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: ソースからインストール\n"
-"layout: ja\n"
 "---"
 
 msgid "# Install from source"

diff --git a/_po/ja/install/ubuntu.po b/_po/ja/install/ubuntu.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: Install on Ubuntu\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: Ubuntuにインストール\n"
-"layout: ja\n"
 "---"
 
 msgid "# Install on Ubuntu"

diff --git a/_po/ja/install/windows.po b/_po/ja/install/windows.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: Install on Windows\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: Windowsにインストール\n"
-"layout: ja\n"
 "---"
 
 msgid "# Install on Windows"

diff --git a/_po/ja/news/index.po b/_po/ja/news/index.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: News\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: おしらせ\n"
-"layout: ja\n"
 "---"
 
 msgid "# News"

diff --git a/_po/ja/overview/index.po b/_po/ja/overview/index.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: Overview\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: 概要\n"
-"layout: ja\n"
 "---"
 
 msgid "# Overview"

diff --git a/_po/ja/reference/create-index-using-pgroonga.po b/_po/ja/reference/create-index-using-pgroonga.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: CREATE INDEX USING pgroonga\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: CREATE INDEX USING pgroonga\n"
-"layout: ja\n"
 "---"
 
 msgid "# `CREATE INDEX USING pgroonga`"

diff --git a/_po/ja/reference/functions/pgroonga-command.po b/_po/ja/reference/functions/pgroonga-command.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: pgroonga.command function\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: pgroonga.command関数\n"
-"layout: ja\n"
 "---"
 
 msgid "# `pgroonga.command` function"

diff --git a/_po/ja/reference/functions/pgroonga-highlight-html.po b/_po/ja/reference/functions/pgroonga-highlight-html.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: pgroonga.highlight_html function\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: pgroonga.highlight_html関数\n"
-"layout: ja\n"
 "---"
 
 msgid "# `pgroonga.highlight_html` function"

diff --git a/_po/ja/reference/functions/pgroonga-match-positions-byte.po b/_po/ja/reference/functions/pgroonga-match-positions-byte.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: pgroonga.match_positions_byte function\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: pgroonga.match_positions_byte関数\n"
-"layout: ja\n"
 "---"
 
 msgid "# `pgroonga.match_positions_byte` function"

diff --git a/_po/ja/reference/functions/pgroonga-query-extract-keywords.po b/_po/ja/reference/functions/pgroonga-query-extract-keywords.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: pgroonga.query_extract_keywords function\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: pgroonga.query_extract_keywords関数\n"
-"layout: ja\n"
 "---"
 
 msgid "# `pgroonga.query_extract_keywords` function"

diff --git a/_po/ja/reference/functions/pgroonga-score.po b/_po/ja/reference/functions/pgroonga-score.po
@@ -11,12 +11,10 @@ msgstr ""
 msgid ""
 "---\n"
 "title: pgroonga.score function\n"
-"layout: en\n"
 "---"
 msgstr ""
 "---\n"
 "title: pgroonga.score関数\n"
-"layout: ja\n"
 "---"
 
 msgid "# `pgroonga.score` function"