From c784dde38d9fa4b6d02fe250ccbf2779bda0ab94 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 26 Dec 2019 11:05:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/decorators/tiding_decorator.rb | 2 +-
 config/locales/tidings/zh-CN.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/decorators/tiding_decorator.rb b/app/decorators/tiding_decorator.rb
index 8e0c402dd..318167d92 100644
--- a/app/decorators/tiding_decorator.rb
+++ b/app/decorators/tiding_decorator.rb
@@ -226,7 +226,7 @@ module TidingDecorator
   end
 
   def discuss_content
-    I18n.t(locale_format(container_type, container.parent_id.present?)) % message_content_helper(container.content)
+    I18n.t(locale_format(parent_container_type, container.parent_id.present?)) % message_content_helper(container.content)
   end
 
   def grade_content
diff --git a/config/locales/tidings/zh-CN.yml b/config/locales/tidings/zh-CN.yml
index cdde0f97f..1117786c0 100644
--- a/config/locales/tidings/zh-CN.yml
+++ b/config/locales/tidings/zh-CN.yml
@@ -108,7 +108,7 @@
       Issue_end: "赞了你发布的项目Issue：%s"
       Journal_end: "赞了你的回复%s"
     Discuss:
-      Shixun:
+      Challenge:
         true_end: "评论了你的回复：%s"
         false_end: "评论了你发布的实训：%s"
       Hack: