From e6d4dd5ad7f178708754e0bab01863f267c7a900 Mon Sep 17 00:00:00 2001
From: sli1989 <sli@hust.edu.cn>
Date: Sun, 18 Mar 2018 22:54:34 +0800
Subject: [PATCH 1/4] Add comment text

---
 languages/_en.yml       | 1 +
 layout/_macro/post.swig | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/languages/_en.yml b/languages/_en.yml
index 729c57e288..869bdff29a 100644
--- a/languages/_en.yml
+++ b/languages/_en.yml
@@ -32,6 +32,7 @@ post:
   untitled: Untitled
   toc_empty: This post does not have a Table of Contents
   views: Views
+  comments_count: Comments
   symbols_count: Symbols count in article
   symbols_time: Reading time
   total_symbols: Symbols count total
diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index 35388fc81a..ca7dcb0e16 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -138,6 +138,7 @@
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
                   <span class="post-comments-count fb-comments-count" data-href="{{ post.permalink }}" itemprop="commentCount">0</span> comments
                 </a>
+				<span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
               </span>
             {% elseif theme.disqus.enable and theme.disqus.count %}
               <span class="post-comments-count">
@@ -160,6 +161,7 @@
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
                   <span class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentsCount"></span>
                 </a>
+				<span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
               </span>
               <!--/noindex-->
             {% elseif theme.changyan.enable and theme.changyan.appid and theme.changyan.appkey %}
@@ -172,10 +174,12 @@
                 <a href="{{ url_for(post.path) }}#SOHUCS" itemprop="discussionUrl">
                   <span id="changyan_count_unit" class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentsCount"></span>
                 </a>
+				<span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
               {% else %}
                 <a href="{{ url_for(post.path) }}#SOHUCS" itemprop="discussionUrl">
                   <span id="url::{{ post.permalink }}" class="cy_cmt_count" data-xid="{{ post.path }}" itemprop="commentsCount" ></span>
                 </a>
+				<span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
               {% endif %}
             {% elseif is_post() and theme.gitment.enable and theme.gitment.mint and theme.gitment.count %}
               <span class="post-comments-count">
@@ -186,6 +190,7 @@
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
                   <span class="post-comments-count gitment-comments-count" data-xid="{{ url_for(post.path) }}" itemprop="commentsCount"></span>
                 </a>
+				<span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
               </span>
             {% elseif theme.valine.enable and theme.valine.appid and theme.valine.appkey %}
               <span class="post-comments-count">
@@ -196,6 +201,7 @@
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
                   <span class="post-comments-count valine-comment-count" data-xid="{{ url_for(post.path) }}" itemprop="commentCount"></span>
                 </a>
+				<span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
               </span>
             {% endif %}
           {% endif %}

From 5422898833292e3c488b17db5f581ee4cde1c889 Mon Sep 17 00:00:00 2001
From: sli1989 <sli@hust.edu.cn>
Date: Mon, 19 Mar 2018 09:50:32 +0800
Subject: [PATCH 2/4] Update the comment text in hyperlink

---
 layout/_macro/post.swig | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index ca7dcb0e16..4f031369b4 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -136,9 +136,8 @@
                   <i class="fa fa-comment-o"></i>
                 </span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-comments-count fb-comments-count" data-href="{{ post.permalink }}" itemprop="commentCount">0</span> comments
+                  <span class="post-comments-count fb-comments-count" data-href="{{ post.permalink }}" itemprop="commentCount">0</span> Comments
                 </a>
-				<span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
               </span>
             {% elseif theme.disqus.enable and theme.disqus.count %}
               <span class="post-comments-count">
@@ -159,9 +158,8 @@
                   <i class="fa fa-comment-o"></i>
                 </span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentsCount"></span>
+                  <span class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentsCount"></span> <span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
                 </a>
-				<span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
               </span>
               <!--/noindex-->
             {% elseif theme.changyan.enable and theme.changyan.appid and theme.changyan.appkey %}
@@ -177,9 +175,8 @@
 				<span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
               {% else %}
                 <a href="{{ url_for(post.path) }}#SOHUCS" itemprop="discussionUrl">
