From a03e9bada8e3a827b45fe907ad05a15ea8c1ed98 Mon Sep 17 00:00:00 2001
From: chris2tof <chris.vilayphiou@gmail.com>
Date: Sun, 20 Nov 2011 02:14:51 +0800
Subject: [PATCH] Add missing translations

---
 app/views/admin/designs/index.html.erb        |  2 +-
 .../user_attribute_models/index.html.erb      |  2 +-
 app/views/admin/users/_form.html.erb          | 12 ++++----
 app/views/admin/users/index.html.erb          | 10 +++----
 app/views/layouts/member.html.erb             |  2 +-
 config/locales/en.yml                         |  7 +++++
 config/locales/zh_tw.yml                      | 28 +++++++++++++------
 7 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/app/views/admin/designs/index.html.erb b/app/views/admin/designs/index.html.erb
index d0fa7aa62..76ebecf4c 100644
--- a/app/views/admin/designs/index.html.erb
+++ b/app/views/admin/designs/index.html.erb
@@ -1,6 +1,6 @@
 <% content_for :secondary do %>
   <ul class="list">
-    <li><%= link_to t(:new_design, :scope => :admin), new_admin_design_path, :class => 'seclink1' %></li>
+    <li><%= link_to t('admin.new_design'), new_admin_design_path, :class => 'seclink1' %></li>
 	  <li><%= link_to t('admin.upload_design'), upload_package_admin_designs_path, :class => 'seclink2' %></li>
   </ul>
 <% end -%>
diff --git a/app/views/admin/user_attribute_models/index.html.erb b/app/views/admin/user_attribute_models/index.html.erb
index 58ab9bc71..c83712610 100644
--- a/app/views/admin/user_attribute_models/index.html.erb
+++ b/app/views/admin/user_attribute_models/index.html.erb
@@ -7,7 +7,7 @@
 	<ul>
 		<li class="list_head clear">
 			<span class="<%= @attribute %>s"><%= t("admin.#{@attribute}") %></span>
-			<span class="action">Action</span>
+			<span class="action"><%= t('admin.action') %></span>
 		</li>
 		<% @user_attribute_models.each do |user_attribute_model| %>
 		<li id="attribute_<%= user_attribute_model.id %>" class="list_item <%= "#{user_attribute_model.is_disabled? ? 'disable' : ''}" %> clear">
diff --git a/app/views/admin/users/_form.html.erb b/app/views/admin/users/_form.html.erb
index 684313497..0e2c4e737 100644
--- a/app/views/admin/users/_form.html.erb
+++ b/app/views/admin/users/_form.html.erb
@@ -6,17 +6,17 @@
 	<% end %>
  	<%#= file_field_tag 'file' %>
  	<%#= hidden_field_tag :avatar_cache %>
-	<a id="upload" href="#"> Choose a file... </a>
-	<%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value='E-Mail';}", :value => "E-Mail", :class => 'user_mail' %>
+	<a id="upload" href="#"><%= t('admin.choose_file') %></a>
+	<%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => t('admin.email'), :class => 'user_mail' %>
 	<label>
-    <%= f.check_box :admin %><span>Admin</span>
+    <%= f.check_box :admin %><span><%= t('admin.admin') %></span>
 	</label>
-	<%= f.select :active_role, @user_role_models.sort_by{|role| role.key }.collect {|role| [ role.key.capitalize, role.key ]}, :selected => (@user.active_role || 'student') %>
+	<%= f.select :active_role, @user_role_models.sort_by{|role| role.key }.collect {|role| [ role.i18n_variable[I18n.locale], role.key ]}, :selected => (@user.active_role || 'student') %>
 </div>
 
 <% @user_info_models.each do |ua| %>
 	<div id="basic_block" class="roles_block">
-		<h2><%= ua.key.capitalize %></h2>
+		<h2><%= ua.i18n_variable[I18n.locale] %></h2>
 		<hr>
 		<%= render :partial => 'user_attribute',
 		  :object => (@user.user_infos.detect {|u| u.key == ua.key } || @user.user_infos.build),
@@ -27,7 +27,7 @@
 <div id='role_models'>
 	<% @user_role_models.each do |ua| %>
 		<div id="<%= ua.key %>_block" class="roles_block" <%= raw(' style="display: none;"') unless ((@user.active_role.eql?(ua.key) rescue nil) || (ua.key.eql?('student') && @user.new_record?)) %>>
-			<h2><%= ua.key.capitalize %></h2>
+			<h2><%= ua.i18n_variable[I18n.locale] %></h2>
 			<hr>
 			<%= render :partial => 'user_attribute',
 	      :object => (@user.user_roles.detect {|u| u.key == ua.key } || @user.user_roles.build),
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
index 7ac2ddf71..09a8ec22c 100644
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -7,11 +7,11 @@
 	</div>
 	<ul>
 		<li class="list_head clear">
