From c54c12c1ffb8719bad6a8483049c07bdf2454472 Mon Sep 17 00:00:00 2001
From: thomaschen <99703040@nccu.edu.tw>
Date: Fri, 20 Dec 2013 12:21:30 +0800
Subject: [PATCH] add Chinese version sidebar Menu in Site Setting

Conflicts:
	config/locales/en.yml
---
 app/views/admin/items/_site_bar.html.erb | 16 ++++++++--------
 app/views/admin/sites/_side_bar.html.erb | 16 ++++++++--------
 config/locales/en.yml                    |  7 +++++++
 config/locales/zh_tw.yml                 |  9 ++++++++-
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/app/views/admin/items/_site_bar.html.erb b/app/views/admin/items/_site_bar.html.erb
index cc4525a7..29229f01 100644
--- a/app/views/admin/items/_site_bar.html.erb
+++ b/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>
diff --git a/app/views/admin/sites/_side_bar.html.erb b/app/views/admin/sites/_side_bar.html.erb
index cc4525a7..29229f01 100644
--- a/app/views/admin/sites/_side_bar.html.erb
+++ b/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>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5c647a5d..57affb49 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -287,7 +287,9 @@ en:
   member_registration: Registration Approval
   member_role: Member Roles
   menu_enabled_for: Menu enabled for
+  mobile_setting: Mobile Setting
   module: Module
+  modules: Modules
   module_authorization: Module Authorization
   monthly_traffic: Monthly Traffic
   more_plus: more+
@@ -344,6 +346,7 @@ en:
   plugins: Plugins
   postdate: Postdate
   posted_by: Posted by
+  preference: Preference
   preview: Preview
   profile: Profile
   publications: Publications
@@ -377,6 +380,7 @@ en:
     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_: Search
+  search_engine: Search Engine
   search_google: Search Google
   setup_member: Member setup
   server_usage: Server Usage
@@ -427,10 +431,12 @@ en:
     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
@@ -458,6 +464,7 @@ en:
   tag_cloud: Tag cloud
   tags: Tags
   template: Template
+  templates: Templates
   template_name: Template name
   text: Text
   theme: Theme
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index c5d9390c..9b3522d9 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -288,7 +288,9 @@ zh_tw:
   member_registration: 註冊審核
   member_role: 身份欄位
   menu_enabled_for: 選單啟用
+  mobile_setting: 行動設定
   module: 模組
+  modules: 網站模組
   module_authorization: 模組授權
   monthly_traffic: 本月流量
   more_plus: 更多+
@@ -346,6 +348,7 @@ zh_tw:
   postdate: 張貼日期
   posted_by: 張貼人
   preview: 預覽
+  preference: 系統偏好
   profile: 基本資料
   publications: 著作
   purchase: 購買
@@ -378,6 +381,7 @@ zh_tw:
     too_many: "搜尋有關 ' %{search_word} '尋找到超過 %{exceed_num} 筆資料，請嘗試加入更多關鍵字縮小搜尋範圍，以作更精確的搜尋?"
     unit_get: "列出由 :%{unit_name}發佈的資料，共有%{item_num}筆"
   search_: 搜尋
+  search_engine: 搜尋引擎
   search_google: 搜尋Google
   setup_member: 會員設定
   server_usage: 主機負載
@@ -427,7 +431,9 @@ zh_tw:
     title: 網站標題
     title_help: 網站標題說明
   site_: 網站
-  site_info: 網站資訊
+  site_info: 基本資訊
+  site_map: 網站地圖
+  site_structure: 網站架構
   sitemap: 網站地圖
   site_name: 網站名稱
   site_title_always_display: 網站標題將永遠顯示於瀏覽器頁籤、頁面標題將列於網站標題後方
@@ -459,6 +465,7 @@ zh_tw:
   tag_cloud: 標籤雲
   tags: 標籤
   template: 樣版
+  templates: 網站模版
   template_name: 樣版名稱
   text: 內文
   theme: 套用頁面樣式