From 971c278de57be2ac52d1a0f89d74d270747ad566 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 12 Mar 2015 17:02:47 +0800
Subject: [PATCH] =?UTF-8?q?=20#2026=20=E4=BD=9C=E4=B8=9A=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4->=E6=88=AA=E8=87=B3=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index 1009f405f..6b3f91587 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -172,9 +172,9 @@
             <tr>
                 <td style="text-align: left" colspan="2">
                   <span class="font_lighter">
-                    <%= l(:label_create_time) %>
+                    <%= l(:label_end_time) %>
                     :&nbsp;
-                    <%=format_time bid.created_on %>
+                    <%= bid.deadline %>
                   </span>
                   <span style="float: right">
                   <% if betweentime(bid.deadline) < 0 %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 82caa1a96..94e8cf31e 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2081,4 +2081,5 @@ zh:
   label_recently_updated_message: 最近更新了留言
   label_recently_updated_courseware: 最近更新了课件
   label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！
+  label_end_time: 截止时间