From 33640de18447ac4e74ffa9b7b1cac61f0cbfd152 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 24 Apr 2012 14:30:30 +0800
Subject: [PATCH] Changes for Billingual

---
 app/views/layouts/_orbit_bar.html.erb | 8 ++++----
 config/locales/zh_tw.yml              | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb
index 2322b62f..4017e24e 100644
--- a/app/views/layouts/_orbit_bar.html.erb
+++ b/app/views/layouts/_orbit_bar.html.erb
@@ -5,12 +5,12 @@
 			    <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
 			    <ul class="dropdown-menu">
 							<li><%= link_to content_tag(:i, nil, :class => 'icons-dashboard') + t('admin.dashboard'), admin_dashboards_path %></li>
-			        <li><a href="#"><i class="icons-content"></i><%= t('admin.content') %></a></li>
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %></li>
-							<li><%= link_to content_tag(:i, nil, :class => 'icons-asset') + t('admin.asset'), admin_assets_path %></li>
+			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-content') + t('admin.content') %></li>
+							<li><%#= link_to content_tag(:i, nil, :class => 'icons-member') + t('admin.member'), admin_users_path %></li>
+							<li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t('admin.asset'), admin_assets_path %></li>
 			        <li class="divider"></li>
 							<li><%= link_to content_tag(:i, nil, :class => 'icons-structure') + t('admin.structure'), admin_items_path %></li>
-			        <li><a href="#"><i class="icons-plus-cube"></i><%= t('admin.add_item') %></a></li>
+			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t('admin.add_item') %></li>
 			    </ul>
 			</div>
 			<ul class="nav">
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index bb3fa5ca..4466caae 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -58,7 +58,7 @@ zh_tw:
     add_language: 新增語言
     add_drop_down_item: ＋增加Orbit選單
     admin: 管理
-    announcement: 公告系統
+    announcement: 公告管理
     asset: 資產
     assets:
         file: 檔案
@@ -151,6 +151,7 @@ zh_tw:
     purchase: 購買
     role: 角色
     roles: 角色
+    site_setting: 基本設定
     setup_member: 成員設置
     setup_translations: 語系設定
     setup_designs: 版型設定