add sitmap submenu chinese translation as well

Conflicts:
	config/locales/en.yml

app/controllers/front_controller.rb

@@ -17,7 +17,7 @@ class FrontController < ApplicationController
     @url = "/#{@name}" if @name.present?
 
     if (!@site.enable_terms_of_use && @page.first.present?)
-      render :text => (@site.footer + "<a href='#{@url}'>Terms of Use</a>")
+      render :text => (@site.footer + "<a href='#{@url}'>#{t(:terms_of_use)}</a>")
     else
       render :text => @site.footer
     end
@@ -35,7 +35,7 @@ class FrontController < ApplicationController
     @url = "/#{@name}"
     
     if (!@site.sitemap_menu_in_header && @page.first.present?)
-      render :text => (@site.sub_menu + "<a href='#{@url}'>Sitemap</a>")
+      render :text => (@site.sub_menu + "<a href='#{@url}'>#{t(:sitemap)}</a>")
     else
       render :text => @site.sub_menu
     end

app/views/admin/items/_site_bar.html.erb

@@ -3,22 +3,22 @@
 	<div id="sidebar-menu">
 		<div class="scroller">
 			<ul class="sidebar-nav no-sub-nav">
-				<li title="Structure"><%= link_to admin_items_path do %><span><i class="icons-flow-tree"></i></span><%end%></li>
+				<li title="<%= t('site_structure') %>"><%= link_to admin_items_path do %><span><i class="icons-flow-tree"></i></span><%end%></li>
 
-				<li title="Site Map"><%= link_to admin_site_sitemap_path(@site), :class => active_for_action('sites', 'sitemap') do %><span><i class="icons-directions"></i></span><%end%></li>
+				<li title="<%= t('site_map') %>"><%= link_to admin_site_sitemap_path(@site), :class => active_for_action('sites', 'sitemap') do %><span><i class="icons-directions"></i></span><%end%></li>
 
-				<li title="Modules"><%= link_to admin_module_store_path, :class => active_for_action('module_store', 'index') do %><span><i class="icons-layout"></i></span><%end%></li>
+				<li title="<%= t('modules') %>"><%= link_to admin_module_store_path, :class => active_for_action('module_store', 'index') do %><span><i class="icons-layout"></i></span><%end%></li>
 
-				<li title="Templates"><%= link_to admin_designs_path, :class => active_for_action('template_store', 'index') do %><span><i class="icons-brush"></i></span><%end%></li>
+				<li title="<%= t('templates') %>"><%= link_to admin_designs_path, :class => active_for_action('template_store', 'index') do %><span><i class="icons-brush"></i></span><%end%></li>
 
 
-				<li title="Site Info"><%= link_to admin_site_site_info_path(@site), :class => active_for_action('sites', 'site_info') do %><span><i class="icons-browser"></i></span><%end%></li>
+				<li title="<%= t('site_info') %>"><%= link_to admin_site_site_info_path(@site), :class => active_for_action('sites', 'site_info') do %><span><i class="icons-browser"></i></span><%end%></li>
 
-				<li title="Mobile Setting"><%= link_to admin_site_responsive_setting_path(@site), :class => active_for_action('sites', 'responsive_setting') do %><span><i class="icons-mobile"></i></span><%end%></li>
+				<li title="<%= t('mobile_setting') %>"><%= link_to admin_site_responsive_setting_path(@site), :class => active_for_action('sites', 'responsive_setting') do %><span><i class="icons-mobile"></i></span><%end%></li>
 
-				<li title="Search Engine"><%= link_to admin_site_search_engine_path(@site), :class => active_for_action('sites', 'search_engine') do %><span><i class="icons-search"></i></span><%end%></li>
+				<li title="<%= t('search_engine') %>"><%= link_to admin_site_search_engine_path(@site), :class => active_for_action('sites', 'search_engine') do %><span><i class="icons-search"></i></span><%end%></li>
 
-				<li title="Preference"><%= link_to admin_site_preference_path(@site), :class => active_for_action('sites', 'preference') do %><span><i class="icons-cog"></i></span><%end%></li>
+				<li title="<%= t('preference') %>"><%= link_to admin_site_preference_path(@site), :class => active_for_action('sites', 'preference') do %><span><i class="icons-cog"></i></span><%end%></li>
 
 <!-- 				<li title="System Info"><a href="/orbit_4.0.1/admin/system_info/index.shtml?sidebarNavList=8&amp;subNavBlockList=0"><span><i class="icons-info-2"></i></span></a></li>
  -->			</ul>

app/views/admin/sites/_side_bar.html.erb

@@ -3,22 +3,22 @@
 	<div id="sidebar-menu">
 		<div class="scroller">
 			<ul class="sidebar-nav no-sub-nav">
-				<li title="Structure"><%= link_to admin_items_path do %><span><i class="icons-flow-tree"></i></span><%end%></li>
+				<li title="<%= t('site_structure') %>"><%= link_to admin_items_path do %><span><i class="icons-flow-tree"></i></span><%end%></li>
 
-				<li title="Site Map"><%= link_to admin_site_sitemap_path(@site), :class => active_for_action('sites', 'sitemap') do %><span><i class="icons-directions"></i></span><%end%></li>
+				<li title="<%= t('site_map') %>"><%= link_to admin_site_sitemap_path(@site), :class => active_for_action('sites', 'sitemap') do %><span><i class="icons-directions"></i></span><%end%></li>
 
-				<li title="Modules"><%= link_to admin_module_store_path, :class => active_for_action('module_store', 'index') do %><span><i class="icons-layout"></i></span><%end%></li>
+				<li title="<%= t('modules') %>"><%= link_to admin_module_store_path, :class => active_for_action('module_store', 'index') do %><span><i class="icons-layout"></i></span><%end%></li>
 
-				<li title="Templates"><%= link_to admin_designs_path, :class => active_for_action('template_store', 'index') do %><span><i class="icons-brush"></i></span><%end%></li>
+				<li title="<%= t('templates') %>"><%= link_to admin_designs_path, :class => active_for_action('template_store', 'index') do %><span><i class="icons-brush"></i></span><%end%></li>
 
 
-				<li title="Site Info"><%= link_to admin_site_site_info_path(@site), :class => active_for_action('sites', 'site_info') do %><span><i class="icons-browser"></i></span><%end%></li>
+				<li title="<%= t('site_info') %>"><%= link_to admin_site_site_info_path(@site), :class => active_for_action('sites', 'site_info') do %><span><i class="icons-browser"></i></span><%end%></li>
 
-				<li title="Mobile Setting"><%= link_to admin_site_responsive_setting_path(@site), :class => active_for_action('sites', 'responsive_setting') do %><span><i class="icons-mobile"></i></span><%end%></li>
+				<li title="<%= t('mobile_setting') %>"><%= link_to admin_site_responsive_setting_path(@site), :class => active_for_action('sites', 'responsive_setting') do %><span><i class="icons-mobile"></i></span><%end%></li>
 
