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

app/controllers/question_banks_controller.rb

@@ -264,8 +264,9 @@ class QuestionBanksController < ApplicationController
       #   new_exercise.create_exercise_list
       #   exercise.update_column(:quotes, exercise.quotes+1)
       # end
-      new_exercise if new_exercise.save!
+      new_exercise.save!
       exercise.update_column(:quotes, exercise.quotes+1)
+      new_exercise
     end
   end
 
@@ -292,8 +293,9 @@ class QuestionBanksController < ApplicationController
       #   new_poll.create_polls_list
       #   poll.update_column(:quotes, poll.quotes+1)
       # end
-      new_poll if new_poll.save!
+      new_poll.save!
       poll.update_column(:quotes, poll.quotes+1)
+      new_poll
     end
   end
 

config/locales/tidings/zh-CN.yml

@@ -202,6 +202,7 @@
         2_end: "别人对你的匿评发起的申诉申请：%s，审核未通过"
       StudentWork:
         Apply_end: "发起了匿评申诉申请：%s"
+        HomeworkCommon_end: "发起了匿评申诉申请：%s"
         System_end: "有人对你的匿评发起了申诉：%s"
     Department_end: "你选填的二级单位：%s（%s）因不符合规范,已被系统删除.请重新选择"
     Library: