From 2749c4f890d51ddf79256b88f95f1206330f5d6a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 8 May 2015 09:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=85=8D=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E8=A7=92=E8=89=B2=E6=94=B9=E4=B8=BA=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb              | 13 +++++++++++++
 app/views/courses/_course_members.html.erb |  2 +-
 app/views/courses/_member.html.erb         |  8 ++++----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 801d98b0b..babd8cb12 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -797,4 +797,17 @@ module CoursesHelper
     end
     result
   end
+
+  def zh_course_role role
+    if role == "TeachingAsistant"
+      result = l(:label_TA)
+    elsif role == "Teacher"
+      result = l(:label_teacher)
+    elsif role == "Student"
+      result = l(:label_student)
+    elsif role == "Manager"
+      result = l(:field_admin)
+    end
+    result
+  end
 end
diff --git a/app/views/courses/_course_members.html.erb b/app/views/courses/_course_members.html.erb
index 78dc6c319..9f15405dc 100644
--- a/app/views/courses/_course_members.html.erb
+++ b/app/views/courses/_course_members.html.erb
@@ -37,7 +37,7 @@
           <% @roles.each do |role| %>
               <li>
                 <%= radio_button_tag 'membership[role_ids][]', role.id, role.name == "学生" || role.name == "Student" %>
-                <label ><%= h role %></label>
+                <label ><%= zh_course_role(h role) %></label>
               </li>
           <% end %>
         </ul>
diff --git a/app/views/courses/_member.html.erb b/app/views/courses/_member.html.erb
index a4b5bae6e..40049f104 100644
--- a/app/views/courses/_member.html.erb
+++ b/app/views/courses/_member.html.erb
@@ -2,21 +2,21 @@
     <li >
       <%= link_to_user_header member.principal,true,:class => "w150 c_orange fl" %>
       <span class="w150 fl">
-        <%= h member.roles.sort.collect(&:to_s).join(', ') %>
+        <%= zh_course_role(h member.roles.sort.collect(&:to_s).join(', ')) %>
         <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
                               :method => :put,
                               :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
             ) do |f| %>
             <% @roles.each do |role| %>
-                <ul style="text-align: left;" class="ml20">
+                <ul style="text-align: left;" class="ml45">
                   <%= radio_button_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>
+                  <label ><%= zh_course_role(h role) %></label>
                 </ul>
                 <!--<br/>-->
             <% end %>
             <%= hidden_field_tag 'membership[role_ids][]', '' %>
-            <div class="ml20">
+            <div class="ml45">
               <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
                 <%= l(:button_change)%>
               </a>