-				<li title="Search Engine"><%= link_to admin_site_search_engine_path(@site), :class => active_for_action('sites', 'search_engine') do %><span><i class="icons-search"></i></span><%end%></li>
+				<li title="<%= t('search_engine') %>"><%= link_to admin_site_search_engine_path(@site), :class => active_for_action('sites', 'search_engine') do %><span><i class="icons-search"></i></span><%end%></li>
 
-				<li title="Preference"><%= link_to admin_site_preference_path(@site), :class => active_for_action('sites', 'preference') do %><span><i class="icons-cog"></i></span><%end%></li>
+				<li title="<%= t('preference') %>"><%= link_to admin_site_preference_path(@site), :class => active_for_action('sites', 'preference') do %><span><i class="icons-cog"></i></span><%end%></li>
 
 <!-- 				<li title="System Info"><a href="/orbit_4.0.1/admin/system_info/index.shtml?sidebarNavList=8&amp;subNavBlockList=0"><span><i class="icons-info-2"></i></span></a></li>
  -->			</ul>

app/views/admin/sites/preference.html.erb

@@ -19,22 +19,22 @@
 
             <!-- Input Area -->
             <div class="input-area">
-              <div class="nav-name"><strong>Classification</strong></div>    
+              <div class="nav-name"><strong><%= t('preferences.classification') %></strong></div>
               <ul class="nav nav-pills language-nav">
                 <li class="active">
-                  <a href="#sidebar-nav" data-toggle="tab">Sidebar Nav</a>
+                  <a href="#sidebar-nav" data-toggle="tab"><%= t('preferences.sidebar_nav') %></a>
                 </li>
                 <li>
-                  <a href="#system-email" data-toggle="tab">System Email</a>
+                  <a href="#system-email" data-toggle="tab"><%= t('preferences.system_email') %></a>
                 </li>
                 <li>
-                  <a href="#openness" data-toggle="tab">Openness</a>
+                  <a href="#openness" data-toggle="tab"><%= t('preferences.openness') %></a>
                 </li>
                 <li>
-                  <a href="#language-set" data-toggle="tab">Language</a>
+                  <a href="#language-set" data-toggle="tab"><%= t('preferences.language') %></a>
                 </li>
                 <li>
-                  <a href="#orbitBar-them" data-toggle="tab">OrbitBar Theme</a>
+                  <a href="#orbitBar-them" data-toggle="tab"><%= t('preferences.orbitbar_theme') %></a>
                 </li>
               </ul>
               
@@ -43,7 +43,7 @@
                 <!-- Sidebar Nav -->
                 <div id="sidebar-nav" class="tab-pane fade in active">
                   <div class="control-group">
-                    <label class="control-label muted">Enable Sidebar Sub Nav</label>
+                    <label class="control-label muted"><%= t("preferences.nav_enabled") %></label>
                     <div class="controls">
                       <input type="checkbox" class="toggle-check set-sidebar-state" data-disabled="true">
                     </div>
@@ -59,13 +59,13 @@
                   <div class="control-group">
                     <label class="control-label muted"><%= t 'mail.address' %></label>
                     <div class="controls">
- 						<%= f.text_field :address, :value => (@site['site_settings']['address'] rescue nil), :class=>"input-large", :placeholder=>"Email Address" %>
+            <%= f.text_field :address, :value => (@site['site_settings']['address'] rescue nil), :class=>"input-large", :placeholder=>"Email Address" %>
                     </div>
                   </div>
                   <div class="control-group">
                     <label class="control-label muted"><%= t 'mail.domain' %></label>
                     <div class="controls">
-						<%= f.text_field :port, :value => (@site['site_settings']['port'] rescue nil), :class=>"input-large", :placeholder=>"Domain" %>
+            <%= f.text_field :port, :value => (@site['site_settings']['port'] rescue nil), :class=>"input-large", :placeholder=>"Domain" %>
                     </div>
                   </div>
                   <div class="control-group">
@@ -77,7 +77,7 @@
                   <div class="control-group">
                     <label class="control-label muted"><%= t 'mail.user_name' %></label>
                     <div class="controls">
-                  	  <%= f.text_field :user_name, :value => (@site['site_settings']['user_name'] rescue nil), :class=>"input-large", :placeholder=>"User Name"  %>
+                      <%= f.text_field :user_name, :value => (@site['site_settings']['user_name'] rescue nil), :class=>"input-large", :placeholder=>"User Name"  %>
                     </div>
                   </div>
                   <div class="control-group">
@@ -95,13 +95,13 @@
                   <div class="control-group">
                     <label class="control-label muted"><%= t 'mail.tls' %></label>
                     <div class="controls">
-             		  <%= f.check_box :tls, :checked => (@site['site_settings']['tls'].eql?('1') rescue false),:class=>"toggle-check", :data=> {  disabled: true } %>
+                  <%= f.check_box :tls, :checked => (@site['site_settings']['tls'].eql?('1') rescue false),:class=>"toggle-check", :data=> {  disabled: true } %>
                     </div>
                   </div>
                   <div class="control-group">
                     <label class="control-label muted"><%= t 'mail.enable_starttls_auto' %></label>
                     <div class="controls">
-               		 <%= f.check_box 'enable_starttls_auto', :checked => (@site['site_settings']['enable_starttls_auto'].eql?('1') rescue false), :class=>"toggle-check", :data=> {  disabled: true } %>
+                   <%= f.check_box 'enable_starttls_auto', :checked => (@site['site_settings']['enable_starttls_auto'].eql?('1') rescue false), :class=>"toggle-check", :data=> {  disabled: true } %>
                     </div>
                   </div>
 
@@ -114,15 +114,15 @@
                   <div class="control-group">
                     <label class="control-label muted"><%= I18n.t('site.frontend_open')%></label>
                     <div class="controls">
-                   	  <%= f.check_box :frontend_open , :class=>"toggle-check", :data=> {  disabled: true } %>
-                      <span class="help-block">If Checked, the frontend will be open for all users.</span>
+                      <%= f.check_box :frontend_open , :class=>"toggle-check", :data=> {  disabled: true } %>
+                      <span class="help-block"><%= t("preferences.frontend_open") %></span>
                     </div>
                   </div>
                   <div class="control-group">
                     <label class="control-label muted"><%= I18n.t('site.backend_openness_on') %></label>
                     <div class="controls">
                       <%= f.check_box :backend_openness_on , :class=>"toggle-check", :data=> { disabled: true } %>
-                      <span class="help-block">All users can visit backend pages</span>
+                      <span class="help-block"><%= t("preferences.backend_open") %></span>
                     </div>
                   </div>
                   <div class="control-group">
@@ -143,7 +143,7 @@
                   </div> -->
                   <!-- Terms of Use -->
                   <div class="control-group">
