From 8ec129f5591bb7f7e81d66c642898dc9190c826a Mon Sep 17 00:00:00 2001
From: saurabhbhatia <saurabh.a.bhatia@gmail.com>
Date: Fri, 27 Sep 2013 14:33:19 +0800
Subject: [PATCH] Updated order for zh_tw translation

---
 .../member/front_end/member_lists/_show_office_field.html.erb   | 2 +-
 .../member/front_end/member_lists/_show_research_field.html.erb | 2 +-
 .../panel/member/front_end/member_lists/_show_roles.html.erb    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_office_field.html.erb b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_office_field.html.erb
index ec26550a9..bd70d5c0e 100644
--- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_office_field.html.erb
+++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_office_field.html.erb
@@ -14,7 +14,7 @@
                   %>
 
                     <tr>
-                    <% if rf.title == "Office"%>
+                    <% if (rf.title == "Office" || rf.title == "研究室")%>
                       <td><%= rf.title %></td>
                       <td><%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
                       </tr>
diff --git a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_research_field.html.erb b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_research_field.html.erb
index 364ea1463..bc93c7524 100644
--- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_research_field.html.erb
+++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_research_field.html.erb
@@ -14,7 +14,7 @@
                   %>
 
                     <tr>
-                    <% if rf.title == "Research Field"%>
+                    <% if (rf.title == "Research Field"|| rf.title == "研究領域")%>
                       <td><%= rf.title %></td>
                       <td><%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
                       </tr>
diff --git a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_roles.html.erb b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_roles.html.erb
index 710e22a86..7fee0d91d 100644
--- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_roles.html.erb
+++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_roles.html.erb
@@ -38,7 +38,7 @@
                   %>
 
                     <tr>
-                    <% if (rf.title != "Research Field" && rf.title != "Office")%>
+                    <% if (rf.title == "Academic Position" || rf.title == "職稱")%>
                       <td><%= rf.title %></td>
                       <td><%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
                       </tr>