Translations for mobile setting

Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml

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">Enable Mobile Website</span>
+                  <span class="help-block"><%= t("mobile_setting.enabled_reminder") %></span>
                 </div>
               </div>
 
               <div class="control-group">
-                <label class="control-label muted">Select Announcement Categories</label>
+                <label class="control-label muted"><%= t("mobile_setting.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">Mobile Site Icon</label>
+                    <label class="control-label muted"><%= t("mobile_setting.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;" %>Change
+                         <%= 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") %>
                          </span>
                           <%= f.check_box :remove_mobile_icon %>
-                          Remove Icon
+                          <%= t("mobile_setting.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;" %>Select Image
+                         <%= 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") %>
                          </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">Select Orbit Bar Color</label>
+                <label class="control-label muted"><%= t("mobile_setting.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'" : "") %> />
-                 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
+                 <%= 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") %>
                 </div>
               </div>
 
               <div class="control-group">
-                <label class="control-label muted">Phone Number</label>
+                <label class="control-label muted"><%= t("mobile_setting.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">Address</label>
+                <label class="control-label muted"><%= t("mobile_setting.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">Make API available for Mobile Apps</span>
+                  <span class="help-block"><%= t("mobile_setting.api_reminder") %></span>
                 </div>
               </div>                    
 

config/locales/en.yml

@@ -287,7 +287,19 @@ en:
   member_registration: Registration Approval
   member_role: Member Roles
   menu_enabled_for: Menu enabled for
-  mobile_setting: Mobile Setting
+  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
   module: Module
   modules: Modules
   module_authorization: Module Authorization

config/locales/zh_tw.yml

@@ -288,7 +288,19 @@ zh_tw:
   member_registration: 註冊審核
   member_role: 身份欄位
   menu_enabled_for: 選單啟用
-  mobile_setting: 行動設定
+  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顏色
   module: 模組
   modules: 網站模組
   module_authorization: 模組授權