-                    <label class="control-label muted">Enable User Language Detection
+                    <label class="control-label muted"><%= t('preferences.lang_detection') %>
                     </label>
                     <div class="controls">
                       <%= f.check_box :enable_language_detection, :class => "toggle-check reset_default_locale", data: {disabled: true} %> 
@@ -151,16 +151,16 @@
                   </div>
 
                   <div class="control-group">
-                    <label class="control-label muted">Enable Language</label>
+                    <label class="control-label muted"><%= t('preferences.lang_enabled') %></label>
                     <div class="controls">
                      <% @site_valid_locales.each do |valid_locale| %>
                       <%= check_box_tag "site[in_use_locales][]", valid_locale, @site.in_use_locales.include?(valid_locale), :class=>"toggle-check in_use_locales", :data => { :title => "#{I18nVariable.from_locale(valid_locale)}", disabled: true }, "data-deploy"=>"inline" %>
-					            <% end %>
+                      <% end %>
                     </div>
                   </div>
 
                   <div class="control-group">
-                    <label class="control-label muted">Default Language</label>
+                    <label class="control-label muted"><%= t('preferences.lang_default') %></label>
                     <div class="controls">
                      <% @site_in_use_locales.each do |locale| %>
                       <%= radio_button_tag "site[default_locale]", locale, @locale == locale ,:class=>"toggle-check", :data => { :title => "#{I18nVariable.from_locale(locale)}" }, "data-deploy"=>"inline", :checked => (@site.default_locale.eql?("#{locale}")) %>
@@ -173,36 +173,36 @@
                 <!-- OrbitBar Them -->
                 <div id="orbitBar-them" class="tab-pane fade">
                   <div class="control-group">
-                    <label class="control-label muted">OrbitBar Logo Icon</label>
+                    <label class="control-label muted">OrbitBar Logo <%= t('preferences.icon') %></label>
                     <div class="controls">
                       <!-- if this page editing please add class "fileupload-edit" -->
                       <div class="fileupload fileupload-new clearfix" data-provides="fileupload">
                         <div class="fileupload-new thumbnail pull-left" style="background:black;">
                         <% if @site.default_image.file.present? %>
-                   		   <%= image_tag( @site.default_image, :size=>"120x120") rescue ''%>
-                	      <% else %>
+                         <%= image_tag( @site.default_image, :size=>"120x120") rescue ''%>
+                        <% else %>
                          <%= image_tag "orbit-logo.png",:class => "pull-left upload-picture"%>
-                 	      <% end %>
+                        <% end %>
                         </div>
                         <div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
                         <% if @site.default_image.file.present?%>
                         <span class="btn btn-file">
-                         <%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Change
+                         <%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('mobile_setting.change') %>
                          </span>
                           <%= f.check_box :remove_default_image %>
-                          Remove OrbitBar Logo
+                          <%= t(:remove) %> OrbitBar Logo
                          <%else%>
                         <span class="btn btn-file">
-                         <%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Select Image
+                         <%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('mobile_setting.select_image') %>
                          </span>
                          <%end%>
-                        <a href="#" class="btn fileupload-exists" data-dismiss="fileupload">Cancel</a>
+                        <a href="#" class="btn fileupload-exists" data-dismiss="fileupload"><%= t(:cancel) %></a>
                       
                       </div>
                     </div>
 
                     <div class="control-group">
-                    <label class="control-label muted">Orbit Favicon</label>
+                    <label class="control-label muted">Orbit <%= t('preferences.favicon') %></label>
                     <div class="controls">
                       <!-- if this page editing please add class "fileupload-edit" -->
                       <div class="fileupload fileupload-new clearfix" data-provides="fileupload">
@@ -216,17 +216,17 @@
                         <div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
                         <% if @site.favicon.file.present?%>
                          <span class="btn btn-file">
-                         <%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Change
+                         <%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('mobile_setting.change') %>
                         </span>
                             <%= f.check_box :remove_favicon %>
-                            Remove Favicon
+                            <%= t(:remove) %> <%= t('preferences.favicon') %>
                          <%else%>
                         <span class="btn btn-file">
-                         <%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Select Image
+                         <%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('mobile_setting.select_image') %>
                          </span>
                          <%end%>
 
-                        <a href="#" class="btn fileupload-exists" data-dismiss="fileupload">Cancel</a>
+                        <a href="#" class="btn fileupload-exists" data-dismiss="fileupload"><%= t(:cancel) %></a>
                       
                       </div>
                     </div>

app/views/admin/sites/responsive_setting.html.erb

@@ -23,12 +23,12 @@
                 <label class="control-label muted"><%= I18n.t('site.mobile_version')%></label>
                 <div id="mobile-site" class="controls">
                   <%= f.check_box :mobile_on , :class=>"toggle-check", :data=> { disabled: true } %>
-                  <span class="help-block"><%= t("mobile_setting.enabled_reminder") %></span>
+                  <span class="help-block">Enable Mobile Website</span>
                 </div>
               </div>
 
               <div class="control-group">
-                <label class="control-label muted"><%= t("mobile_setting.select_announcement_categories") %></label>
+                <label class="control-label muted">Select Announcement Categories</label>
                 <div class="controls">
                   <% @module.categories.each do |category| %>
                     <%= check_box_tag "site[announcement_category][]", category.id.to_s, (@site.announcement_category.include?(category) rescue false), :class=>"toggle-check", :data => { :title => "#{category.title}", disabled: true }, "data-deploy"=>"inline", :checked => (@site.announcement_category.include?(category.id.to_s)) %>
@@ -38,7 +38,7 @@
 
 
              <div class="control-group">
-                    <label class="control-label muted"><%= t("mobile_setting.mobile_site_icon") %></label>
+                    <label class="control-label muted">Mobile Site Icon</label>
                     <div class="controls">
                       <!-- if this page editing please add class "fileupload-edit" -->
                       <div class="fileupload fileupload-new clearfix" data-provides="fileupload">
@@ -52,32 +52,32 @@
                         <div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
                         <% if @site.mobile_icon.present?%>
                         <span class="btn btn-file">
-                         <%= f.file_field :mobile_icon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t("mobile_setting.change") %>
+                         <%= f.file_field :mobile_icon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Change
                          </span>
                           <%= f.check_box :remove_mobile_icon %>
-                          <%= t("mobile_setting.remove_icon") %>
+                          Remove Icon
                          <%else%>
                         <span class="btn btn-file">
-                         <%= f.file_field :mobile_icon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t("mobile_setting.select_image") %>
+                         <%= f.file_field :mobile_icon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Select Image
                          </span>
                          <%end%>
-                        <a href="#" class="btn fileupload-exists" data-dismiss="fileupload"><%= t(:cancel) %></a>
+                        <a href="#" class="btn fileupload-exists" data-dismiss="fileupload">Cancel</a>
                       
                       </div>
                     </div>
 
                <div class="control-group">
