From bf6fe70ec94dc82a1ae9f8c3bd6c7996aff5d9af Mon Sep 17 00:00:00 2001
From: fanqiang <316257774@qq.com>
Date: Mon, 7 Oct 2013 11:02:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84fork=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_fork_form.html.erb | 2 +-
 app/views/bids/fork.html.erb       | 2 +-
 config/locales/zh.yml              | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/bids/_fork_form.html.erb b/app/views/bids/_fork_form.html.erb
index 1a454d9fe..ea110473c 100644
--- a/app/views/bids/_fork_form.html.erb
+++ b/app/views/bids/_fork_form.html.erb
@@ -1,7 +1,7 @@
 <!-- fq --> <!-- modified by bai -->
 <%= error_messages_for 'bid' %>
 <!--[form:project]-->
-<p><%= l(:label_homeworks_form_new_description) %></p>
+<p><%= l(:label_fork_form_new_description) %></p>
 
 <!-- modified by bai -->
 <p style="margin-left:-68px;padding-right: 20px;"><strong><%= l(:label_choose_course) %><span class="required"> *&nbsp;</span></strong><%= select_tag 'course', course_options_for_select(@courses) %></p>
diff --git a/app/views/bids/fork.html.erb b/app/views/bids/fork.html.erb
index 5d9192c83..813856bc3 100644
--- a/app/views/bids/fork.html.erb
+++ b/app/views/bids/fork.html.erb
@@ -1,5 +1,5 @@
 <!-- fq -->
-<h3><%=l(:label_course_homework_new)%></h3>
+<h3><%=l(:label_fork_homework_new)%></h3>
 
 <%= labelled_form_for @bid, :url => {:controller => 'bids', :action => 'create_fork', :id => @bid.id} do |f| %>
 <div class="box tabular">
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f0eadd6e4..4fef1ff7c 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1465,6 +1465,7 @@ zh:
   label_call_bonus: 奖金
   label_bids_form_new_description: 发布一个需求，一次竞赛或者一个课程的作业
   label_homeworks_form_new_description: 发布一个作业，作业提交方式可以是附件或者项目形式，在作业类型里面设置。
+  label_fork_form_new_description: 该需求将作为某课程的作业被发布，作业提交方式可以使附件或者项目形式，在作业类型里面设置。
   label_bids_new_money: 输入奖励金额，如 500,2.5等
   label_bids_new_credit: 输入该作业对应课程的学分，如 3,2.5等
   label_bids_new_content: 输入奖励内容，如 奖项，物品等
@@ -1535,6 +1536,7 @@ zh:
   label_course_new_homework: 新建作业
   label_course_homework_list: 作业列表
   label_course_homework_new: 发布作业
+  label_fork_homework_new: 选为作业
   label_course_data: 资料
   label_homework_statistics: 作业统计
   label_technical_title: 职称