From 649c65fbe222202c253de61cf4a4fc7bbecb2bb1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 27 Jan 2015 10:14:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/poll_helper.rb           | 8 ++++----
 app/views/poll/_edit_MC.html.erb     | 8 ++++++--
 app/views/poll/_edit_MCQ.html.erb    | 8 ++++++--
 app/views/poll/_edit_head.html.erb   | 8 ++++++--
 app/views/poll/_edit_mulit.html.erb  | 8 ++++++--
 app/views/poll/_edit_single.html.erb | 8 ++++++--
 app/views/poll/_new_MC.html.erb      | 8 ++++++--
 app/views/poll/_new_MCQ.html.erb     | 8 ++++++--
 app/views/poll/_new_mulit.html.erb   | 8 ++++++--
 app/views/poll/_new_single.html.erb  | 8 ++++++--
 10 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 60d82c096..3156f1b3a 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -64,13 +64,13 @@ module PollHelper
   def options_show pq
     case pq
     when 1
-      "单选题"
+      l(:label_MC)
     when 2
-      "多选题"
+      l(:label_MCQ)
     when 3
-      "单行主观题"
+      l(:label_single)
     else
-      "多行主观题"
+      l(:label_mulit)
     end
   end
 
diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 066eafe0d..f89407247 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -39,8 +39,12 @@
         </ul>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+        <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">
+          <%= l(:label_button_ok)%>
+        </a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">
+          <%= l(:button_cancel)%>
+        </a>
       </div>
       <div class="cl"></div>
     </div>
diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
index 129f50e94..d6045f965 100644
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -36,8 +36,12 @@
       </ul>
     </div>
     <div class="ur_editor_footer">
-      <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-      <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+      <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">
+        <%= l(:label_button_ok)%>
+      </a>
+      <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">
+        <%= l(:button_cancel)%>
+      </a>
     </div>
     <div class="cl"></div>
   </div><!--编辑多选 end-->
diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb
index ed90a5ef8..dfa5b5cfc 100644
--- a/app/views/poll/_edit_head.html.erb
+++ b/app/views/poll/_edit_head.html.erb
@@ -7,8 +7,12 @@
         <textarea name="polls_description" maxlength="300" id="polls_description" class="textarea_editor"><%= @poll.polls_description%></textarea>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn_submit" data-button="ok" onclick="pollsSubmit($(this));">确定</a>
-        <a class="btn_cancel" data-button="cancel" onclick="pollsCancel();">取消</a>
+        <a class="btn_submit" data-button="ok" onclick="pollsSubmit($(this));">
+          <%= l(:label_button_ok)%>
+        </a>
+        <a class="btn_cancel" data-button="cancel" onclick="pollsCancel();">
+          <%= l(:button_cancel)%>
+        </a>
       </div>
       <div class="cl"></div>
     </div><!--编辑头部 end-->
diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
index d498169f4..5c694ff05 100644
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -20,8 +20,12 @@
     <!--<label>高 <input name="rows" type="number" min="1" value="5"> 行</label>-->
   </div>
   <div class="ur_editor_footer">
-    <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-    <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+    <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">
+      <%= l(:label_button_ok)%>
+    </a>
+    <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">
+      <%= l(:button_cancel)%>
+    </a>
   </div>
   <div class="cl"></div>
 </div><!--编辑多行文字end-->
diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb
index 2c2d41e0f..5aff29984 100644
--- a/app/views/poll/_edit_single.html.erb
+++ b/app/views/poll/_edit_single.html.erb
@@ -16,8 +16,12 @@
     <label for="ur_question_require">必答</label>
   </div>
   <div class="ur_editor_footer">
-    <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-    <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+    <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">
+      <%= l(:label_button_ok)%>
+    </a>
+    <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">
+      <%= l(:button_cancel)%>
+    </a>
   </div>
   <div class="cl"></div>
 </div><!--编辑单行文字end-->
diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
index a7f9e441b..294c058f8 100644
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@@ -34,8 +34,12 @@
         </ul>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
+        <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">
+          <%= l(:label_button_ok)%>
+        </a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
+          <%= l(:button_cancel)%>
+        </a>
       </div>
       <div class="cl"></div>
     </div>
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
index 027a1c1f6..1478f9918 100644
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -33,8 +33,12 @@
       </ul>
     </div>
     <div class="ur_editor_footer">
-      <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-      <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
+      <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">
+        <%= l(:label_button_ok)%>
+      </a>
+      <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
+        <%= l(:button_cancel)%>
+      </a>
     </div>
     <div class="cl"></div>
   </div>
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
index 02f7a71a7..23ffb3d64 100644
--- a/app/views/poll/_new_mulit.html.erb
+++ b/app/views/poll/_new_mulit.html.erb
@@ -13,8 +13,12 @@
     <!--<label>高 <input name="rows" type="number" min="1" value="5"> 行</label>-->
   </div>
   <div class="ur_editor_footer">
-    <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-    <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
+    <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">
+      <%= l(:label_button_ok)%>
+    </a>
+    <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
+      <%= l(:button_cancel)%>
+    </a>
   </div>
   <div class="cl"></div>
 </div><!--编辑多行文字end-->
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
index ffc525546..4ee185070 100644
--- a/app/views/poll/_new_single.html.erb
+++ b/app/views/poll/_new_single.html.erb
@@ -8,8 +8,12 @@
         <label for="ur_question_require">必答</label>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-        <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
+        <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">
+          <%= l(:label_button_ok)%>
+        </a>
+        <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
+          <%= l(:button_cancel)%>
+        </a>
       </div>
       <div class="cl"></div>
     </div><!--编辑单行文字end-->