-                <label class="control-label muted"><%= t("mobile_setting.select_orbit_bar_color") %></label>
+                <label class="control-label muted">Select Orbit Bar Color</label>
                 <div class="controls">
                  <input type="text" value="<%= (@site.mobile_bar_color.nil? ? '#FFFFF' : @site.mobile_bar_color[0]) %>" class="color-picker" name="site[mobile_bar_color][]" <%= (@site.mobile_bar_color.nil? ? "disabled='disabled'" : "") %> />
                  <input type="text" value="<%= (@site.mobile_bar_color.nil? ? '#FFFFF' : @site.mobile_bar_color[1]) %>" class="color-picker" name="site[mobile_bar_color][]" <%= (@site.mobile_bar_color.nil? ? "disabled='disabled'" : "") %> />
-                 <%= t("mobile_setting.or") %>
-                 <input type="checkbox" <%= (@site.mobile_bar_color.nil? ? "checked='checked'" : "") %> name="site[default_bar_color]" id="default_bar_color" style="margin:0 0 3px 10px;" /> <%= t("mobile_setting.default_color") %>
+                 OR
+                 <input type="checkbox" <%= (@site.mobile_bar_color.nil? ? "checked='checked'" : "") %> name="site[default_bar_color]" id="default_bar_color" style="margin:0 0 3px 10px;" /> Default Color
                 </div>
               </div>
 
               <div class="control-group">
-                <label class="control-label muted"><%= t("mobile_setting.phone_number") %></label>
+                <label class="control-label muted">Phone Number</label>
                 <div class="controls">
                   <div id="phone_number_wrap" style="line-height: 40px;">
                     <% @site.phone_number.each_with_index do |phone,i| %>
@@ -96,7 +96,7 @@
                 </div>
 
               <div class="control-group">
-                <label class="control-label muted"><%= t("mobile_setting.address") %></label>
+                <label class="control-label muted">Address</label>
                 <div class="controls">
                   <div class="textarea">
                       <%= f.text_area :address, :class => "ckeditor input-block-level", :value => (@site.address rescue nil) %>
@@ -108,7 +108,7 @@
                 <label class="control-label muted"><%= I18n.t('site.mobile_api_openness_on') %></label>
                 <div class="controls">
                   <%= f.check_box :mobile_api_openness_on , :class=>"toggle-check", :data=> { disabled: true } %>
-                  <span class="help-block"><%= t("mobile_setting.api_reminder") %></span>
+                  <span class="help-block">Make API available for Mobile Apps</span>
                 </div>
               </div>                    
 

app/views/admin/sites/search_engine.html.erb

@@ -25,7 +25,7 @@
 
               <!-- Title-->
               <div class="control-group input-title">
-                <label class="control-label muted">Google Search Syntax</label>
+                <label class="control-label muted"><%= t("search_engine.syntax") %></label>
                 <div class="controls">
                   <%= text_field_tag 'site[search][sitesearch]',(@site.search["sitesearch"] rescue nil),{ :class => "input-block-level" ,:placeholder => t("search.sitesearch") }%>
                 </div>
@@ -33,7 +33,7 @@
 
               <!-- CKeditor Site Header -->
               <div class="control-group input-content">
-                <label class="control-label muted">Google Analytics Code</label>
+                <label class="control-label muted"><%= t("search_engine.anaytics_code") %></label>
                 <div class="controls">
                   <div class="textarea">
                     <%= f.text_area :google_analytics, :class => "input-block-level"%>
@@ -45,7 +45,7 @@
 
                <!-- Description -->
         <div class="control-group">
-          <label class="control-label muted">Keywords</label>
+          <label class="control-label muted"><%= t("search_engine.keywords") %></label>
           <div class="controls">
             <div class="tab-content textarea-lang">
               <div class="btn-group" data-toggle="buttons-radio">
@@ -65,7 +65,7 @@
         </div>
 
         <div class="control-group">
-          <label class="control-label muted">Description</label>
+          <label class="control-label muted"><%= t("search_engine.description") %></label>
           <div class="controls">
             <div class="tab-content textarea-lang">
               <div class="btn-group" data-toggle="buttons-radio">

app/views/admin/sites/site_info.html.erb

@@ -44,12 +44,12 @@
                   <% end %>
                  <% end %>
 
-                  <!-- Always shoe in the title bar -->
+                  <!-- Always show in the title bar -->
                   <div class="control-group">
                     <label class="control-label muted"><%= t :always_display_title %>
                     </label>
                     <div class="controls">
-                      <%= f.check_box :title_always_on, :class => "toggle-check" %> 
+                      <%= f.check_box :title_always_on, :class => "toggle-check", :data => { :title => t('site_title_always_display') } %> 
                     </div>
                   </div>
 
@@ -70,7 +70,7 @@
 
                     <!-- Sitemap menu in Header -->
                     <div class="control-group">
-                      <label class="control-label muted">Sitemap menu in header
+                      <label class="control-label muted"><%= t :sitemap_menu_in_header %>
                       </label>
                       <div class="controls">
                       <%= f.check_box :sitemap_menu_in_header, :class => "toggle-check" %> 
@@ -96,17 +96,16 @@
 
                   <!-- Terms of Use -->
                   <div class="control-group">
-                    <label class="control-label muted">Terms of Use
-                    </label>
+                    <label class="control-label muted"><%= t('site.terms_of_use')%></label>
                     <div class="controls">
-                      <%= f.check_box :enable_terms_of_use, :class => "toggle-check" %> 
+                      <%= f.check_box :enable_terms_of_use, :class => "toggle-check", :data => { :title => t('site.terms_display_in_footer') } %> 
                     </div>
                   </div>
 
                   <!-- CKeditor Site Footer -->
                   <% @site_in_use_locales.each do |locale|%>
                   <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-                    <label class="control-label muted"><%= t('site.default_terms_of_use')%></label>
+                    <label class="control-label muted"><%= t('site.terms_of_use_content')%></label>
                     <div class="controls">
                       <div class="textarea">
                         <%= f.fields_for :terms_of_use_translations do |f| %>

app/views/admin/users_new_interface/index.html.erb

@@ -44,9 +44,9 @@
     <thead>
       <tr class="sort-header">
         <th class="gender"></th>
-        <th class="span3"><a href="#">Roles</a></th>
-        <th class="span4"><a href="#">Name</a></th>
-        <th><a href="#">Mail</a></th>
+        <th class="span3"><a href="#"><%= t('roles') %></a></th>
+        <th class="span4"><a href="#"><%= t('name') %></a></th>
+        <th><a href="#"><%= t('email') %></a></th>
       </tr>
     </thead>
     <tbody>

app/views/admin/users_new_interface/registration_approval.html.erb

@@ -9,10 +9,10 @@
     <thead>
       <tr class="sort-header">
         <th class="gender"></th>
