feat: multi languages support traditional Chinese

onisimchukv · Nov 17, 2017 · aeace5e · aeace5e
1 parent 9095e93
commit aeace5e
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 17 deletions.
diff --git a/_config.dev.yml b/_config.dev.yml
@@ -28,7 +28,7 @@ nav_lists:
 # repository_tree: e.g. master
 
 ## Language & timezone ##
-lang: zh #the language of your site eg: zh, en
+lang: en #the language of your site, eg: en(English), zh(简体中文), zh-Hans(简体中文), zh-Hant(繁體中文)
 timezone: Asia/Shanghai
 
 ## Author & social ##

diff --git a/_config.yml b/_config.yml
@@ -27,7 +27,7 @@ nav_lists:
 # repository_tree: e.g. master
 
 ## Language & timezone ##
-lang: en #the language of your site eg: zh, en
+lang: en #the language of your site, eg: en(English), zh(简体中文), zh-Hans(简体中文), zh-Hant(繁體中文)
 timezone: Asia/Shanghai
 
 ## Author & social ##

diff --git a/_data/locale.yml b/_data/locale.yml
@@ -1,28 +1,42 @@
-LINKS:
+PAGES:
   HOME:
     en: Home
     zh: 主页
+    zh-Hans: 主页
+    zh-Hant: 主頁
   ALL:
     en: All
     zh: 归档
+    zh-Hans: 归档
+    zh-Hant: 歸檔
   RSS:
     en: RSS
     zh: RSS
+    zh-Hans: RSS
+    zh-Hant: RSS
 
 READMORE:
   en: Click to read more ...
   zh: 点我阅读更多...
+  zh-Hans: 点我阅读更多...
+  zh-Hant: 「點我閱讀更多」
 
 COPYRIGHT_DATES: 2015 - 2017
 
 LAST_UPDATED:
   en: 'Last updated'
   zh: '更新于'
+  zh-Hans: '更新于'
+  zh-Hant: '更新於'
 
 ARTICLE_DATE_FORMAT:
   en: '%b %d, %Y'
   zh: '%Y年 %m月%d日'
+  zh-Hans: '%Y年 %m月%d日'
+  zh-Hant: '%Y年 %m月%d日'
 
 ARTICLE_LIST_DATA_FORMAT:
   en: '%b %d'
   zh: '%m月%d日'
+  zh-Hans: '%m月%d日'
+  zh-Hant: '%m月%d日'
diff --git a/_includes/blog/header.html b/_includes/blog/header.html
@@ -7,16 +7,16 @@
     </div>
     <nav>
         <ul class="inline-list">
-            {% assign locale_link = site.data.locale.LINKS %}
+            {% assign locale_pages = site.data.locale.PAGES %}
             <li><a href="{{ "/" | prepend: site.baseurl | replace: '//', '/' }}">
-                {% if locale_link.HOME[site.lang] %}{{ locale_link.HOME[site.lang] }}{% else %}{{ locale_link.HOME.en }}{% endif %}</a></li>
+                {% if locale_pages.HOME[site.lang] %}{{ locale_pages.HOME[site.lang] }}{% else %}{{ locale_pages.HOME.en }}{% endif %}</a></li>
             <li><a href="{{ "/all.html" | prepend: site.baseurl | append: "?tag=" | replace: '//', '/'}}">
-                {% if locale_link.ALL[site.lang] %}{{ locale_link.ALL[site.lang] }}{% else %}{{ locale_link.ALL.en }}{% endif %}</a></li>
+                {% if locale_pages.ALL[site.lang] %}{{ locale_pages.ALL[site.lang] }}{% else %}{{ locale_pages.ALL.en }}{% endif %}</a></li>
             {% for list in site.nav_lists %}
                 <li><a href="{{ list.url }}"> {{ list.title }} </a></li>
             {% endfor %}
             <li><a type="application/rss+xml" href="{{ "/feed.xml" | prepend: site.baseurl | replace: '//', '/'}}">
-                {% if locale_link.RSS[site.lang] %}{{ locale_link.RSS[site.lang] }}{% else %}{{ locale_link.RSS.en }}{% endif %}</a></li>
+                {% if locale_pages.RSS[site.lang] %}{{ locale_pages.RSS[site.lang] }}{% else %}{{ locale_pages.RSS.en }}{% endif %}</a></li>
         </ul>
     </nav>
 </header>
