From 1c33e6481f8fb2a0c1492c42f1bf9d8c7ec211aa Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 27 Sep 2016 10:48:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98issue=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=8A=E5=85=B6=E5=8A=A8=E6=80=81=E7=9A=84=E7=9B=AE=E6=A0=87?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=94=B9=E4=B8=BA=E9=87=8C=E7=A8=8B=E7=A2=91?=
 =?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_attributes.html.erb          | 2 +-
 app/views/issues/_attributes_show.html.erb     | 2 +-
 app/views/issues/index.html.erb                | 6 +++---
 app/views/users/_project_issue_detail.html.erb | 2 +-
 config/locales/projects/zh.yml                 | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index 80c8ad185..f7d7b4d50 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -44,7 +44,7 @@
           <div class="cl"></div>
           <li>
             <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %>
-            <label class="label"><%= l(:field_fixed_version) %>：</label>
+            <label class="label"><%= l(:milestone) %>：</label>
                 <%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version),
                          {:include_blank => true, :required => @issue.required_attribute?('fixed_version_id'), :no_label => true},
                           :class => "w150" %>
diff --git a/app/views/issues/_attributes_show.html.erb b/app/views/issues/_attributes_show.html.erb
index 15160facb..7ff59fd9d 100644
--- a/app/views/issues/_attributes_show.html.erb
+++ b/app/views/issues/_attributes_show.html.erb
@@ -40,7 +40,7 @@
         <% end %>
         <div class="cl"></div>
         <% unless @issue.disabled_core_fields.include?('fixed_version_id') %>
-            <li><p class="label03" >&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %></span>
+            <li><p class="label03" >&nbsp;<%=l(:milestone)%>&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %></span>
             </li>
         <% end %>
         <div class="cl"></div>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index ec5849abd..8552a65b2 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -91,9 +91,9 @@
       <a href="<%= new_project_issue_path(@project)%>" class="sy_btn_green  fl mr10">新 增</a>
       <div class="issues_statistics fl">
         <ul>
-          <li>所有<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @project.project_score.issue_num %></a></li>
-          <li>开启<a href="javascript:void(0);" class="issues_greycirbg_btn "><%#= @issues_filter_assign_count %><%= @project.issues.where('status_id in (1,2,3,4,6)').visible.all.count  %></a></li>
-          <li>关闭<a href="javascript:void(0);" class="issues_greycirbg_btn "><%#= @issues_filter_author_count %><%= @project.issues.where(:status_id => 5 ).visible.all.count  %></a></li>
+          <li>所有<a  class="issues_greycirbg_btn "><%= @project.project_score.issue_num %></a></li>
+          <li>开启<a  class="issues_greycirbg_btn "><%#= @issues_filter_assign_count %><%= @project.issues.where('status_id in (1,2,3,4,6)').visible.all.count  %></a></li>
+          <li>关闭<a  class="issues_greycirbg_btn "><%#= @issues_filter_author_count %><%= @project.issues.where(:status_id => 5 ).visible.all.count  %></a></li>
         </ul>
       </div><!--issues_statistics end-->
       <a href="<%=project_issues_path(:project_id => @project, :format => 'xls')%>" class="hw_btn_blue  fr" alt="导出EXCEL">导出EXCEL</a>
diff --git a/app/views/users/_project_issue_detail.html.erb b/app/views/users/_project_issue_detail.html.erb
index 321ba663a..81df1500b 100644
--- a/app/views/users/_project_issue_detail.html.erb
+++ b/app/views/users/_project_issue_detail.html.erb
@@ -115,7 +115,7 @@
       <span class="proInfoP" style="width:100px;"><span><%= format_date(activity.due_date)? format_date(activity.due_date) : "--" %></span></span> </li>
     <div class="cl"></div>
     <li>
-      <p class="label03">&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p>
+      <p class="label03">&nbsp;<%=l(:milestone)%>&nbsp;&nbsp;:&nbsp;</p>
       <span class="proInfoP" style="width:100px;"><%= (activity.fixed_version ? link_to_user_version(activity.fixed_version) : "--") %> </span> </li>
     <div class="cl"></div>
   </ul>
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 3d5c26d45..1d44cffba 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -236,6 +236,7 @@ zh:
   # 自定义查询> 过滤器类别 
   field_status: 状态
   field_fixed_version: 目标版本
+  milestone: 里程碑
   field_assigned_to_role: 角色的成员
   field_category: 类别
   field_created_on: 创建于