-        <th class="span2"><input type="checkbox" id="select_all_registration" style="margin:0;" /> Select All</th>
-        <th class="span3"><a href="#">Roles</a></th>
-        <th class="span4"><a href="#">Name</a></th>
-        <th><a href="#">Email</a></th>
+        <th class="span2"><input type="checkbox" id="select_all_registration" style="margin:0;" /> <%= t('select_all') %></th>
+        <th class="span3"><a href="#"><%= t('roles') %></a></th>
+        <th class="span4"><a href="#"><%= t('name') %></a></th>
+        <th><a href="#"><%= t('email') %></a></th>
       </tr>
     </thead>
     <tbody>

config/locales/en.yml

@@ -287,20 +287,9 @@ en:
   member_registration: Registration Approval
   member_role: Member Roles
   menu_enabled_for: Menu enabled for
-  mobile_setting:
-    address: Address
-    api_reminder: Make API available for Mobile Apps
-    change: Change
-    default_color: Default Color
-    enabled_reminder: "Please be informed that if you already got a responsive web design (RWD) template, the standard mobile version will be in place of the RWD template once you enable it. You can still disable it anytime as your wish."
-    mobile_site_icon: Mobile Site Icon
-    or: OR
-    phone_number: Phone Number
-    remove_icon: Remove Icon
-    select_announcement_categories: Select Announcement Categories
-    select_image: Select Image
-    select_orbit_bar_color: Select Orbit Bar Color
+  mobile_setting: Mobile Setting
   module: Module
+  modules: Modules
   module_authorization: Module Authorization
   monthly_traffic: Monthly Traffic
   more_plus: more+
@@ -357,6 +346,23 @@ en:
   plugins: Plugins
   postdate: Postdate
   posted_by: Posted by
+  preference: Preference
+  preferences:
+    backend_open: All users can visit backend pages
+    classification: Classification
+    frontend_open: "If Checked, the frontend will be open for all users."
+    favicon: Favicon
+    icon: Icon
+    language: Language
+    lang_detection: Enable User Language Detection
+    lang_enabled: Enable Language
+    lang_default: Default Language
+    lang_detection: Enable User Language Detection
+    nav_enabled: Enable Sidebar Sub Nav
+    openness: Openness
+    orbitbar_theme: OrbitBar Theme
+    sidebar_nav: Sidebar Nav
+    system_email: System Email
   preview: Preview
   profile: Profile
   publications: Publications
@@ -389,8 +395,15 @@ en:
     sitesearch: Google Site Search
     too_many: "Search about ' %{search_word} 'resulted more than %{exceed_num} items maybe try to search with more specific terms?"
     unit_get: "Listed items created by :%{unit_name}  Found %{item_num} items"
+  search_engine:
+    anaytics_code: Google Analytics Code
+    description: Description
+    keywords: Keywords
+    syntax: Google Search Syntax
   search_: Search
+  search_engine: Search Engine
   search_google: Search Google
+  select_all: Select All
   setup_member: Member setup
   server_usage: Server Usage
   show: Show
@@ -433,12 +446,19 @@ en:
         no_data: No Data
         version: Version
         weekness_report: Weekness Report
+    terms_of_use: Terms of Use 
+    terms_of_use_content: Terms of Use Content
+    terms_display_in_footer: Display in footer
     title: Site Title
     title_help: Site Title Guide
   site_: Site
   site_info: Site Info
+  site_map: Site Map
   sitemap: Sitemap
   site_name: Site Name
+  site_title_always_display: "Site title will be always displayed in the title bar of the browser, page tile will be after site title."
+  sitemap_menu_in_header: Sitemap menu in header
+  site_structure: Structure
   size: Size
   start: Start
   start_date: Start date
@@ -466,7 +486,9 @@ en:
   tag_cloud: Tag cloud
   tags: Tags
   template: Template
+  templates: Templates
   template_name: Template name
+  terms_of_use: Terms of Use
   text: Text
   theme: Theme
   themes: Themes

config/locales/zh_tw.yml

@@ -224,11 +224,13 @@ zh_tw:
   groups: 群組
   help: 幫助
   hidden: 隱藏的
+  is_hidden: 隱藏
   hide: 隱藏
   hits: 點擊次數
   homepage: 首頁
   horizontal: 水平的
   hot: 熱門
+  is_hot: 熱門
   image: 圖片
   images: images
   info: 基本資料
@@ -288,20 +290,9 @@ zh_tw:
   member_registration: 註冊審核
   member_role: 身份欄位
   menu_enabled_for: 選單啟用
-  mobile_setting:
-    address: 聯絡地址
-    api_reminder: 開啟手機App開發用API
-    change: 更改
-    default_color: 預設顏色
-    enabled_reminder: "請注意若您的網頁模版若已採用適應性網頁設計(RWD)，開啟此標準版手機版面後將取代原有的適應性網頁設計，您仍隨時能關閉此標準版手機版面"
-    mobile_site_icon: 手機版Icon圖示
-    or: 或
-    phone_number: 聯絡電話
-    remove_icon: 移除圖示
-    select_announcement_categories: 選擇公告顯示分類
-    select_image: 選擇圖片
-    select_orbit_bar_color: 選擇Orbit Bar顏色
+  mobile_setting: 行動設定
   module: 模組
+  modules: 網站模組
   module_authorization: 模組授權
   monthly_traffic: 本月流量
   more_plus: 更多+
@@ -359,6 +350,22 @@ zh_tw:
   postdate: 張貼日期
   posted_by: 張貼人
   preview: 預覽
+  preference: 系統偏好
+  preferences:
+    backend_open: 開啟後台給所有使用者
+    classification: 類別
+    frontend_open: "設定後, 前台將會開放給所有使用者."
+    favicon: 偏好圖示
+    icon: 圖示
+    language: 語系
+    lang_detection: 開啟使用者語系偵測
+    lang_enabled: 開啟語系
+    lang_default: 預設語系
+    nav_enabled: 開啟側欄導引
+    openness: 權限開放
+    orbitbar_theme: OrbitBar版型
+    sidebar_nav: 側欄導引
+    system_email: 系統信箱
   profile: 基本資料
   publications: 著作
   purchase: 購買
@@ -375,7 +382,7 @@ zh_tw:
   role: 身份
   role_field: 身份欄位
   role_info: 身份資料
-  Roles: 身份
+  roles: 身份
   ruling_site: 銳綸網站
   rulingcom:
     errors:
@@ -390,10 +397,17 @@ zh_tw:
     sitesearch: 全站搜尋
     too_many: "搜尋有關 ' %{search_word} '尋找到超過 %{exceed_num} 筆資料，請嘗試加入更多關鍵字縮小搜尋範圍，以作更精確的搜尋?"
     unit_get: "列出由 :%{unit_name}發佈的資料，共有%{item_num}筆"
+  search_engine:
+    anaytics_code: Google分析追蹤程式碼
+    description: 網站描述
+    keywords: 網站關鍵字
+    syntax: Google搜尋語法設定
   search_: 搜尋
+  search_engine: 搜尋引擎
   search_google: 搜尋Google
   setup_member: 會員設定
   server_usage: 主機負載
