From 638add3e493f3e89947ed3858ef256ded92846a1 Mon Sep 17 00:00:00 2001
From: Bernie Chiu <bernie_chiu@hotmail.com>
Date: Fri, 20 Dec 2013 12:32:53 +0800
Subject: [PATCH] Fix question tab translation

Conflicts:
	vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb
---
 .../back_end/surveys/_questions.html.erb       | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb
index bd61bc2f..849260a2 100644
--- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb
+++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb
@@ -23,13 +23,8 @@
               </div>
             </div>
             <div class="btn-group" data-toggle="buttons-radio">
-              <% if I18n.locale == :zh_tw %>
-                <a class="btn change-title active" href="${'#'+_title_translations[2]+'_zh_tw'}" data-toggle="tab"><%= I18nVariable.from_locale('zh_tw') %></a>
-                <a class="btn change-title" href="${'#'+_title_translations[2]+'_en'}" data-toggle="tab"><%= I18nVariable.from_locale('en') %></a>
-              <% else %>
-                <a class="btn change-title active" href="${'#'+_title_translations[2]+'_en'}" data-toggle="tab"><%= I18nVariable.from_locale('en') %></a>  
-                <a class="btn change-title" href="${'#'+_title_translations[2]+'_zh_tw'}" data-toggle="tab"><%= I18nVariable.from_locale('zh_tw') %></a>            
-              <% end %>
+              <a class="btn change-title active" href="${'#'+_title_translations[2]+'_en'}" data-toggle="tab"><%= I18nVariable.from_locale('en') %></a>
+              <a class="btn change-title" href="${'#'+_title_translations[2]+'_zh_tw'}" data-toggle="tab"><%= I18nVariable.from_locale('zh_tw') %></a>
             </div>
           </div>
         </div>
@@ -39,13 +34,8 @@
         <div class="controls">
           <div class="tab-content textarea-lang">
             <div class="btn-group" data-toggle="buttons-radio">
-              <% if I18n.locale == :zh_tw %>
-                <a class="btn active" href="${'#'+_description_translations[2]+'_zh_tw'}" data-toggle="tab"><%= I18nVariable.from_locale('zh_tw') %></a>
-                <a class="btn" href="${'#'+_description_translations[2]+'_en'}" data-toggle="tab"><%= I18nVariable.from_locale('en') %></a>
-              <% else %>
-                <a class="btn active" href="${'#'+_description_translations[2]+'_en'}" data-toggle="tab"><%= I18nVariable.from_locale('en') %></a>
-                <a class="btn" href="${'#'+_description_translations[2]+'_zh_tw'}" data-toggle="tab"><%= I18nVariable.from_locale('zh_tw') %></a>
-              <% end %>
+              <a class="btn active" href="${'#'+_description_translations[2]+'_en'}" data-toggle="tab"><%= I18nVariable.from_locale('en') %></a>
+              <a class="btn" href="${'#'+_description_translations[2]+'_zh_tw'}" data-toggle="tab"><%= I18nVariable.from_locale('zh_tw') %></a>
             </div>
             <div class="tab-pane fade active in" id="${_description_translations[2]+'_en'}">
               <textarea class="resizable" id="${_description_translations[0]+'_en'}" name="${_description_translations[1]+'[en]'}" rows="3">${_description_translations[3].en}</textarea>