diff --git a/_includes/common-head.html b/_includes/common-head.html
@@ -1,7 +1,9 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-<title>{% if page.title %}{{ page.title | truncatewords: 15 }} - {{ site.title }}{% else %}{{ site.title }}{% endif %}</title>
+<title>{% if page.title or page.titles[site.lang] or page.titles.en %}
+    {% if page.title %}{{ page.title }}{% elsif page.titles[site.lang] %}{{ page.titles[site.lang] }}{% else %}{{ page.titles.en }}{% endif %} - {{ site.title }}
+    {% else %}{{ site.title }}{% endif %}</title>
 <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
 <link rel="canonical" href="{% include snippets/page-url.html %}">
 <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{% include snippets/rss-url.html %}">
diff --git a/_layouts/all.html b/_layouts/all.html
@@ -1,10 +1,16 @@
 ---
 layout: blog-default
-title: All Posts
+titles:
+  en: All Pages
+  zh: 归档
+  zh-Hans: 归档
+  zh-Hant: 歸檔
 ---
 <div class="m-all">
     <div class="main">
-        <h1 class="js-page-heading">{{ page.title }}</h1>
+        <h1 class="js-page-heading">
+            {% if page.title %}{{ page.title }}{% elsif page.titles[site.lang] %}{{ page.titles[site.lang] }}{% else %}{{ page.titles.en }}{% endif %}
+        </h1>
         {% include blog/tags.html %}
         <!--group by year: http://stackoverflow.com/questions/19086284/jekyll-liquid-templating-how-to-group-blog-posts-by-year-->
         <section class="js-year-wrapper">
@@ -72,7 +78,8 @@ <h2 class="year-title" id="year-{{ post.date | date: "%Y" }}">{{ currentdate }}<
             var i = 0, flag = false, cur, tagStr = '',
                 tags = [], _tag = '', lis = [];
             if (tag === undefined || tag === '') {
-                $pageHeading.text('{{ page.title }}'); $tagShowAll.focus(); $postBlock.show();
+                $pageHeading.text('{% if page.title %}{{ page.title }}{% elsif page.titles[site.lang] %}{{ page.titles[site.lang] }}{% else %}{{ page.titles.en }}{% endif %}');
+                $tagShowAll.focus(); $postBlock.show();
             } else {
                 tag = tag.trim();
                 // $articleTag.filter('.tag-' + tag).focus();

diff --git a/_layouts/home.html b/_layouts/home.html
@@ -1,6 +1,10 @@
 ---
 layout: blog-default
-title: Blog
+titles:
+  en: Blog
+  zh: 博客
+  zh-Hans: 博客
+  zh-Hant: 博客
 ---
 <div class="m-home">
     <div class="main">

diff --git a/all.html b/all.html
@@ -1,4 +1,8 @@
 ---
 layout: all
-title: All Posts
+titles:
+  en: All Pages
+  zh: 归档
+  zh-Hans: 归档
+  zh-Hant: 歸檔
 ---
diff --git a/index.html b/index.html
@@ -1,4 +1,8 @@
 ---
 layout: home
-title: Blog
+titles:
+  en: Blog
+  zh: 博客
+  zh-Hans: 博客
+  zh-Hant: 博客
 ---
diff --git a/test/_config.yml b/test/_config.yml
@@ -31,7 +31,7 @@ nav_lists:
 # repository_tree: e.g. master
 
 ## Language & timezone ##
-lang: en #the language of your site eg: zh, en
+lang: en #the language of your site, eg: en(English), zh(简体中文), zh-Hans(简体中文), zh-Hant(繁體中文)
 timezone: Asia/Shanghai
 
 ## Author & social ##

diff --git a/test/all.html b/test/all.html
@@ -1,4 +1,8 @@
 ---
 layout: all
-title: All Posts
+titles:
+  en: All Pages
+  zh: 归档
+  zh-Hans: 归档
+  zh-Hant: 歸檔
 ---
diff --git a/test/index.html b/test/index.html
@@ -1,4 +1,8 @@
 ---
 layout: home
-title: Blog
+titles:
+  en: Blog
+  zh: 博客
+  zh-Hans: 博客
+  zh-Hant: 博客
 ---