From 26ef06b48c22f98608d68fccf50a3bccdbc66ade Mon Sep 17 00:00:00 2001
From: Jason Lee <huacnlee@gmail.com>
Date: Thu, 13 Jan 2022 23:45:40 +0800
Subject: [PATCH] Revert "Show yearly replies_count on user profile page."

This reverts commit adc7a633f2043e0edcc6ba14bcc66aa7ead4f07f.
---
 app/views/users/_sidebar.html.erb | 10 +++++-----
 config/locales/views.en.yml       |  2 +-
 config/locales/views.zh-CN.yml    |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/users/_sidebar.html.erb b/app/views/users/_sidebar.html.erb
index c8143354ca..85e03519ed 100644
--- a/app/views/users/_sidebar.html.erb
+++ b/app/views/users/_sidebar.html.erb
@@ -25,7 +25,6 @@
           <div class="item number">
             <%= t("users.number_of_user", no: @user.id)%> / <span title="<%= t("users.join_time") %>"><%= @user.created_at.to_date %></span>
           </div>
-        </ul>
         </div>
       </div>
       <hr>
@@ -43,10 +42,11 @@
             <%= icon_tag("location") %> <%= location_name_tag(@user.location) %>
           </div>
         <% end %>
-        <hr>
-        <div class="item number"><%= t("users.topics_count_html", count: @user.topics_count) %></div>
-        <div class="item number"><%= t("users.replies_count_html", count: @user.replies_count, yearly_count: @user.yearly_replies_count) %></div>
-        <hr>
+        <div class="item counts">
+          <%= t("users.topics_count_html", count: @user.topics_count) %>
+          <span class="divider">/</span>
+          <%= t("users.replies_count_html", count: @user.replies_count) %>
+        </div>
         <div class="item social">
           <% if !@user.twitter.blank? %>
             <%= link_to icon_bold_tag("twitter"), @user.twitter_url, class: "twitter", rel: "nofollow" %>
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 2b5fb75d5d..56b91405b1 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -287,7 +287,7 @@
     join_time: "Joined at"
     signature: "Status"
     topics_count_html: <span>%{count}</span> Topics
-    replies_count_html: "<span>%{count}</span> Replies (Yearly: %{yearly_count})"
+    replies_count_html: <span>%{count}</span> Replies
     personal_website: "Blog"
     recent_publish_topic: "Recent Topics"
     recent_reply_topic: "Recent Replies"
diff --git a/config/locales/views.zh-CN.yml b/config/locales/views.zh-CN.yml
index 12c9b12e4e..502a5d50a8 100644
--- a/config/locales/views.zh-CN.yml
+++ b/config/locales/views.zh-CN.yml
@@ -295,8 +295,8 @@
     join_time: "Since"
     signature: "签名"
     personal_website: "博客"
-    topics_count_html: 累计 <span>%{count}</span> 篇帖子
-    replies_count_html: 累计 <span>%{count}</span> 条回帖 (最近一年 %{yearly_count} 条)
+    topics_count_html: <span>%{count}</span> 篇帖子
+    replies_count_html: <span>%{count}</span> 条回帖
     recent_publish_topic: "最近发布的帖子"
     recent_reply_topic: "最近回复过的帖子"
     unbind_warning: "至少要保留一个关联账号，现在不能解绑。"
@@ -317,7 +317,7 @@
     already_have_account: "已经有账号了？"
     forget_password: "忘记了密码？"
     find_password: "找回密码"
-    find_password_help_text: "此功能将会发送一个找回密码的特别链接到你的邮箱，通过该链接可以进入重置密码的页面。"
+    find_password_help_text: "此功能将会发送一个找回密码的特别链接到你的邮箱，通过该链接可以进入重置密码的页面。"    
     not_recieve_confirm_mail: "未收到确认邮件？"
     not_recieve_unlock_mail: "未收到解锁邮件？"
     resend_unlock_mail: "重新发送解锁邮件"