+  select_all: 全選
   show: 顯示
   show_mode:
     index: 檢索
@@ -434,12 +448,19 @@ zh_tw:
         no_data: 沒有資訊
         version: 版本
         weekness_report: 弱點掃瞄資訊
+    terms_of_use: 使用規則
+    terms_of_use_content: 使用規則內容
+    terms_display_in_footer: 是否顯示於頁尾
     title: 網站標題
     title_help: 網站標題說明
   site_: 網站
-  site_info: 網站資訊
+  site_info: 基本資訊
+  site_map: 網站地圖
+  site_structure: 網站架構
   sitemap: 網站地圖
   site_name: 網站名稱
+  site_title_always_display: 網站標題將永遠顯示於瀏覽器頁籤、頁面標題將列於網站標題後方
+  sitemap_menu_in_header: 網站導覽顯示於頁首
   size: 大小
   start: 開始
   start_date: 開始日期
@@ -467,13 +488,16 @@ zh_tw:
   tag_cloud: 標籤雲
   tags: 標籤
   template: 樣版
+  templates: 網站模版
   template_name: 樣版名稱
+  terms_of_use: 使用規則
   text: 內文
   theme: 套用頁面樣式
   themes: 主題
   title: 標題
   to_search: 加入搜尋條件
   top: 置頂
+  is_top: 置頂
   total_visitors: 總計造訪人次
   traffic: 流量
   type: 欄位類型

lib/tasks/site.rake

@@ -19,12 +19,18 @@ namespace :site do
   task :necessary_data => :environment do
     site = Site.first
     site.title = 'RulingOrbit Demo Site'
+
     site.save
 
     # home_trans = I18nVariable.create!( :document_class => 'Home', :key => 'home', :en => 'Homepage', :zh_tw => '首頁')
     design = Design.first
     site = Site.first
     site.design = design
+    site.terms_of_use_translations = {
+        "en"=>"<h3 style=\"line-height: normal; clear: both; background-image: url(http://www.forex.ntu.edu.tw/css/cssimg/h3_bg.gif); padding: 0.1em 0px 0.1em 1.2em; font-size: 1.1em; margin: 10px 0px 5px; width: 891px; color: rgb(89, 101, 146); font-family: Verdana, 'Lucida Grande', Arial, sans-serif; background-position: 0% 1px; background-repeat: no-repeat no-repeat;\">Terms, Privacy and Security Policy</h3>\r\n\r\n<div id=\"pages_area editor\" style=\"color: rgb(0, 0, 0); font-family: Verdana, 'Lucida Grande', Arial, sans-serif; line-height: normal;\">Welcome to this website maintained by RulingDigital Inc.. We hope you will be able to access the information that you are seeking via this website. Please read the terms of use and the policies regarding privacy and security:<br />\r\n<br />\r\n<span style=\"color: rgb(255, 0, 0);\">Copyright Statement</span><br />\r\nThe copyright and other intellectual property rights existing in and attaching to this website are the property of the RulingDigital Inc. (hereinafter referred to as the RulingDigital), and may not be reproduced or otherwise used without the express written consent of the RulingDigital.<br />\r\n<br />\r\n<span style=\"color: rgb(255, 0, 0);\">Information We Provide to You</span><br />\r\nWe will make every effort to ensure that the information provided on this website is up-to-date and accurate, but the information is provided on an &ldquo;as is&rdquo; and &ldquo;as available&rdquo; basis. By accessing this website, the user hereby agrees that the use of this website is at the user&rsquo;s sole risk. The RulingDigital gives no warranty that the information posted on this website will meet the user&rsquo;s requirements, or that the information posted will be uninterrupted, timely, secure, or error-free.<br />\r\n<br />\r\n<span style=\"color: rgb(255, 0, 0);\">Information You Provide to Us</span><br />\r\nWe are committed to protecting your&nbsp;<span style=\"color: rgb(0, 0, 255);\">privacy</span>. This website does not use cookies nor does it track individual visitors. Personally identifiable information that you voluntarily provide to us via this website will not be used for any purpose other than to respond to your inquiry.&nbsp;<br />\r\n<br />\r\n<span style=\"color: rgb(255, 0, 0);\">Limitation of Liability</span><br />\r\nEvery effort will be made to keep this website virus-free and secure, however, any material downloaded or otherwise obtained through the utilization of this website is done at the user&rsquo;s own risk and the user will therefore be liable for any and all damages of whatsoever nature arising out of such utilization of the website.&nbsp;<br />\r\n<br />\r\n<span style=\"color: rgb(255, 0, 0);\">External Links</span><br />\r\nThis website may provide links to other websites and resources. The RulingDigital&nbsp;is not responsible for the privacy practices or the content of such websites.<br />\r\n<br />\r\n<span style=\"color: rgb(255, 0, 0);\">Changes to this Policy</span><br />\r\nThe&nbsp;RulingDigital&nbsp;reserves the right to modify or change these terms without notice. Please contact the webmaster if you have questions pertaining to these terms and this website.</div>\r\n",
+        "zh_tw"=>"<p style=\"margin-top: 0.49cm; margin-bottom: 0.49cm; widows: 2; orphans: 2\"><font face=\"Times\"><font size=\"2\"><span lang=\"en-US\">1. </span></font></font><font size=\"2\">本網站所刊載資料之著作權，除另有規定外，屬於 銳綸數位股份有限公司（下稱「本單位」）。任何人得為非營利目的自由使用。但使用時，不得變更其內容、詆毀或減損本單位名譽，且必須註明來源為「銳綸數位股份有限公司」。</font></p><p style=\"margin-top: 0.49cm; margin-bottom: 0.49cm; widows: 2; orphans: 2\"><font face=\"Times\"><font size=\"2\"><span lang=\"en-US\">2. </span></font></font><font size=\"2\">具有上傳資料權限之使用者，得自行決定其資料之著作權歸屬與授權規則。本網站之使用者，應遵守之，並了解本單位對此資料不負任何法律責任。</font></p><p style=\"margin-top: 0.49cm; margin-bottom: 0.49cm; widows: 2; orphans: 2\"><font face=\"Times\"><font size=\"2\"><span lang=\"en-US\">3. </span></font></font><font size=\"2\">本單位盡力維護本網站資料之即時性與正確性，但對此不負任何責任。本單位有權不經事先公告，變更網站內容。因此，凡使用者認為涉及其利益之事項，例如考試資格或日期、畢業學分等，請逕與本單位相關業務人員確認。</font></p><p style=\"margin-top: 0.49cm; margin-bottom: 0.49cm; widows: 2; orphans: 2\"><font face=\"Times\"><font size=\"2\"><span lang=\"en-US\">4. </span></font></font><font size=\"2\">本單位盡力維護本網站資料不含任何電腦病毒。但對於任何因下載本網站資料所致電子資訊系統或其他之損害，本單位不負任何責任。</font></p><p style=\"margin-top: 0.49cm; margin-bottom: 0.49cm; widows: 2; orphans: 2\"><font face=\"Times\"><font size=\"2\"><span lang=\"en-US\">5. </span></font></font><font size=\"2\">本網站所提供對其他網站之超連結，僅為使用者之便利。該被連結之他網站，並非本網站之一部分。本單位不保證所連結之他網站存在，亦不對該網站之任何內容、超連結等負責。</font></p><p style=\"margin-top: 0.49cm; margin-bottom: 0.49cm; widows: 2; orphans: 2\"><font face=\"Times\"><font size=\"2\"><span lang=\"en-US\">6. </span></font></font><font size=\"2\">本網站除為提供個人服務之必要外，不使用 </font><font face=\"Times\"><font size=\"2\"><span lang=\"en-US\">cookies </span></font></font><font size=\"2\">，也不追蹤使用者之網路使用。使用者主動提供之個人資料，除指定目的與分析本網站使用習慣外，不作其他用途。</font></p><p style=\"margin-top: 0.49cm; margin-bottom: 0.49cm; widows: 2; orphans: 2\"><font face=\"Times\"><font size=\"2\"><span lang=\"en-US\">7. </span></font></font><font size=\"2\">本使用規則之修改變更，不預先公告。若使用者對於本規則或本網站有任何意見或建議，請與網站管理員聯繫。</font></p>"
+    }
+
     site.save
     theme = design.themes.first
     home = Page.new(  :design_id => design.id, :name => 'home', :is_published => true, :theme_id => nil, :menu_enabled_for => {"zh_tw"=>"true", "en"=>"true"} )

