Skip to content
Snippets Groups Projects
Commit a37a2a60 authored by Tommy Chen's avatar Tommy Chen
Browse files

Only display alternative links in pages and index. Modify Disqus language.

parent aaf38a58
No related branches found
No related tags found
No related merge requests found
...@@ -144,10 +144,14 @@ hexo.extend.helper.register('canonical_path_for_nav', function(){ ...@@ -144,10 +144,14 @@ hexo.extend.helper.register('canonical_path_for_nav', function(){
} }
}); });
hexo.extend.helper.register('lang_name', function(lang){
var data = this.site.data.languages[lang];
return data.name || data;
});
hexo.extend.helper.register('disqus_lang', function(){ hexo.extend.helper.register('disqus_lang', function(){
var lang = this.page.lang; var lang = this.page.lang;
if (!~lang.indexOf('-')) return lang; var data = this.site.data.languages[lang];
var split = lang.split('-'); return data.disqus_lang || lang;
return split[0] + '_' + split[1].toUpperCase();
}); });
\ No newline at end of file
en: English en: English
zh-tw: 正體中文 zh-tw:
zh-cn: 简体中文 name: 正體中文
\ No newline at end of file disqus_lang: zh_TW
zh-cn:
name: 简体中文
disqus_lang: zh
\ No newline at end of file
...@@ -11,23 +11,6 @@ ...@@ -11,23 +11,6 @@
{{ js('js/plugins') }} {{ js('js/plugins') }}
<!-- endbuild --> <!-- endbuild -->
{% endif %} {% endif %}
{% if page.comments and config.disqus_shortname %}
<!-- Disqus -->
<script>
var disqus_shortname = '{{ config.disqus_shortname }}';
var disqus_config = function(){
this.language = '{{ disqus_lang() }}';
};
{% if page.permalink %}
var disqus_url = '{{ url }}';
{% endif %}
(function(){
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = '//go.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
{% endif %}
<!-- Swiftype --> <!-- Swiftype -->
<script type="text/javascript"> <script type="text/javascript">
(function(w,d,t,u,n,s,e){w['SwiftypeObject']=n;w[n]=w[n]||function(){ (function(w,d,t,u,n,s,e){w['SwiftypeObject']=n;w[n]=w[n]||function(){
......
...@@ -2,4 +2,16 @@ ...@@ -2,4 +2,16 @@
<section id="comments"> <section id="comments">
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</section> </section>
<script>
var disqus_shortname = '{{ config.disqus_shortname }}';
var disqus_url = '{{ url }}';
var disqus_config = function(){
this.language = '{{ disqus_lang() }}';
};
(function(){
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = '//go.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
{% endif %} {% endif %}
\ No newline at end of file
...@@ -6,9 +6,11 @@ ...@@ -6,9 +6,11 @@
<!-- Canonical links --> <!-- Canonical links -->
<link rel="canonical" href="{{ canonical_url() }}"> <link rel="canonical" href="{{ canonical_url() }}">
<!-- Alternative links --> <!-- Alternative links -->
{% for lang in site.data.languages %} {% if page.layout == 'page' or page.layout == 'index' %}
<link rel="alternative" hreflang="{{ loop.key }}" href="{{ canonical_url(loop.key) }}"> {% for lang in site.data.languages %}
{% endfor %} <link rel="alternative" hreflang="{{ loop.key }}" href="{{ canonical_url(loop.key) }}">
{% endfor %}
{% endif %}
<!-- Icon --> <!-- Icon -->
<link rel="apple-touch-icon" sizes="57x57" href="{{ url_for('icon/apple-touch-icon-57x57.png') }}"> <link rel="apple-touch-icon" sizes="57x57" href="{{ url_for('icon/apple-touch-icon-57x57.png') }}">
<link rel="apple-touch-icon" sizes="114x114" href="{{ url_for('icon/apple-touch-icon-114x114.png') }}"> <link rel="apple-touch-icon" sizes="114x114" href="{{ url_for('icon/apple-touch-icon-114x114.png') }}">
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
</ul> </ul>
</nav> </nav>
<div id="lang-select-wrap"> <div id="lang-select-wrap">
<label id="lang-select-label"><i class="fa fa-globe"></i><span>{{ site.data.languages[page.lang] }}</span></label> <label id="lang-select-label"><i class="fa fa-globe"></i><span>{{ lang_name(page.lang) }}</span></label>
<select id="lang-select" data-canonical="{{ canonical_path_for_nav() }}"> <select id="lang-select" data-canonical="{{ canonical_path_for_nav() }}">
{% for lang in site.data.languages %} {% for lang in site.data.languages %}
<option value="{{ loop.key }}"{% if page.lang === loop.key %} selected{% endif %}>{{ lang }}</option> <option value="{{ loop.key }}"{% if page.lang === loop.key %} selected{% endif %}>{{ lang_name(loop.key) }}</option>
{% endfor %} {% endfor %}
</select> </select>
</div> </div>
......
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
{% endif %} {% endif %}
</div> </div>
<div id="mobile-lang-select-wrap"> <div id="mobile-lang-select-wrap">
<span id="mobile-lang-select-label"><i class="fa fa-globe"></i><span>{{ site.data.languages[page.lang] }}</span></span> <span id="mobile-lang-select-label"><i class="fa fa-globe"></i><span>{{ lang_name(page.lang) }}</span></span>
<select id="mobile-lang-select" data-canonical="{{ canonical_path_for_nav() }}"> <select id="mobile-lang-select" data-canonical="{{ canonical_path_for_nav() }}">
{% for lang in site.data.languages %} {% for lang in site.data.languages %}
<option value="{{ loop.key }}"{% if page.lang === loop.key %} selected{% endif %}>{{ lang }}</option> <option value="{{ loop.key }}"{% if page.lang === loop.key %} selected{% endif %}>{{ lang_name(loop.key) }}</option>
{% endfor %} {% endfor %}
</select> </select>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment