From 982110525f6206c41045dd758d72f9263e9822fe Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Wed, 26 Sep 2018 21:07:46 +0800
Subject: [PATCH] :boom: https://github.com/b3log/solo/issues/12530

---
 Medium/lang/lang_en_US.properties | 2 +-
 NeoEase/tag-articles.ftl          | 2 +-
 i-nove/side.ftl                   | 5 +----
 i-nove/tag-articles.ftl           | 2 +-
 metro-hot/tag-articles.ftl        | 2 +-
 mobile/lang/lang_zh_CN.properties | 5 +++++
 mobile/tag-articles.ftl           | 2 +-
 owmx-3.0/side.ftl                 | 6 ++----
 owmx-3.0/tag-articles.ftl         | 2 +-
 tree-house/side.ftl               | 4 +---
 tree-house/tag-articles.ftl       | 2 +-
 11 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Medium/lang/lang_en_US.properties b/Medium/lang/lang_en_US.properties
index fed2f54..65327aa 100644
--- a/Medium/lang/lang_en_US.properties
+++ b/Medium/lang/lang_en_US.properties
@@ -22,8 +22,8 @@
 # Author: Liyuan Li
 #
 
-reply1Label=Reply
 cntLabel=
+reply1Label=Reply
 nextArticleLabel=Next Article
 onlineVisitorLabel=Online
 cntMonthLabel=Month
diff --git a/NeoEase/tag-articles.ftl b/NeoEase/tag-articles.ftl
index 92bee60..ef4a70a 100644
--- a/NeoEase/tag-articles.ftl
+++ b/NeoEase/tag-articles.ftl
@@ -33,7 +33,7 @@
             <div class="wrapper">
                 <div class="main">
                     <h2>
-                        <a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}" class="feed-ico">
+                        <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
                             ${tag1Label}
                             ${tag.tagTitle}
                             (${tag.tagPublishedRefCount})
diff --git a/i-nove/side.ftl b/i-nove/side.ftl
index e0a3864..0f596a6 100644
--- a/i-nove/side.ftl
+++ b/i-nove/side.ftl
@@ -111,9 +111,6 @@
         <ul class="navi-tags">
             <#list mostUsedTags as tag>
             <li>
-                <a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}">
-                    <img alt="${tag.tagTitle}" src="${staticServePath}/images/feed.png"/>
-                </a>
                 <a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
                     ${tag.tagTitle}</a> (${tag.tagPublishedRefCount})
             </li>
@@ -129,7 +126,7 @@
             <#list links as link>
             <li>
                 <a rel="friend" href="${link.linkAddress}" title="${link.linkTitle}" target="_blank">
-                    <img alt="${link.linkTitle}" 
+                    <img alt="${link.linkTitle}"
                          src="${faviconAPI}<#list link.linkAddress?split('/') as x><#if x_index=2>${x}<#break></#if></#list>" width="16" height="16" />
                     ${link.linkTitle}
                 </a>
diff --git a/i-nove/tag-articles.ftl b/i-nove/tag-articles.ftl
index 6ded4df..852d62d 100644
--- a/i-nove/tag-articles.ftl
+++ b/i-nove/tag-articles.ftl
@@ -38,7 +38,7 @@
                                 ${tag1Label}
                             </div>
                             <div class="kind-panel">
-                                <a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}"><span id="tagArticlesTag">
+                                <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"><span id="tagArticlesTag">
                                     ${tag.tagTitle}
                                 </span>(${tag.tagPublishedRefCount})</a>
                             </div>
diff --git a/metro-hot/tag-articles.ftl b/metro-hot/tag-articles.ftl
index 690c874..0bf2a68 100644
--- a/metro-hot/tag-articles.ftl
+++ b/metro-hot/tag-articles.ftl
@@ -34,7 +34,7 @@
                 <#include "header.ftl" />
                 <div class="sub-nav fn-clear">
                     <h2>
-                        <a id="tag" rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}">
+                        <a id="tag" rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
                             ${tag1Label}
                             ${tag.tagTitle}
                             (${tag.tagPublishedRefCount})
diff --git a/mobile/lang/lang_zh_CN.properties b/mobile/lang/lang_zh_CN.properties
index bd60c3a..0eb0ddd 100644
--- a/mobile/lang/lang_zh_CN.properties
+++ b/mobile/lang/lang_zh_CN.properties
@@ -23,6 +23,11 @@
 # Author: Liyuan Li
 #
 
+reply1Label=\u56DE\u590D
+nextArticleLabel=\u4E0B\u4E00\u7BC7
+onlineVisitorLabel=\u5F53\u524D\u8BBF\u5BA2
+cntMonthLabel=\u4E2A\u6708
+cntArticleLabel=\u7BC7\u6587\u7AE0
 adminConsoleLabel=\u540E\u53F0\u7BA1\u7406
 adminIndexLabel=\u540E\u53F0\u9996\u9875
 postArticleLabel=\u53D1\u5E03\u6587\u7AE0
diff --git a/mobile/tag-articles.ftl b/mobile/tag-articles.ftl
index 22477cb..605377e 100644
--- a/mobile/tag-articles.ftl
+++ b/mobile/tag-articles.ftl
@@ -31,7 +31,7 @@
 		<div class="content single">
             <div class="post">
                 <h2 >${tag1Label}
-                    <a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}"><span id="tagArticlesTag">
+                    <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"><span id="tagArticlesTag">
                         ${tag.tagTitle}
                     </span>(${tag.tagPublishedRefCount})</a>
                 </h2>
diff --git a/owmx-3.0/side.ftl b/owmx-3.0/side.ftl
index 166376a..a25e90d 100644
--- a/owmx-3.0/side.ftl
+++ b/owmx-3.0/side.ftl
@@ -132,11 +132,9 @@
     <ul class="navi-tags">
         <#list mostUsedTags as tag>
         <li>
-            <a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}">
-                <img alt="${tag.tagTitle}" src="${staticServePath}/images/feed.png"/>
-            </a>
             <a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
-                ${tag.tagTitle}</a>(${tag.tagPublishedRefCount})
+                <sup>[${tag.tagPublishedRefCount}]</sup>
+                ${tag.tagTitle}</a>
         </li>
         </#list>
     </ul>
diff --git a/owmx-3.0/tag-articles.ftl b/owmx-3.0/tag-articles.ftl
index 2cee1b4..6382cdf 100644
--- a/owmx-3.0/tag-articles.ftl
+++ b/owmx-3.0/tag-articles.ftl
@@ -34,7 +34,7 @@
                 <article>
                     <cite>${tag1Label}</cite>
                     <blockquote>
-                        <a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}"><span id="tagArticlesTag">
+                        <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"><span id="tagArticlesTag">
                             ${tag.tagTitle}
                         </span>(${tag.tagPublishedRefCount})</a>
                     </blockquote>
diff --git a/tree-house/side.ftl b/tree-house/side.ftl
index 65d7b8c..ad574d4 100644
--- a/tree-house/side.ftl
+++ b/tree-house/side.ftl
@@ -111,7 +111,7 @@
     </#if>
 
     <#if 0 != mostUsedTags?size>
-    <div class="block popTags">
+    <div class="block">
         <h3>${tagsLabel}</h3>
         <ul>
             <#list mostUsedTags as tag>
@@ -119,8 +119,6 @@
                 <a rel="tag" title="${tag.tagTitle}(${tag.tagPublishedRefCount})" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">
                     ${tag.tagTitle}(${tag.tagPublishedRefCount})
                 </a>
-                <img onclick="window.location='${servePath}/tag-articles-feed.do?oId=${tag.oId}'"
-                     alt="${tag.tagTitle}" src="${staticServePath}/images/feed.png"/>
             </li>
             </#list>
         </ul>
diff --git a/tree-house/tag-articles.ftl b/tree-house/tag-articles.ftl
index 5fb99fb..8f97b06 100644
--- a/tree-house/tag-articles.ftl
+++ b/tree-house/tag-articles.ftl
@@ -38,7 +38,7 @@
                         <div class="left main">
                             <h2 class="title">
                                 ${tag1Label}
-                                <a rel="alternate" href="${servePath}/tag-articles-feed.do?oId=${tag.oId}">${tag.tagTitle}(${tag.tagPublishedRefCount})</a>
+                                <a rel="alternate" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}">${tag.tagTitle}(${tag.tagPublishedRefCount})</a>
                             </h2>
                             <#include "article-list.ftl">
                         </div>