vendor/built_in_modules/ad_banner/config/locales/zh_tw.yml

@@ -11,4 +11,8 @@ zh_tw:
     effect: 效果
     all: 全部
     categories: 類別
+    new_banner: 新增
     add: 新增
+    size: 大小
+    transition_interval: 轉換間隔時間
+    transition_speed: 轉換速度

vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb

@@ -23,7 +23,7 @@
 
     <!-- Tiltle -->
       <div class="control-group">
-        <label class="control-label muted" for="">Title</label>
+        <label class="control-label muted" for=""><%= t('survey.title') %></label>
         <div class="controls">
           <div class="input-append">
             <div class="tab-content">
@@ -45,7 +45,7 @@
       </div>
         <!-- Description -->
         <div class="control-group">
-          <label class="control-label muted">Description</label>
+          <label class="control-label muted"><%= t('survey.description') %></label>
           <div class="controls">
             <div class="tab-content textarea-lang">
               <div class="btn-group" data-toggle="buttons-radio">
@@ -65,14 +65,14 @@
         </div>
         <!-- start date -->
         <div class="control-group">
-          <label class="control-label muted" for="account">Start Date</label>
+          <label class="control-label muted" for="account"><%= t('survey.postdate') %></label>
           <div class="controls">
            <%= f.datetime_picker :postdate, :no_label => true %>
           </div>
         </div>
         <!-- end date -->
          <div class="control-group">
-          <label class="control-label muted" for="account">End Date</label>
+          <label class="control-label muted" for="account"><%= t('survey.deadline') %></label>
           <div class="controls">
            <%= f.datetime_picker :deadline, :no_label => true %>
           </div>
@@ -80,20 +80,20 @@
 
          <!-- redirect mode -->
           <div class="control-group">
-            <label class="control-label muted" for="redirectMode">Redirect Mode</label>
+            <label class="control-label muted" for="redirectMode"><%= t('survey.redirect_mode') %></label>
             <div class="controls">
               <label class="checkbox">
                <!--  <input name="survey[redirect_mode]" type="hidden" value="0" />
                 <input id="survey_redirect_mode" name="survey[redirect_mode]" type="checkbox" value="1" /> -->
                 <%= f.check_box :redirect_mode %>
-                The surveys is an external link
+                <%= t('survey.is_external') %>
               </label>
             </div>
           </div>
           <!-- redirect url -->
 
           <div class="control-group redirect-url hide">
-            <label class="control-label muted" for="survey_redirect_url">Redirect URL</label>
+            <label class="control-label muted" for="survey_redirect_url"><%= t('survey.extern_link') %></label>
             <div class="controls">
                <%= f.text_field :redirect_url, :class=>"input-xlarge", :placeholder=>"Redirect URL" %>
             </div>
@@ -108,7 +108,7 @@
       </div>
 
       <div class="form-actions">
-        <button type="button" class="btn btn-success add-question">Add Question</button>
+        <button type="button" class="btn btn-success add-question"><%= t('survey.add') %></button>
         <%= f.submit t('save'), :class=>'btn btn-primary' %>
         <%= link_to t('cancel'), get_go_back, :class=>"btn" %> 
       </div>

vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb

@@ -1,7 +1,7 @@
 <script id="template-survery" type="text/x-tmpl">
   <div class="attributes" data-index="${_l}" data-question="${_ques}">
     <div class="attributes-header clearfix">
-      <a class="btn btn-mini pull-right btn-danger delete" href="#"><i class="icon-trash"></i> Delete</a>
+      <a class="btn btn-mini pull-right btn-danger delete" href="#"><i class="icon-trash"></i> <%= t('survey_question.delete') %></a>
       <input class="should_destroy" id="${_destroy[0]}" name="${_destroy[1]}" type="hidden">
       <input id="${_sequence[0]}" class="sequence" name="${_sequence[1]}" type="hidden" value="${_sequence[2]}">
       {{if _id}}
@@ -11,7 +11,7 @@
     </div>
     <div class="attributes-body">
       <div class="control-group">
-        <label class="control-label muted" for="">Question Title</label>
+        <label class="control-label muted" for=""><%= t('survey_question.title') %></label>
         <div class="controls">
           <div class="input-append">
             <div class="tab-content">
@@ -23,19 +23,29 @@
               </div>
             </div>
             <div class="btn-group" data-toggle="buttons-radio">
-              <a class="btn change-title active" href="${'#'+_title_translations[2]+'_en'}" data-toggle="tab">English</a>
-              <a class="btn change-title" href="${'#'+_title_translations[2]+'_zh_tw'}" data-toggle="tab">Chinese</a>
+              <% 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 %>
             </div>
           </div>
         </div>
       </div>
       <div class="control-group">
-        <label class="control-label muted">Description </label>
+        <label class="control-label muted"><%= t('survey_question.description') %></label>
         <div class="controls">
           <div class="tab-content textarea-lang">
             <div class="btn-group" data-toggle="buttons-radio">
-              <a class="btn active" href="${'#'+_description_translations[2]+'_en'}" data-toggle="tab">English</a>
-              <a class="btn" href="${'#'+_description_translations[2]+'_zh_tw'}" data-toggle="tab">Chinese</a>
+              <% 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 %>
             </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>
@@ -47,15 +57,15 @@
         </div>
       </div>
       <div class="control-group">
