Merge branch 'master' of github.com:Rulingcom/NCCU

Conflicts:
	config/locales/zh_tw.yml

app/assets/javascripts/tinymce_orbit.js.erb

@@ -14,11 +14,11 @@ function load_tinymce() {
     theme_advanced_toolbar_align : "left",
     theme_advanced_statusbar_location : "bottom",
     theme_advanced_resizing : true,
-
+  relative_urls : false,
     // Skin options
     skin : "o2k7",
     skin_variant : "silver",
-
+    font_size_style_values : "xx-small,x-small,small,medium,large,x-large,xx-large",
     // Drop lists for link/image/media/template dialogs
     template_external_list_url : "js/template_list.js",
     // external_link_list_url : "js/link_list.js",

app/views/admin/assets/file_upload.html.erb

@@ -55,7 +55,7 @@
     <div style="position: absolute; width: 100%; bottom: 0;">
         <div class="modal-footer">
             <!-- <a id='ajax_form_submit' class="btn btn-primary"><#%= t(:create) %></a> -->
-             <input type="submit" value="<%= t(:create) %>" class="btn btn-primary" />
+             <input type="submit" value="<%= t(:create_) %>" class="btn btn-primary" />
         </div>
     </div>
 

app/views/admin/object_auths_new_interface/_modal_list.html.erb

@@ -3,7 +3,7 @@
 <div class="modal hide fade in" id="ob_auth-<%=ob_auth.id%>">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
-    <h3><%= t("object_auth.list_title_of_users",:auth_title => ob_auth.title) %></h3>
+    <h3><%= t("object_auth.list_title_of_users") %></h3>
   </div>
   <div class="modal-body">
 		<div class="clear">

app/views/admin/object_auths_new_interface/setting.html.erb

@@ -19,7 +19,7 @@
 
         </li>
     </ul>
-		<%= link_to t("object_auth.list_title_of_users", :auth_title => @ob_auth.title), admin_object_auth_ob_auth_show_path(:app_key=>@module_app.key), :class=>'preview_trigger btn btn-success pull-right'%>	
+		<%= link_to t("object_auth.list_title_of_users"), admin_object_auth_ob_auth_show_path(:app_key=>@module_app.key), :class=>'preview_trigger btn btn-success pull-right'%>	
 
 </div>
 <%#= label_tag :role, t(:roles) %>

config/locales/en.yml

@@ -37,6 +37,7 @@ en:
   all_member: All Member
   always_display_title: Always displayed in the title bar
   app_auth:
+    list_setting_result: Authorization List
     assigning_manager:
       add_manager_fail: Manager successfully added
       add_manager_ok: Adding manager failed
@@ -199,7 +200,7 @@ en:
   no_deadline: No deadline
   object_auth:
     a_object_must_have_only_one_object_auth_profile_for_each_action: ''
-    list_title_of_users: %{auth_title} authorization list
+    list_title_of_users: authorization list
     new_object_auth: New authorization
   off_upcase: "OFF"
   on_upcase: "ON"

config/locales/zh_tw.yml

@@ -37,6 +37,7 @@ zh_tw:
   all_member: 所有會員
   always_display_title: 永遠顯示標題
   app_auth:
+    list_setting_result: 授權列表
     assigning_manager:
       add_manager_fail: 新增管理員失敗
       add_manager_ok:  新增管理員成功
@@ -143,8 +144,8 @@ zh_tw:
   intro: 簡介
   is_published: 已發佈
   item: 項目
-  key: 關鍵
-  last_modified: 最後一次修改
+  key: 索引
+  last_modified: 最後修改者
   layout: 範本
   link: 連結
   list:
@@ -199,7 +200,7 @@ zh_tw:
   no_deadline: 沒有期限
   object_auth:
     a_object_must_have_only_one_object_auth_profile_for_each_action: ''
-    list_title_of_users: %{auth_title} 授權列表
+    list_title_of_users: 授權列表
     new_object_auth: 新增授權
   off_upcase: "開啟"
   on_upcase: "關閉"
@@ -211,7 +212,7 @@ zh_tw:
     module_widget: 外掛模塊
     public_r_tag: 系統模塊
     text: 文字區域
-  passed: 已認可
+  passed: 通過審核
   password: 密碼
   pending: 待審核
   picture: 圖片
@@ -283,7 +284,7 @@ zh_tw:
   tags: 標籤
   template: 樣版
   template_name: 樣版名稱
-  text: 文字
+  text: 內文
   theme: 主題
   themes: 主題
   title: 標題
@@ -304,7 +305,7 @@ zh_tw:
       user: 使用者已更新成功
     success_: 更新成功
   update_: 更新
-  update_at: 在…更新
+  update_at: 最後更新時間
   url: 網址
   use_status: ''
   user: 使用者

vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb

@@ -152,7 +152,7 @@
 				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
 
 					<div class="title">
-						<%= f.label :title, t(:text)%>
+						<%= f.label :title, t(:title)%>
 						<%= f.fields_for :title_translations do |f| %>
 							<%= I18nVariable.from_locale(locale) %>
 							<%= f.text_field locale, :class=>'post-title', :value => (@news_bulletin.title_translations[locale] rescue nil) %>

vendor/built_in_modules/news/config/locales/en.yml

@@ -14,4 +14,4 @@ en:
     search: Search for News
     update_news_bulletin_category_success: News category was successfully updated
     update_news_bulletin_success: News was successfully updated
-    ut_prompt: Please select UT
+    ut_prompt: Please select Unit

vendor/built_in_modules/news/config/locales/zh_tw.yml

@@ -14,4 +14,4 @@ zh_tw:
     search: 搜尋新聞
     update_news_bulletin_category_success: 新聞類別已成功建立
     update_news_bulletin_success: 新聞已成功更新
-    ut_prompt: 請選擇 UT
+    ut_prompt: 請選擇單位