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

Conflicts:
	config/locales/zh_tw.yml
This commit is contained in:
Matthew K. Fu JuYuan 2012-09-28 09:49:22 +08:00
commit aa5d0bb1ad
9 changed files with 17 additions and 15 deletions

View File

@ -14,11 +14,11 @@ function load_tinymce() {
theme_advanced_toolbar_align : "left", theme_advanced_toolbar_align : "left",
theme_advanced_statusbar_location : "bottom", theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true, theme_advanced_resizing : true,
relative_urls : false,
// Skin options // Skin options
skin : "o2k7", skin : "o2k7",
skin_variant : "silver", 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 // Drop lists for link/image/media/template dialogs
template_external_list_url : "js/template_list.js", template_external_list_url : "js/template_list.js",
// external_link_list_url : "js/link_list.js", // external_link_list_url : "js/link_list.js",

View File

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

View File

@ -3,7 +3,7 @@
<div class="modal hide fade in" id="ob_auth-<%=ob_auth.id%>"> <div class="modal hide fade in" id="ob_auth-<%=ob_auth.id%>">
<div class="modal-header"> <div class="modal-header">
<a class="close" data-dismiss="modal">×</a> <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>
<div class="modal-body"> <div class="modal-body">
<div class="clear"> <div class="clear">

View File

@ -19,7 +19,7 @@
</li> </li>
</ul> </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> </div>
<%#= label_tag :role, t(:roles) %> <%#= label_tag :role, t(:roles) %>

View File

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

View File

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

View File

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

View File

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

View File

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