Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/models/discuss.rb

@@ -13,7 +13,7 @@ class Discuss < ApplicationRecord
   belongs_to :challenge, optional: true
   validate :validate_sensitive_string
 
-  validates :content, length: { maximum: 1000, too_long: "内容不能超过1000个字符" }
+  validates :content, length: { maximum: 1000, too_long: "不能超过1000个字符" }
 
   after_create :send_tiding
 

app/models/journals_for_message.rb

@@ -26,7 +26,7 @@ class JournalsForMessage < ApplicationRecord
   # "is_comprehensive_evaluation",  # 1 教师评论、2 匿评、3 留言
   # "hidden", 隐藏、
 
-  validates :notes, length: { maximum: 1000, too_long: "内容不能超过1000个字符" }
+  validates :notes, length: { maximum: 1000, too_long: "不能超过1000个字符" }
 
   after_create :send_tiding
 

config/locales/zh-CN.yml

@@ -13,4 +13,14 @@ zh-CN:
       'pending': '待审批'
       'processed': '已审批'
       'refused': '已拒绝'
-      'agreed': '已同意'
+      'agreed': '已同意'
+
+  activerecord:
+    attributes:
+      user:
+        login: '登录名'
+        lastname: '姓名'
+      discuss:
+        content: '内容'
+      journals_for_message:
+        notes: '内容'