-                  <span id="url::{{ post.permalink }}" class="cy_cmt_count" data-xid="{{ post.path }}" itemprop="commentsCount" ></span>
+                  <span id="url::{{ post.permalink }}" class="cy_cmt_count" data-xid="{{ post.path }}" itemprop="commentsCount" ></span> <span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
                 </a>
-				<span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
               {% endif %}
             {% elseif is_post() and theme.gitment.enable and theme.gitment.mint and theme.gitment.count %}
               <span class="post-comments-count">
@@ -188,9 +185,8 @@
                   <i class="fa fa-comment-o"></i>
                 </span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-comments-count gitment-comments-count" data-xid="{{ url_for(post.path) }}" itemprop="commentsCount"></span>
+                  <span class="post-comments-count gitment-comments-count" data-xid="{{ url_for(post.path) }}" itemprop="commentsCount"></span> <span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
                 </a>
-				<span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
               </span>
             {% elseif theme.valine.enable and theme.valine.appid and theme.valine.appkey %}
               <span class="post-comments-count">
@@ -199,9 +195,8 @@
                   <i class="fa fa-comment-o"></i>
                 </span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-comments-count valine-comment-count" data-xid="{{ url_for(post.path) }}" itemprop="commentCount"></span>
+                  <span class="post-comments-count valine-comment-count" data-xid="{{ url_for(post.path) }}" itemprop="commentCount"></span> <span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
                 </a>
-				<span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
               </span>
             {% endif %}
           {% endif %}

From 4db4c041c7653bf4e9fe0bd803c230c87e2f19cf Mon Sep 17 00:00:00 2001
From: sli1989 <sli@hust.edu.cn>
Date: Mon, 19 Mar 2018 15:41:00 +0800
Subject: [PATCH 3/4] Update comment text's style

---
 layout/_macro/post.swig | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index 4f031369b4..5c3f381b04 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -136,7 +136,7 @@
                   <i class="fa fa-comment-o"></i>
                 </span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-comments-count fb-comments-count" data-href="{{ post.permalink }}" itemprop="commentCount">0</span> Comments
+                  <span class="post-meta-item-text">{{ __('post.comments_count') }}&#58</span> <span class="post-comments-count fb-comments-count" data-href="{{ post.permalink }}" itemprop="commentCount">0</span>
                 </a>
               </span>
             {% elseif theme.disqus.enable and theme.disqus.count %}
@@ -158,7 +158,7 @@
                   <i class="fa fa-comment-o"></i>
                 </span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentsCount"></span> <span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
+                  <span class="post-meta-item-text">{{ __('post.comments_count') }}&#58</span> <span class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentsCount"></span>
                 </a>
               </span>
               <!--/noindex-->
@@ -170,12 +170,11 @@
               </span>
               {% if is_post() %}
                 <a href="{{ url_for(post.path) }}#SOHUCS" itemprop="discussionUrl">
-                  <span id="changyan_count_unit" class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentsCount"></span>
+                  <span class="post-meta-item-text">{{ __('post.comments_count') }}&#58</span> <span id="changyan_count_unit" class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentsCount"></span>
                 </a>
-				<span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
               {% else %}
                 <a href="{{ url_for(post.path) }}#SOHUCS" itemprop="discussionUrl">
-                  <span id="url::{{ post.permalink }}" class="cy_cmt_count" data-xid="{{ post.path }}" itemprop="commentsCount" ></span> <span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
+                  <span class="post-meta-item-text">{{ __('post.comments_count') }}&#58</span> <span id="url::{{ post.permalink }}" class="cy_cmt_count" data-xid="{{ post.path }}" itemprop="commentsCount" ></span>
                 </a>
               {% endif %}
             {% elseif is_post() and theme.gitment.enable and theme.gitment.mint and theme.gitment.count %}
@@ -185,7 +184,7 @@
                   <i class="fa fa-comment-o"></i>
                 </span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-comments-count gitment-comments-count" data-xid="{{ url_for(post.path) }}" itemprop="commentsCount"></span> <span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
+                  <span class="post-meta-item-text">{{ __('post.comments_count') }}&#58</span> <span class="post-comments-count gitment-comments-count" data-xid="{{ url_for(post.path) }}" itemprop="commentsCount"></span>
                 </a>
               </span>
             {% elseif theme.valine.enable and theme.valine.appid and theme.valine.appkey %}
