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 13c35111..ed6c8516 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
@@ -7,7 +7,7 @@
       {{if _id}}
         <input id="${_id[0]}" name="${_id[1]}" type="hidden" value="${_id[2]}">
       {{/if}}
-      <h4><b></b> Q<span>${_length}</span> <i class="icon-caret-up"></i> <span class="questions-title">${_title_translations[3].en}</span></h4>
+      <h4><b></b> Q<span>${_length}</span> <i class="icon-caret-up"></i> <span class="questions-title">${_title_translations[3].<%= @primary_locale %>}</span></h4>
     </div>
     <div class="attributes-body">
       <div class="control-group">
@@ -15,11 +15,11 @@
         <div class="controls">
           <div class="input-append">
             <div class="tab-content">
-              <div class="tab-pane fade active in" id="${_title_translations[2]+'_en'}">
-                <input class="span4 q-title" id="${_title_translations[0]+'_en'}" name="${_title_translations[1]+'[en]'}" type="text" value="${_title_translations[3].en}" />
+              <div class="tab-pane fade active in" id="${_title_translations[2]+'_<%= @primary_locale %>'}">
+                <input class="span4 q-title" id="${_title_translations[0]+'_<%= @primary_locale %>'}" name="${_title_translations[1]+'[<%= @primary_locale %>]'}" type="text" value="${_title_translations[3].<%= @primary_locale %>}" />
               </div>
-              <div class="tab-pane fade" id="${_title_translations[2]+'_zh_tw'}">
-                <input class="span4 q-title" id="${_title_translations[0]+'_zh_tw'}" name="${_title_translations[1]+'[zh_tw]'}" type="text" value="${_title_translations[3].zh_tw}" />
+              <div class="tab-pane fade" id="${_title_translations[2]+'_<%= @secondary_locale %>'}">
+                <input class="span4 q-title" id="${_title_translations[0]+'_<%= @secondary_locale %>'}" name="${_title_translations[1]+'[<%= @secondary_locale %>]'}" type="text" value="${_title_translations[3].<%= @secondary_locale %>}" />
               </div>
             </div>
             <div class="btn-group" data-toggle="buttons-radio">
@@ -47,11 +47,11 @@
                 <a class="btn" href="${'#'+_description_translations[2]+'_zh_tw'}" data-toggle="tab"><%= I18nVariable.from_locale('zh_tw') %></a>
               <% end %>
             </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>
+            <div class="tab-pane fade active in" id="${_description_translations[2]+'_<%= @primary_locale %>'}">
+              <textarea class="resizable" id="${_description_translations[0]+'_<%= @primary_locale %>'}" name="${_description_translations[1]+'[<%= @primary_locale %>]'}" rows="3">${_description_translations[3].<%= @primary_locale %>}</textarea>
             </div>
-            <div class="tab-pane fade" id="${_description_translations[2]+'_zh_tw'}">
-              <textarea class="resizable" id="${_description_translations[0]+'_zh_tw'}" name="${_description_translations[1]+'[zh_tw]'}" rows="3">${_description_translations[3].zh_tw}</textarea>
+            <div class="tab-pane fade" id="${_description_translations[2]+'_<%= @secondary_locale %>'}">
+              <textarea class="resizable" id="${_description_translations[0]+'_<%= @secondary_locale %>'}" name="${_description_translations[1]+'[<%= @secondary_locale %>]'}" rows="3">${_description_translations[3].<%= @secondary_locale %>}</textarea>
             </div>
           </div>
         </div>
@@ -139,11 +139,11 @@
       <input type="hidden" class="should_destroy_option" name="${_destroy[0]}" />
     {{/if}}
     <div class="tab-content">
-      <div class="tab-pane fade active in" id="${_radiogroups[2]+'en'}">
-        <input type="text" class="span4" id="${_radiogroups[0]+'en'}" name="${_radiogroups[1]+'[en]'}" value="${_radiogroups[3].en}" />
+      <div class="tab-pane fade active in" id="${_radiogroups[2]+'<%= @primary_locale %>'}">
+        <input type="text" class="span4" id="${_radiogroups[0]+'<%= @primary_locale %>'}" name="${_radiogroups[1]+'[<%= @primary_locale %>]'}" value="${_radiogroups[3].<%= @primary_locale %>}" />
       </div>
-      <div class="tab-pane fade" id="${_radiogroups[2]+'zh_tw'}">
-        <input type="text" class="span4" id="${_radiogroups[0]+'zh_tw'}" name="${_radiogroups[1]+'[zh_tw]'}" value="${_radiogroups[3].zh_tw}" />
+      <div class="tab-pane fade" id="${_radiogroups[2]+'<%= @secondary_locale %>'}">
+        <input type="text" class="span4" id="${_radiogroups[0]+'<%= @secondary_locale %>'}" name="${_radiogroups[1]+'[<%= @secondary_locale %>]'}" value="${_radiogroups[3].<%= @secondary_locale %>}" />
       </div>
     </div>
     <div class="btn-group" data-toggle="buttons-radio">
@@ -161,11 +161,11 @@
        <input type="hidden" class="should_destroy_option" name="${_destroy[0]}" />
     {{/if}}
     <div class="tab-content">
-      <div class="tab-pane fade active in" id="${_option[2]+'en'}">
-        <input type="text" class="span4" id="${_option[0]+'en'}" name="${_option[1]+'[en]'}" value="${_option[3].en}" />
+      <div class="tab-pane fade active in" id="${_option[2]+'<%= @primary_locale %>'}">
+        <input type="text" class="span4" id="${_option[0]+'<%= @primary_locale %>'}" name="${_option[1]+'[<%= @primary_locale %>]'}" value="${_option[3].<%= @primary_locale %>}" />
       </div>
-      <div class="tab-pane fade" id="${_option[2]+'zh_tw'}">
-        <input type="text" class="span4" id="${_option[0]+'zh_tw'}" name="${_option[1]+'[zh_tw]'}" value="${_option[3].zh_tw}" />
+      <div class="tab-pane fade" id="${_option[2]+'<%= @secondary_locale %>'}">
+        <input type="text" class="span4" id="${_option[0]+'<%= @secondary_locale %>'}" name="${_option[1]+'[<%= @secondary_locale %>]'}" value="${_option[3].<%= @secondary_locale %>}" />
       </div>
     </div>
     <div class="btn-group" data-toggle="buttons-radio">