-        <label class="control-label muted" for="">Type </label>
+        <label class="control-label muted" for=""><%= t('survey_question.type') %> </label>
         <div class="controls">
           <select class="type-selector" id="${_type[0]}" name="${_type[1]}" >
-            <option value="0" {{if _type[2] == 0}}selected="selected"{{/if}}>Oneline</option>
-            <option value="1" {{if _type[2] == 1}}selected="selected"{{/if}}>Multi-line</option>
-            <option value="2" {{if _type[2] == 2}}selected="selected"{{/if}}>Radio</option>
-            <option value="3" {{if _type[2] == 3}}selected="selected"{{/if}}>Check</option>
-            <option value="4" {{if _type[2] == 4}}selected="selected"{{/if}}>Select</option>
-            <option value="5" {{if _type[2] == 5}}selected="selected"{{/if}}>Radio Group</option>
+            <option value="0" {{if _type[2] == 0}}selected="selected"{{/if}}><%= t('survey_question.oneline') %></option>
+            <option value="1" {{if _type[2] == 1}}selected="selected"{{/if}}><%= t('survey_question.multiline') %></option>
+            <option value="2" {{if _type[2] == 2}}selected="selected"{{/if}}><%= t('survey_question.radio') %></option>
+            <option value="3" {{if _type[2] == 3}}selected="selected"{{/if}}><%= t('survey_question.check') %></option>
+            <option value="4" {{if _type[2] == 4}}selected="selected"{{/if}}><%= t('survey_question.select') %></option>
+            <option value="5" {{if _type[2] == 5}}selected="selected"{{/if}}><%= t('survey_question.radiogroup') %></option>
           </select>
         </div>
       </div>
@@ -64,13 +74,13 @@
 
 
         <div class="control-group rgl">
-          <label for="" class="control-label muted">Radio Group Label</label>
+          <label for="" class="control-label muted"><%= t('survey_question.radiogroup_label') %></label>
           <div class="controls add-input">
             <div class="add-target">
              
 
               <p class="add-btn">
-                <a href="#" class="btn btn-mini btn-primary"><i class="icons-plus"></i> Add</a>
+                <a href="#" class="btn btn-mini btn-primary"><i class="icons-plus"></i> <%= t('survey_question.add') %></a>
               </p>
             </div>
           </div>
@@ -79,13 +89,13 @@
         <hr />
 
         <div class="control-group options">
-          <label for="" class="control-label muted">Options List</label>
+          <label for="" class="control-label muted"><%= t('survey_question.options_lists') %></label>
           <div class="controls add-input">
             <div class="add-target">
              
 
               <p class="add-btn">
-                <a href="#" class="btn btn-mini btn-primary"><i class="icons-plus"></i> Add</a>
+                <a href="#" class="btn btn-mini btn-primary"><i class="icons-plus"></i> <%= t('survey_question.add') %></a>
               </p>
             </div>
           </div>
@@ -96,7 +106,7 @@
             <label class="checkbox">
               <input name="${_custom_option[1]}" type="hidden" value="${_custom_option[2] << 0}" />
               <input id="${_custom_option[0]}" type="checkbox" {{if _custom_option[2]}} checked="checked" {{/if}} />
-              Allow Custom Option
+              <%= t('survey_question.custom_option') %>
             </label>
           </div>
         </div>
@@ -110,7 +120,7 @@
           <label class="checkbox">
             <input name="${_is_required[1]}" type="hidden" value="${_is_required[2] << 0}" />
             <input id="${_is_required[0]}" type="checkbox" {{if _is_required[2]}} checked="checked" {{/if}} />
-            Is Required
+            <%= t('survey_question.is_required') %>
           </label>
         </div>
       </div>

vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/index.html.erb

@@ -4,11 +4,11 @@
   <thead>
     <tr>
       <th class="span1"></th>
-      <th class="span3"></th>
-      <th class="span1"></th>
-      <th class="span1"></th>
-      <th class="span1"></th>
-      <th class="span2"></th>
+      <th class="span3"><%= t('survey.title') %></th>
+      <th class="span1"><%= t('survey.postdate') %></th>
+      <th class="span1"><%= t('survey.deadline') %></th>
+      <th class="span1"><%= t('survey.results_count') %></th>
+      <th class="span2"><%= t('survey.update_user') %></th>
     </tr>
   </thead>
   <tbody id="tbody_surveys" class="sort-holder">

vendor/built_in_modules/survey/config/locales/en.yml

@@ -11,9 +11,11 @@ en:
     results_count: Results Count
     update_user: Update User
     question: Question
+    is_external: The survey is an external link
+    add: Add Question
 
     result_type: Result Type (Frontend)
-    extern_link: Extern Link
+    extern_link: External Link
     upload_file: Uploaded File
 
     remove_upload_file: Remove Uploaded File
@@ -70,6 +72,8 @@ en:
     option: Option
     custom_option: Allow Custom Option
     use_custom_option: Other
+    add: Add
+    delete: Delete
 
     have_not_chart: This type of question havn't chart
 

vendor/built_in_modules/survey/config/locales/zh_tw.yml

@@ -12,6 +12,8 @@ zh_tw:
     results_count: 填寫人數
     update_user: 最後更新者
     question: 問題
+    is_external: 這份問卷為外部連結
+    add: 新增題目
 
     result_type: 前端結果表示方式
     extern_link: 外部連結
@@ -72,6 +74,8 @@ zh_tw:
     option: 選項
     custom_option: 允許自定回答選項
     use_custom_option: 其他
+    add: 新增
+    delete: 刪除
 
     have_not_chart: 此種類型問題不含結果圖表
 

vendor/built_in_modules/survey/init.rb

@@ -11,26 +11,26 @@ module Faq
     update_info 'some update_info'
 
     front_end do
-      app_page 'survey'  do 
-        frontend_i18n "survey.frontend.survey"
-      end
+      # app_page 'survey'  do 
+      #   frontend_i18n "survey.frontend.survey"
+      # end
     end
 
     authorizable
 
     data_count 1..20
 
-    # widgets do
-    #   default_widget do
-    #     enable ["typeA"]
-    #     query 'Survey.any_of( {:postdate.lte => Time.now} )'
-    #     link_field :title, {:method => 'panel_survey_front_end_survey_path',:args=>:self}
-    #     field :time_range
-    #     field :write
-    #     field :result
-    #     link_to_more 'panel_survey_front_end_survey_path', :title_i18n=> 'faq.default_widget.to_more'
-    #   end
-    # end
+    widgets do
+      default_widget do
+        enable ["typeA"]
+        query 'Survey.any_of( {:postdate.lte => Time.now} )'
+        link_field :title, {:method => 'panel_survey_front_end_survey_path',:args=>:self}
+        field :time_range
+        field :write
+        field :result
+        link_to_more 'panel_survey_front_end_survey_path', :title_i18n=> 'faq.default_widget.to_more'
+      end
+    end
 
     
     side_bar do