-			<span class="roles">Roles</span>
-			<span class="name">Name</span>
-			<span class="email">Email</span>
-			<span class="admin">Admin</span>
-			<span class="action">Action</span>
+			<span class="roles"><%= t('admin.role') %></span>
+			<span class="name"><%= t('admin.name') %></span>
+			<span class="email"><%= t('admin.email') %></span>
+			<span class="admin"><%= t('admin.admin') %></span>
+			<span class="action"><%= t('admin.action') %></span>
 		</li>
 		<% @users.each do |user| %>
 		<li class="list_item clear">
diff --git a/app/views/layouts/member.html.erb b/app/views/layouts/member.html.erb
index 91615d716..b10b674c6 100644
--- a/app/views/layouts/member.html.erb
+++ b/app/views/layouts/member.html.erb
@@ -32,7 +32,7 @@
 				<input id="user_search" name="user[username]" size="30" type="text" />
 			</div>
 			<div class="member_setup">
-		  <h1>Member Setup</h1>
+		  <h1><%= t('admin.setup_member') %></h1>
 			<ul class="list">
 				<li class="set_1"><%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %></li>
 				<li class="set_2"><%= link_to content_tag(:span, t('admin.list_user_roles')), admin_user_role_models_path %></li>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 65bdb4efc..d5d9c9c91 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -31,8 +31,10 @@ en:
     announcement: Announcement
     asset: Asset
     attributes: Attributes
+    author: Author
     cant_delete_self: You can not delete yourself.
     cant_revoke_self_admin: You can not revoke your admin role yourself.
+    choose_file: Choose a file...
     class: Class
     content: Content
     create_error_link: Error when creating link.
@@ -63,6 +65,7 @@ en:
     home: Home
     id: ID
     info: Information
+    intro: Introduction
     is_published: Is published
     item: Item
     key: Key
@@ -87,6 +90,7 @@ en:
     name: Name
     new_asset: New asset
     new_component: New component
+    new_design: New design
     new_home: New homepage
     new_layout: New layout
     new_link: New link
@@ -104,6 +108,8 @@ en:
     registered: Registered
     role: Role
     roles: Roles
+    setup_member: Member setup
+    site: Site
     title: Title
     translation: Translation
     type: Type
@@ -117,6 +123,7 @@ en:
     update_success_page: Page was successfully updated.
     update_success_snippet: Snippet was successfully updated.
     update_success_user: User was successfully updated.
+    upload_design: Upload design
     url: URL
     user: User
     user_info: User information
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 9d0466122..eeb7db50a 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -26,8 +26,10 @@ zh_tw:
     announcement: 公告
     asset: 資產
     attributes: 屬性
+    author: 作者
     cant_delete_self: 您不可以刪除自己。
     cant_revoke_self_admin: 您不可以撤銷自己的管理作用。
+    choose_file: 選擇一個文件...
     class: 階級
     content: 內容
     create_error_link: 創建連接時出錯。
@@ -36,11 +38,12 @@ zh_tw:
     create_success_layout: 樣板已成功創建。
     create_success_link: 連結已成功創建。
     create_success_page: 頁面已成功創建。
-    create_success_snippet: 片段已成功創建
+    create_success_snippet: 片段已成功創建。
     create_success_user: 用戶已成功創建。。
     data: 數據
     delete_language: 刪除語言
     description: 描述
+    design:  設計
     disable_language: 禁用語言
     editing_home: 編輯首頁
     editing_layout: 編輯樣板
@@ -57,19 +60,21 @@ zh_tw:
     home: 首頁
     id: ID
     info: 資料
+    intro: 簡介
     is_published: 被出版
     item: 項目
     key: 關鍵
     language: 語言
     layout: 佈局
     layout_name: 佈局名字
-    list_assets: 資產清單
-    list_items: 項目清單
-    list_layouts: 佈局清單
-    list_snippets: 斷片清單
-    list_users: 使用清單
-    list_user_infos: 用戶資料清單
-    list_user_roles: 用戶角色清單
+    list_assets: 資產列表
+    list_designs: 設計列表
+    list_items: 項目列表
+    list_layouts: 佈局列表
+    list_snippets: 斷片列表
+    list_users: 使用列表
+    list_user_infos: 用戶資料列表
+    list_user_roles: 用戶角色列表
     member: 會員
     move_down: 往下移
     move_up: 往上移
@@ -80,6 +85,7 @@ zh_tw:
     name: 名稱
     new_asset: 新增資產
     new_component: 新增元件
+    new_design: 新設計
     new_home: 新增首頁
     new_layout: 新增樣板
     new_link: 新增連結
@@ -93,8 +99,11 @@ zh_tw:
     orig_upload_file: 原上傳檔名
     position: 位置
     published?: 發布?
+    purchase: 購買
     role: 角色
-    roles: 角色。
+    roles: 角色
+    setup_member: 成員設置
+    site: 網站
     title: 標題
     translation: 翻譯
     type: 類型
@@ -107,6 +116,7 @@ zh_tw:
     update_success_page: 頁面已成功更新。
     update_success_snippet: 片段已成功更新。
     update_success_user: 用戶已成功更新
+    upload_design: 上傳設計
     url: URL
     user: 用戶
     user_info: 用戶資料