@@ -195,7 +194,7 @@
                   <i class="fa fa-comment-o"></i>
                 </span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-comments-count valine-comment-count" data-xid="{{ url_for(post.path) }}" itemprop="commentCount"></span> <span class="post-meta-item-text">{{ __('post.comments_count') }}</span>
+                  <span class="post-meta-item-text">{{ __('post.comments_count') }}&#58</span> <span class="post-comments-count valine-comment-count" data-xid="{{ url_for(post.path) }}" itemprop="commentCount"></span>
                 </a>
               </span>
             {% endif %}

From 0179839dca2fe464316e29bac055e358925641a5 Mon Sep 17 00:00:00 2001
From: sli1989 <sli@hust.edu.cn>
Date: Mon, 19 Mar 2018 16:09:45 +0800
Subject: [PATCH 4/4] Add symbol.colon in comment text

---
 layout/_macro/post.swig | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index 5c3f381b04..7e13d0100d 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -136,7 +136,7 @@
                   <i class="fa fa-comment-o"></i>
                 </span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-meta-item-text">{{ __('post.comments_count') }}&#58</span> <span class="post-comments-count fb-comments-count" data-href="{{ post.permalink }}" itemprop="commentCount">0</span>
+                  <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span> <span class="post-comments-count fb-comments-count" data-href="{{ post.permalink }}" itemprop="commentCount">0</span>
                 </a>
               </span>
             {% elseif theme.disqus.enable and theme.disqus.count %}
@@ -158,7 +158,7 @@
                   <i class="fa fa-comment-o"></i>
                 </span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-meta-item-text">{{ __('post.comments_count') }}&#58</span> <span class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentsCount"></span>
+                  <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span> <span class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentsCount"></span>
                 </a>
               </span>
               <!--/noindex-->
@@ -170,11 +170,11 @@
               </span>
               {% if is_post() %}
                 <a href="{{ url_for(post.path) }}#SOHUCS" itemprop="discussionUrl">
-                  <span class="post-meta-item-text">{{ __('post.comments_count') }}&#58</span> <span id="changyan_count_unit" class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentsCount"></span>
+                  <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span> <span id="changyan_count_unit" class="post-comments-count hc-comment-count" data-xid="{{ post.path }}" itemprop="commentsCount"></span>
                 </a>
               {% else %}
                 <a href="{{ url_for(post.path) }}#SOHUCS" itemprop="discussionUrl">
-                  <span class="post-meta-item-text">{{ __('post.comments_count') }}&#58</span> <span id="url::{{ post.permalink }}" class="cy_cmt_count" data-xid="{{ post.path }}" itemprop="commentsCount" ></span>
+                  <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span> <span id="url::{{ post.permalink }}" class="cy_cmt_count" data-xid="{{ post.path }}" itemprop="commentsCount" ></span>
                 </a>
               {% endif %}
             {% elseif is_post() and theme.gitment.enable and theme.gitment.mint and theme.gitment.count %}
@@ -184,7 +184,7 @@
                   <i class="fa fa-comment-o"></i>
                 </span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-meta-item-text">{{ __('post.comments_count') }}&#58</span> <span class="post-comments-count gitment-comments-count" data-xid="{{ url_for(post.path) }}" itemprop="commentsCount"></span>
+                  <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span> <span class="post-comments-count gitment-comments-count" data-xid="{{ url_for(post.path) }}" itemprop="commentsCount"></span>
                 </a>
               </span>
             {% elseif theme.valine.enable and theme.valine.appid and theme.valine.appkey %}
@@ -194,7 +194,7 @@
                   <i class="fa fa-comment-o"></i>
                 </span>
                 <a href="{{ url_for(post.path) }}#comments" itemprop="discussionUrl">
-                  <span class="post-meta-item-text">{{ __('post.comments_count') }}&#58</span> <span class="post-comments-count valine-comment-count" data-xid="{{ url_for(post.path) }}" itemprop="commentCount"></span>
+                  <span class="post-meta-item-text">{{ __('post.comments_count') + __('symbol.colon') }}</span> <span class="post-comments-count valine-comment-count" data-xid="{{ url_for(post.path) }}" itemprop="commentCount"></span>
                 </a>
               </span>
             {% endif %}