Merge branch 'sw_new_course' into szzh

10 years ago · 4d9d45f25a
parent d177f1ae89 b0eba062a8
commit 4d9d45f25a
2 changed files with 2 additions and 2 deletions
--- a/app/views/forums/create_feedback.js.erb
+++ b/app/views/forums/create_feedback.js.erb
@ -1,6 +1,6 @@
 $(function(){
    $("#button1").click(function(){
-        myTips(<%= l(:label_feedback_success)%>,"success");
+        myTips(<%= l(:label_forums_feedback_success)%>,"success");
    });
 })
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@ -2328,7 +2328,7 @@ zh:
  label_technical_support: 技术支持：
  label_feedback: 意见反馈
-  label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
+  label_forums_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"