From 3df8a9940816806dbcfc7a7bbecb32b9474c4780 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 8 May 2015 09:12:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=AD=E6=96=87=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=88=90=E5=91=98=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/invite_members.html.erb    | 14 +++++-
 .../projects/settings/_new_members.html.erb   | 43 +++++++++++++++++--
 2 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb
index ad6148d5a..d30ecd8e4 100644
--- a/app/views/projects/invite_members.html.erb
+++ b/app/views/projects/invite_members.html.erb
@@ -33,8 +33,18 @@
                   </li>
                   <% roles.each do |role| %>
                   <li class="fl mr5">
-                     <%= check_box_tag 'membership[role_ids][]', role.id %>
-                     <%= h role %>
+                    <%= check_box_tag 'membership[role_ids][]', role.id %>
+                    <% if User.current.language == "zh" %>
+                        <% if role.id == 3 %>
+                            <label >管理人员</label>
+                        <% elsif role.id == 4 %>
+                            <label >开发人员</label>
+                        <% else %>
+                            <label >报告人员</label>
+                        <% end %>
+                    <% else %>
+                        <label ><%= h role %></label>
+                    <% end %>
                   </li>
                   <% end %>
                 </ul>
diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index 2cdcd4cf5..56f583f16 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -18,7 +18,23 @@
             <li >
               <%= link_to_user_header member.principal,false,:class => "w140_h c_setting_blue fl" %>
               <span class="w180_h fl">
-              <%= h member.roles.sort.collect(&:to_s).join(', ') %>
+              <!--区分中英文角色显示的不同-->
+              <% if User.current.language == "zh" %>
+                <% zh_roles = [] %>
+                <% member.roles.each do |role| %>
+                    <% if role.id == 3
+                       zh_roles << "管理人员"
+                    elsif role.id == 4
+                       zh_roles << "开发人员"
+                    else
+                       zh_roles << "报告人员"
+                    end
+                 %>
+                <% end %>
+                    <%= h zh_roles.sort.reverse.collect(&:to_s).join(', ') %>
+              <% else %>
+                <%= h member.roles.sort.collect(&:to_s).join(', ') %>
+              <% end %>
               <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
                                 :method => :put,
                                 :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
@@ -27,7 +43,18 @@
                 <ul style="text-align: left;" >
                   <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                     :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %>
-                  <label ><%= h role %></label>
+                 <!--编辑时候显示成员，中英文切换后面需从数据库的角度优化-->
+                  <% if User.current.language == "zh" %>
+                      <% if role.id == 3 %>
+                          <label >管理人员</label>
+                      <% elsif role.id == 4 %>
+                          <label >开发人员</label>
+                      <% else %>
+                          <label >报告人员</label>
+                      <% end %>
+                  <% else %>
+                      <label ><%= h role %></label>
+                  <% end %>
                 </ul>
                 <!--<br/>-->
               <% end %>
@@ -107,7 +134,17 @@
               <% roles.each do |role| %>
                   <li>
                     <%= check_box_tag 'membership[role_ids][]', role.id %>
-                    <label ><%= h role %></label>
+                    <% if User.current.language == "zh" %>
+                        <% if role.id == 3 %>
+                            <label >管理员</label>
+                        <% elsif role.id == 4 %>
+                            <label >开发人员</label>
+                        <% else %>
+                            <label >报告人员</label>
+                        <% end %>
+                    <% else %>
+                        <label ><%= h role %></label>
+                    <% end %>
                   </li>
               <% end %>
             </ul>