From 54908423bceca3748cf3cc196bffb4895c823c3b Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Fri, 27 Mar 2015 17:00:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B--=E4=BD=9C=E4=B8=9A=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98;=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E8=B7=9F=E8=B8=AA=E9=99=84=E4=BB=B6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_links.html.erb    | 6 ++----
 app/views/layouts/base_homework.html.erb | 2 +-
 config/locales/projects/en.yml           | 4 ++++
 config/locales/projects/zh.yml           | 6 ++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index 4c2ee0c8f..02c7ba4dc 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -9,7 +9,7 @@
         <% if options[:length] %>
           <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%>
         <% else %>
-          <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
+          <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true, :length => 32 -%>
         <% end %>
       </span>
   <%if is_float%>
@@ -26,9 +26,7 @@
   <span title="<%= attachment.description%>">
     <%= h(truncate(" - #{attachment.description}", length: options[:length] ? options[:length]:15, omission: '...')) unless attachment.description.blank? %>
   </span>
-  <span class="size">(
-    <%= number_to_human_size attachment.filesize %>)
-  </span>
+  <span class="size">(<%= number_to_human_size attachment.filesize , :precision => 0 %>)</span>
   <% if options[:deletable] %>
   	<% if attachment.container_type == 'HomeworkAttach' %>
     <%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'delete_homework', :id => attachment.id},
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
index a858c045e..bb7b18a4a 100644
--- a/app/views/layouts/base_homework.html.erb
+++ b/app/views/layouts/base_homework.html.erb
@@ -178,7 +178,7 @@
                             </tr>
                             <tr>
                               <td valign="top" colspan="2">
-                                <% options = {:author => true,:deletable => (@bid.author.id == User.current.id || User.current.admin? ? true : false),:wrap => true,:length => 7} %>
+                                <% options = {:author => true,:deletable => (@bid.author.id == User.current.id || User.current.admin? ? true : false),:wrap => true,:length => 15} %>
                                 <%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %>
                               </td>
                             </tr>
diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml
index 94344a8d6..9eadfc46f 100644
--- a/config/locales/projects/en.yml
+++ b/config/locales/projects/en.yml
@@ -136,7 +136,11 @@ en:
   #  项目托管平台
   #
   #  问题跟踪
+  label_issues_sum: 'Total'
+  lable_issues_undo: 'Unresolved：'
   label_successful_create: Successfully created
+  
+  
   #  
 
 
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 880727bd9..9f1a95201 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -49,8 +49,7 @@ zh:
   
   label_issue_tracking: 问题跟踪
   label_release_issue: 发布问题
-  label_issues_sum: 问题总数：
-  lable_issues_undo: 未解决：
+
 
   project_module_boards: 讨论区
   project_module_boards_post: 发帖
@@ -144,6 +143,9 @@ zh:
   #
   #  问题跟踪
   label_successful_create: 创建成功
+  label_issues_sum: '问题总数'
+  lable_issues_undo: '未解决：'
+ 
   #