From c758847714cf2a80461cbe8ffacb8f8d4749a713 Mon Sep 17 00:00:00 2001
From: "Ivan.Nginx" <ivan.nginx@gmail.com>
Date: Mon, 14 May 2018 09:41:21 +0300
Subject: [PATCH] Added custom language support feature. (#253)

* Added custom language support feature.

* Fix `hexo` variables in linter by adding `global hexo` comment.

* Check Stickler CI.

* Error: lines-around-comment

* Fix error: lines-around-comment
---
 layout/_layout.swig                      |  6 ++++
 layout/_macro/post-copyright.swig        |  2 +-
 layout/_macro/post.swig                  |  9 ++++--
 layout/_macro/reward.swig                |  6 ++--
 layout/_macro/sidebar.swig               |  6 ++--
 layout/_macro/wechat-subscriber.swig     |  2 +-
 layout/_partials/footer.swig             |  2 +-
 layout/_partials/head/head-unique.swig   |  2 +-
 layout/_partials/header/brand.swig       | 10 ++++---
 layout/_partials/header/index.swig       |  1 -
 layout/_third-party/comments/disqus.swig |  5 +++-
 layout/archive.swig                      |  2 +-
 layout/category.swig                     |  2 +-
 layout/index.swig                        |  2 +-
 layout/page.swig                         |  2 +-
 layout/post.swig                         |  2 +-
 layout/schedule.swig                     |  2 +-
 layout/tag.swig                          |  2 +-
 scripts/merge-configs.js                 | 36 ++++++++++++++++++------
 19 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index 709e0f40dd..23019f2fab 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -3,6 +3,12 @@
 {# NexT version #}
 {% set version = next_env('version') %}
 
+{# Language & Config #}
+{% set title = __('title') !== 'title' && __('title') || config.title %}
+{% set subtitle = __('subtitle') !== 'subtitle' && __('subtitle') || config.subtitle %}
+{% set author = __('author') !== 'author' && __('author') || config.author %}
+{% set description = __('description') !== 'description' && __('description') || config.description %}
+
 {% set html_class = 'theme-next ' + theme.scheme %}
 {% if theme.motion.enable %}
   {% set html_class = html_class + ' use-motion' %}
diff --git a/layout/_macro/post-copyright.swig b/layout/_macro/post-copyright.swig
index 4d79832802..50ce4a2a10 100644
--- a/layout/_macro/post-copyright.swig
+++ b/layout/_macro/post-copyright.swig
@@ -1,7 +1,7 @@
 <ul class="post-copyright">
   <li class="post-copyright-author">
     <strong>{{ __('post.copyright.author') + __('symbol.colon') }} </strong>{#
-  #}{{ post.author | default(config.author) }}{#
+  #}{{ post.author | default(author) }}{#
 #}</li>
   <li class="post-copyright-link">
     <strong>{{ __('post.copyright.link') + __('symbol.colon') }}</strong>
diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index 90ba063e57..3a1190f59d 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -22,13 +22,13 @@
     <link itemprop="mainEntityOfPage" href="{{ config.url }}{{ url_for(post.path) }}">
 
     <span hidden itemprop="author" itemscope itemtype="http://schema.org/Person">
-      <meta itemprop="name" content="{{ theme.author }}">
-      <meta itemprop="description" content="{{ theme.signature }}">
+      <meta itemprop="name" content="{{ author }}">
+      <meta itemprop="description" content="{{ description }}">
       <meta itemprop="image" content="{{ url_for( theme.avatar.url | default(theme.images + '/avatar.gif') ) }}">
     </span>
 
     <span hidden itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
-      <meta itemprop="name" content="{{ config.title }}">
+      <meta itemprop="name" content="{{ title }}">
     </span>
 
     {% if not headlessPost %}
@@ -166,6 +166,9 @@
                   <i class="fa fa-comment-o"></i>
                 </span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
+                {% if __('disqus') !== 'disqus' -%}
+                  <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span>
+                {% endif %}
                   <span class="post-comments-count disqus-comment-count"
                         data-disqus-identifier="{{ post.path }}" itemprop="commentCount"></span>
                 </a>
diff --git a/layout/_macro/reward.swig b/layout/_macro/reward.swig
index 1a8135a7be..04c75e250d 100644
--- a/layout/_macro/reward.swig
+++ b/layout/_macro/reward.swig
@@ -7,21 +7,21 @@
 
     {% if theme.wechatpay %}
       <div id="wechat" style="display: inline-block">
-        <img id="wechat_qr" src="{{ url_for(theme.wechatpay) }}" alt="{{ theme.author }} {{ __('reward.wechatpay') }}"/>
+        <img id="wechat_qr" src="{{ url_for(theme.wechatpay) }}" alt="{{ author }} {{ __('reward.wechatpay') }}"/>
         <p>{{ __('reward.wechatpay') }}</p>
       </div>
     {% endif %}
 
     {% if theme.alipay %}
       <div id="alipay" style="display: inline-block">
-        <img id="alipay_qr" src="{{ url_for(theme.alipay) }}" alt="{{ theme.author }} {{ __('reward.alipay') }}"/>
+        <img id="alipay_qr" src="{{ url_for(theme.alipay) }}" alt="{{ author }} {{ __('reward.alipay') }}"/>
         <p>{{ __('reward.alipay') }}</p>
       </div>
     {% endif %}
 
     {% if theme.bitcoin %}
       <div id="bitcoin" style="display: inline-block">
-        <img id="bitcoin_qr" src="{{ url_for(theme.bitcoin) }}" alt="{{ theme.author }} {{ __('reward.bitcoin') }}"/>
+        <img id="bitcoin_qr" src="{{ url_for(theme.bitcoin) }}" alt="{{ author }} {{ __('reward.bitcoin') }}"/>
         <p>{{ __('reward.bitcoin') }}</p>
       </div>
     {% endif %}
diff --git a/layout/_macro/sidebar.swig b/layout/_macro/sidebar.swig
index d32a3c4aa9..b71be435a2 100644
--- a/layout/_macro/sidebar.swig
+++ b/layout/_macro/sidebar.swig
@@ -32,11 +32,11 @@
             {% if theme.avatar.url %}
               <img class="site-author-image" itemprop="image"
                 src="{{ url_for( theme.avatar.url | default(theme.images + '/avatar.gif') ) }}"
-                alt="{{ theme.author }}" />
+                alt="{{ author }}" />
             {% endif %}
-              <p class="site-author-name" itemprop="name">{{ theme.author }}</p>
+              <p class="site-author-name" itemprop="name">{{ author }}</p>
               <p class="site-description motion-element" itemprop="description">{#
-              #}{{ theme.description }}{#
+              #}{{ description }}{#
             #}</p>
           </div>
 
diff --git a/layout/_macro/wechat-subscriber.swig b/layout/_macro/wechat-subscriber.swig
index e0bc5e5a15..aa0fdbc84c 100644
--- a/layout/_macro/wechat-subscriber.swig
+++ b/layout/_macro/wechat-subscriber.swig
@@ -1,4 +1,4 @@
 <div id="wechat_subscriber" style="display: block; padding: 10px 0; margin: 20px auto; width: 100%; text-align: center">
-    <img id="wechat_subscriber_qcode" src="{{ url_for(theme.wechat_subscriber.qcode) }}" alt="{{ theme.author }} wechat" style="width: 200px; max-width: 100%;"/>
+    <img id="wechat_subscriber_qcode" src="{{ url_for(theme.wechat_subscriber.qcode) }}" alt="{{ author }} wechat" style="width: 200px; max-width: 100%;"/>
     <div>{{ theme.wechat_subscriber.description }}</div>
 </div>
diff --git a/layout/_partials/footer.swig b/layout/_partials/footer.swig
index 53e963a0e6..a0ec48ea9e 100644
--- a/layout/_partials/footer.swig
+++ b/layout/_partials/footer.swig
@@ -5,7 +5,7 @@
   <span class="with-love" id="animate">
     <i class="fa fa-{{ theme.footer.icon.name }}"></i>
   </span>
-  <span class="author" itemprop="copyrightHolder">{{ theme.footer.copyright || config.author }}</span>
+  <span class="author" itemprop="copyrightHolder">{{ theme.footer.copyright | default(author) }}</span>
 
   {% if config.symbols_count_time.total_symbols %}
     <span class="post-meta-divider">|</span>
diff --git a/layout/_partials/head/head-unique.swig b/layout/_partials/head/head-unique.swig
index 48cfb47fe0..9c1a14828c 100644
--- a/layout/_partials/head/head-unique.swig
+++ b/layout/_partials/head/head-unique.swig
@@ -11,7 +11,7 @@
   {% set theme.rss = config.feed.path %}
 {% endif %}
 {% if theme.rss %}
-  <link rel="alternate" href="{{ url_for(theme.rss) }}" title="{{ config.title }}" type="application/atom+xml" />
+  <link rel="alternate" href="{{ url_for(theme.rss) }}" title="{{ title }}" type="application/atom+xml" />
 {% endif %}
 
 {# Canonical, good for google search engine (SEO) : https://support.google.com/webmasters/answer/139066 #}
diff --git a/layout/_partials/header/brand.swig b/layout/_partials/header/brand.swig
index d6ac66541f..3b81f16ded 100644
--- a/layout/_partials/header/brand.swig
+++ b/layout/_partials/header/brand.swig
@@ -4,7 +4,7 @@
       <div class="site-meta-headline">
         <a>
           <img class="custom-logo-image" src="{{ theme.custom_logo.image }}"
-               alt="{{ config.title }}"/>
+               alt="{{ title }}"/>
         </a>
       </div>
     {% endif %}
@@ -12,15 +12,17 @@
     <div class="custom-logo-site-title">
       <a href="{{ config.root }}" class="brand" rel="start">
         <span class="logo-line-before"><i></i></span>
-        <span class="site-title">{{ config.title }}</span>
+        <span class="site-title">{{ title }}</span>
         <span class="logo-line-after"><i></i></span>
       </a>
     </div>
+    {% if subtitle %}
       {% if theme.seo %}
-        <h1 class="site-subtitle" itemprop="description">{{ config.subtitle }}</h1>
+        <h1 class="site-subtitle" itemprop="description">{{ subtitle }}</h1>
       {% else %}
-        <p class="site-subtitle">{{ config.subtitle }}</p>
+        <p class="site-subtitle">{{ subtitle }}</p>
       {% endif %}
+    {% endif %}
   </div>
 
   <div class="site-nav-toggle">
diff --git a/layout/_partials/header/index.swig b/layout/_partials/header/index.swig
index 08ba179169..42a90de29f 100644
--- a/layout/_partials/header/index.swig
+++ b/layout/_partials/header/index.swig
@@ -1,5 +1,4 @@
 {{ partial('_partials/header/brand.swig', {}, {cache: theme.cache.enable}) }}
-{#{% include 'brand.swig' %}#}
 {% include 'menu.swig' %}
 
 {% if theme.custom_file_path.header %}
diff --git a/layout/_third-party/comments/disqus.swig b/layout/_third-party/comments/disqus.swig
index 176f511ae6..7ff74d056b 100644
--- a/layout/_third-party/comments/disqus.swig
+++ b/layout/_third-party/comments/disqus.swig
@@ -1,6 +1,6 @@
 {% if theme.disqus.enable %}
 
-  {% if theme.disqus.count  %}
+  {% if theme.disqus.count %}
     <script id="dsq-count-scr" src="https://{{theme.disqus.shortname}}.disqus.com/count.js" async></script>
   {% endif %}
 
@@ -10,6 +10,9 @@
         this.page.url = '{{ page.permalink }}';
         this.page.identifier = '{{ page.path }}';
         this.page.title = '{{ page.title| addslashes }}';
+        {% if __('disqus') !== 'disqus' -%}
+          this.language = '{{ __('disqus') }}';
+        {% endif -%}
       };
       function loadComments () {
         var d = document, s = d.createElement('script');
diff --git a/layout/archive.swig b/layout/archive.swig
index 99f8006689..fc146b6bf1 100644
--- a/layout/archive.swig
+++ b/layout/archive.swig
@@ -2,7 +2,7 @@
 {% import '_macro/post-collapse.swig' as post_template %}
 {% import '_macro/sidebar.swig' as sidebar_template %}
 
-{% block title %}{{ __('title.archive') }} | {{ config.title }}{% endblock %}
+{% block title %}{{ __('title.archive') }} | {{ title }}{% endblock %}
 
 {% block page_class %}page-archive{% endblock %}
 
diff --git a/layout/category.swig b/layout/category.swig
index 8e3aa72c96..e28bdbce5d 100644
--- a/layout/category.swig
+++ b/layout/category.swig
@@ -2,7 +2,7 @@
 {% import '_macro/post-collapse.swig' as post_template %}
 {% import '_macro/sidebar.swig' as sidebar_template %}
 
-{% block title %}{{ __('title.category') }}: {{ page.category }} | {{ config.title }}{% endblock %}
+{% block title %}{{ __('title.category') }}: {{ page.category }} | {{ title }}{% endblock %}
 
 {% block content %}
 
diff --git a/layout/index.swig b/layout/index.swig
index 995c28a868..26ecd8f349 100644
--- a/layout/index.swig
+++ b/layout/index.swig
@@ -2,7 +2,7 @@
 {% import '_macro/post.swig' as post_template %}
 {% import '_macro/sidebar.swig' as sidebar_template %}
 
-{% block title %}{{ config.title }}{% if theme.index_with_subtitle and config.subtitle %} - {{config.subtitle }}{% endif %}{% endblock %}
+{% block title %}{{ title }}{% if theme.index_with_subtitle and subtitle %} &mdash; {{ subtitle }}{% endif %}{% endblock %}
 
 {% block page_class %}
   {% if is_home() %}page-home{% endif -%}
diff --git a/layout/page.swig b/layout/page.swig
index d0cdf8fa76..be968fd181 100644
--- a/layout/page.swig
+++ b/layout/page.swig
@@ -2,7 +2,7 @@
 {% import '_macro/sidebar.swig' as sidebar_template %}
 
   {% block title %}{#
-  #}{% set page_title_suffix = ' | ' + config.title %}{#
+  #}{% set page_title_suffix = ' | ' + title %}{#
 
   #}{% if page.type === "categories" and not page.title %}{#
     #}{{ __('title.category') + page_title_suffix }}{#
diff --git a/layout/post.swig b/layout/post.swig
index 23669021c2..ddfdddeabb 100644
--- a/layout/post.swig
+++ b/layout/post.swig
@@ -3,7 +3,7 @@
 {% import '_macro/sidebar.swig' as sidebar_template %}
 
 
-{% block title %}{{ page.title }} | {{ config.title }}{% endblock %}
+{% block title %}{{ page.title }} | {{ title }}{% endblock %}
 
 {% block page_class %}page-post-detail{% endblock %}
 
diff --git a/layout/schedule.swig b/layout/schedule.swig
index 216dfea5a1..e1d3c04eee 100644
--- a/layout/schedule.swig
+++ b/layout/schedule.swig
@@ -1,7 +1,7 @@
 {% extends '_layout.swig' %}
 {% import '_macro/sidebar.swig' as sidebar_template %}
 
-{% block title %}{{ __('title.schedule') }} | {{ config.title }}{% endblock %}
+{% block title %}{{ __('title.schedule') }} | {{ title }}{% endblock %}
 
 {% block page_class %}page-post-detail page-calendar{% endblock %}
 
diff --git a/layout/tag.swig b/layout/tag.swig
index e570ce83df..7af5a77c75 100644
--- a/layout/tag.swig
+++ b/layout/tag.swig
@@ -2,7 +2,7 @@
 {% import '_macro/post-collapse.swig' as post_template %}
 {% import '_macro/sidebar.swig' as sidebar_template %}
 
-{% block title %}{{ __('title.tag') }}: {{ page.tag }} | {{ config.title }}{% endblock %}
+{% block title %}{{ __('title.tag') }}: {{ page.tag }} | {{ title }}{% endblock %}
 
 {% block content %}
 
diff --git a/scripts/merge-configs.js b/scripts/merge-configs.js
index e4d558e2bd..2c36f24cce 100644
--- a/scripts/merge-configs.js
+++ b/scripts/merge-configs.js
@@ -1,14 +1,18 @@
 /* global hexo */
 
+'use strict';
+
 var merge = require('./merge');
 
-/**
- * Merge configs from _data/next.yml into hexo.theme.config.
- * Note: configs in _data/next.yml will rewrite or override configs in hexo.theme.config.
- */
-hexo.on('generateBefore', function () {
+hexo.on('generateBefore', function() {
   if (hexo.locals.get) {
     var data = hexo.locals.get('data');
+
+    /**
+     * Merge configs from _data/next.yml into hexo.theme.config.
+     * If `override`, configs in next.yml will rewrite configs in hexo.theme.config.
+     * If next.yml not exists, merge all `theme_config.*` into hexo.theme.config.
+     */
     if (data && data.next) {
       if (data.next.override) {
         hexo.theme.config = data.next;
@@ -16,12 +20,26 @@ hexo.on('generateBefore', function () {
         merge(hexo.config, data.next);
         merge(hexo.theme.config, data.next);
       }
-    /**
-     * If next.yml not exists, then merge all `theme_config.*`
-     * options from main Hexo config into hexo.theme.config.
-     */
     } else {
       merge(hexo.theme.config, hexo.config.theme_config);
     }
+
+    // Custom languages support. Introduced in NexT v6.3.0.
+    if (data && data.languages) {
+      var lang = this.config.language;
+      var i18n = this.theme.i18n;
+
+      var mergeLang = function(lang) {
+        i18n.set(lang, merge(i18n.get([lang]), data.languages[lang]));
+      };
+
+      if (Array.isArray(lang)) {
+        for (var i = 0; i < lang.length; i++) {
+          mergeLang(lang[i]);
+        }
+      } else {
+        mergeLang(lang);
+      }
+    }
   }
 });