From d16d5fd362179d62fde4efebf24bd8f9cb91f8b3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 17:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E8=A1=8C=E6=96=87=E5=AD=97/=E5=A4=9A?=
 =?UTF-8?q?=E8=A1=8C=E6=96=87=E5=AD=97=20-->=20=E5=8D=95=E8=A1=8C=E4=B8=BB?=
 =?UTF-8?q?=E8=A7=82/=E5=A4=9A=E8=A1=8C=E4=B8=BB=E8=A7=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_mulit.html.erb  | 2 +-
 app/views/poll/_edit_single.html.erb | 2 +-
 app/views/poll/_new_mulit.html.erb   | 2 +-
 app/views/poll/_new_single.html.erb  | 2 +-
 app/views/poll/_show_single.html.erb | 2 +-
 config/locales/zh.yml                | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
index 684a285e3..f4e079c17 100644
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -3,7 +3,7 @@
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
     <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
-    <input class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入多行文字标题" value="<%= poll_question.question_title%>"/>
+    <input class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入多行主观标题" value="<%= poll_question.question_title%>"/>
     <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
     <label for="ur_question_require">必答</label>
   </div>
diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb
index b8157ee6c..b172d955c 100644
--- a/app/views/poll/_edit_single.html.erb
+++ b/app/views/poll/_edit_single.html.erb
@@ -4,7 +4,7 @@
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
     <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
     <input id="poll_questions_title_<%=poll_question.id%>" class="ur_question_title" contenteditable="true" type="text"
-           name="poll_questions_title"  placeholder="请输入单行文字标题" value="<%= poll_question.question_title%>"/>
+           name="poll_questions_title"  placeholder="请输入单行主观标题" value="<%= poll_question.question_title%>"/>
     <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
     <label for="ur_question_require">必答</label>
   </div>
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
index e034e54af..155f208c4 100644
--- a/app/views/poll/_new_mulit.html.erb
+++ b/app/views/poll/_new_mulit.html.erb
@@ -3,7 +3,7 @@
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
     <input type="hidden" name="question_type" value="4"/>
-    <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入多行文字标题"/>
+    <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入多行主观标题"/>
     <input type="checkbox" name="is_necessary" value="true" checked/>
     <label>必答</label>
   </div>
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
index ec06933a8..fb052a7a3 100644
--- a/app/views/poll/_new_single.html.erb
+++ b/app/views/poll/_new_single.html.erb
@@ -3,7 +3,7 @@
       <div class="ur_editor_title">
         <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
         <input type="hidden" name="question_type" value="3"/>
-        <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入单行文字标题"/>
+        <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入单行主观标题"/>
         <input type="checkbox" name="is_necessary" value="true" checked/>
         <label for="ur_question_require">必答</label>
       </div>
diff --git a/app/views/poll/_show_single.html.erb b/app/views/poll/_show_single.html.erb
index d9ef2abc7..bfea07d86 100644
--- a/app/views/poll/_show_single.html.erb
+++ b/app/views/poll/_show_single.html.erb
@@ -7,7 +7,7 @@
     <%if poll_question.is_necessary == 1%>
         <span class="ur_required" title="必答">*</span>
     <%end%>
-    (单行文字)
+    (单行主观)
   </div>
   <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
               method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de")  %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 5c2925b90..e607214b5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2247,8 +2247,8 @@ zh:
   label_statistical_results: 统计结果
   label_MC: 单选题
   label_MCQ: 多选题
-  label_single: 单行文字
-  label_mulit: 多行文字
+  label_single: 单行主观
+  label_mulit: 多行主观
   label_enter_single_title: 请输入单选题标题
   label_new_answer: 新建选项
   label_poll_title: 问卷标题