From 332658d3941f265440f9e910220646d47c4e6d68 Mon Sep 17 00:00:00 2001
From: Manson Wang <manson@rulingcom.com>
Date: Thu, 16 Jan 2014 10:45:58 +0800
Subject: [PATCH] Fix translations and side_bar order

---
 .../admin/users_new_interface/_user_for_listing.html.erb | 2 +-
 app/views/layouts/_side_bar_content.html.erb             | 4 ++--
 config/locales/en.yml                                    | 2 --
 config/locales/zh_tw.yml                                 | 2 --
 .../built_in_modules/ad_banner/config/locales/zh_tw.yml  | 9 +++++++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/views/admin/users_new_interface/_user_for_listing.html.erb b/app/views/admin/users_new_interface/_user_for_listing.html.erb
index 02445ff6..c4a1fcd3 100644
--- a/app/views/admin/users_new_interface/_user_for_listing.html.erb
+++ b/app/views/admin/users_new_interface/_user_for_listing.html.erb
@@ -21,7 +21,7 @@
           <ul class="nav nav-pills">
             <%= content_tag(:li, link_to(t(:edit),edit_admin_users_new_interface_path(user_for_listing))) if is_admin? %>
             <%= content_tag(:li, link_to(t("users.setting_privilege"),admin_users_new_interface_edit_privilege_path(user_for_listing))) if is_admin? and current_user.id != user_for_listing.id %>
-            <%= content_tag(:li, link_to(t(:delete),admin_users_new_interface_path(user_for_listing, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"text-error", :remote => true)) if is_admin? %>
+            <%= content_tag(:li, link_to(t(:delete_),admin_users_new_interface_path(user_for_listing, :at=>params[:at]), :confirm => t(:sure?), :method => :delete, :class=>"text-error", :remote => true)) if is_admin? %>
           </ul>
         </div>
       </td>
diff --git a/app/views/layouts/_side_bar_content.html.erb b/app/views/layouts/_side_bar_content.html.erb
index b55309db..b4693356 100644
--- a/app/views/layouts/_side_bar_content.html.erb
+++ b/app/views/layouts/_side_bar_content.html.erb
@@ -1,7 +1,7 @@
 <div id="sidebar-menu">
 	<div class="scroller">
 	  <ul class="sidebar-nav">
-	    <% OrbitApp::Module::SideBarRegisition.all.each do |t| %>
+	    <% OrbitApp::Module::SideBarRegisition.all.sort{|x,y| x.get_module_app_key <=> y.get_module_app_key}.each do |t| %>
 	      <%= t.render_head(request, params, current_user, @module_app) %>
 	    <% end %>
 	  </ul>
@@ -10,7 +10,7 @@
 </div>
 
 <div class="sub-nav-block-list">
-  <% OrbitApp::Module::SideBarRegisition.all.each do |t| %>
+  <% OrbitApp::Module::SideBarRegisition.all.sort{|x,y| x.get_module_app_key <=> y.get_module_app_key}.each do |t| %>
     <%= t.render(request, params, current_user, @module_app) %>
   <% end %>
 </div>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0d64cb63..c7f91ff4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -86,7 +86,6 @@ en:
     user_list: Unit
   approval_: Approval
   approval_setting: Approval setting
-  archive: Archive
   asset: Asset
   attributes: Attributes
   auth:
@@ -262,7 +261,6 @@ en:
       text_area: Text Area
       text_field: Text Field
   locale: Locale
-  location: Location
   login: Login
   logout: Logout
   mail:
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 864778e9..d0e2d70a 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -86,7 +86,6 @@ zh_tw:
     user_list: 使用者列表
   approval_: 審核
   approval_setting: 審核設定  
-  archive: 檔案室
   asset: 資產
   attributes: 屬性
   auth:
@@ -264,7 +263,6 @@ zh_tw:
       text_area: 文字輸入方塊
       text_field: 文字輸入框
   locale: 位置
-  location: 地標
   login: 登入
   logout: 登出
   mail:
diff --git a/vendor/built_in_modules/ad_banner/config/locales/zh_tw.yml b/vendor/built_in_modules/ad_banner/config/locales/zh_tw.yml
index 7a3d9978..bd51d19c 100644
--- a/vendor/built_in_modules/ad_banner/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/ad_banner/config/locales/zh_tw.yml
@@ -4,9 +4,13 @@ zh_tw:
     ad_banner: 廣告輪播
     banner: 橫幅
     banner_name: 橫幅名稱
-    banner_name_note: 橫幅名稱只能為英文
+    name_only_english: 橫幅名稱只能為英文
+    edit_banner: 編輯橫幅
+    enter_number: 請輸入數字
+    enter_url: 請輸入網址
     ste: 轉換間隔時間
-    ste_note: 請輸入秒數
+    number_seconds: 請輸入秒數
+    number_milliseconds: 請輸入毫秒數
     best_size: 最佳尺寸
     effect: 效果
     all: 全部
@@ -16,3 +20,4 @@ zh_tw:
     size: 大小
     transition_interval: 轉換間隔時間
     transition_speed: 轉換速度
+    type: 類型