diff --git a/app/helpers/admin/item_helper.rb b/app/helpers/admin/item_helper.rb index 3e91f7a3..d6967491 100644 --- a/app/helpers/admin/item_helper.rb +++ b/app/helpers/admin/item_helper.rb @@ -15,7 +15,7 @@ module Admin::ItemHelper ret << "
" ret << (link_to node.title, dest, :class => 'js_history') ret << "
" - ret << (link_to t('admin.edit'), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page') + ret << (link_to t(:edit), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page') ret << (link_to t('new.page'), new_admin_page_path(:parent_id => node.id), :class => 'new_page js_history') if node.class.to_s.eql?('Page') ret << (link_to t('new.link'), new_admin_link_path(:parent_id => node.id), :class => 'new_link js_history') if node.class.to_s.eql?('Page') ret << (link_to t(:delete), eval("delete_admin_#{node.class.to_s.downcase}_path(node, :authenticity_token => form_authenticity_token)"), :confirm => t('sure?'), :class => 'delete js_history') diff --git a/app/views/admin/assets/edit.html.erb b/app/views/admin/assets/edit.html.erb index dee9fcb2..b4b57fab 100644 --- a/app/views/admin/assets/edit.html.erb +++ b/app/views/admin/assets/edit.html.erb @@ -1,7 +1,7 @@ <% content_for :secondary do %>
    -
  • <%= link_to t('admin.new_asset'), new_admin_asset_path, :remote => true, :class => 'button positive' %>
    • +
  • <%= link_to t('new.asset'), new_admin_asset_path, :remote => true, :class => 'button positive' %>
<% end -%> diff --git a/app/views/admin/assets/new.html.erb b/app/views/admin/assets/new.html.erb index 45d6a4b6..8208541f 100644 --- a/app/views/admin/assets/new.html.erb +++ b/app/views/admin/assets/new.html.erb @@ -1,7 +1,7 @@ <% content_for :secondary do %>
    -
  • <%= link_to t('admin.new_asset'), new_admin_asset_path, :remote => true, :class => 'button positive' %>
    • +
  • <%= link_to t('new.asset'), new_admin_asset_path, :remote => true, :class => 'button positive' %>
<% end -%> diff --git a/app/views/admin/attributes/index.html.erb b/app/views/admin/attributes/index.html.erb index babfc989..41ed6e12 100644 --- a/app/views/admin/attributes/index.html.erb +++ b/app/views/admin/attributes/index.html.erb @@ -9,7 +9,7 @@ - + diff --git a/app/views/admin/infos/_form.html.erb b/app/views/admin/infos/_form.html.erb index a65b01e9..3635b7c8 100644 --- a/app/views/admin/infos/_form.html.erb +++ b/app/views/admin/infos/_form.html.erb @@ -1,5 +1,5 @@
-

<%= t("admin.#{@attribute_type}") %>

+

<%= t("#{@attribute_type}") %>

<%= t("admin.#{@attribute_type}") %><%= t("#{@attribute_type}") %> <%= t(:action) %>
diff --git a/app/views/admin/roles/_form.html.erb b/app/views/admin/roles/_form.html.erb index 9a395c4a..aaa3ef0d 100644 --- a/app/views/admin/roles/_form.html.erb +++ b/app/views/admin/roles/_form.html.erb @@ -1,5 +1,5 @@
-

<%= t("admin.#{@attribute_type}") %>

+

<%= t("#{@attribute_type}") %>

diff --git a/app/views/admin/users/_info.html.erb b/app/views/admin/users/_info.html.erb index 53a044d4..13da3a6d 100644 --- a/app/views/admin/users/_info.html.erb +++ b/app/views/admin/users/_info.html.erb @@ -5,7 +5,7 @@
- + <% @site_valid_locales.each do |locale| %> <% end %> diff --git a/app/views/admin/users/_show_attribute.html.erb b/app/views/admin/users/_show_attribute.html.erb index 98e8713c..4408d688 100644 --- a/app/views/admin/users/_show_attribute.html.erb +++ b/app/views/admin/users/_show_attribute.html.erb @@ -1,7 +1,7 @@
<%= t("admin.key") %><%= t(:key) %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
- + <% @site_valid_locales.each do |locale| %> <% end %> diff --git a/app/views/admin/users/_sub_role.html.erb b/app/views/admin/users/_sub_role.html.erb index 36c8b0b7..5838f345 100644 --- a/app/views/admin/users/_sub_role.html.erb +++ b/app/views/admin/users/_sub_role.html.erb @@ -4,7 +4,7 @@
<%= t("admin.key") %><%= t(:key) %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
- + <% @site_valid_locales.each do |locale| %> <% end %> diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb index 5c08ce59..02282605 100644 --- a/app/views/layouts/_side_bar.html.erb +++ b/app/views/layouts/_side_bar.html.erb @@ -13,7 +13,7 @@ <%= content_tag :li, link_to(t(:categories), panel_announcement_back_end_bulletin_categorys_path), :class =>( active_for_action('bulletin_categorys', 'index') || active_for_ob_auths_object("BulletinCategory") ) %> <%= content_tag :li, link_to(t(:tags), panel_announcement_back_end_tags_path), :class => active_for_action('/panel/announcement/back_end/tags', 'index') %> <%= content_tag :li, link_to(t('approval.setting'), panel_announcement_back_end_approval_setting_path), :class => active_for_action('approvals', 'setting') if (is_manager? rescue true) %> - <%= content_tag :li, link_to(t('admin.module_authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "Announcement"}))), :class => active_for_app_auth('Announcement') if (is_admin? rescue nil) %> + <%= content_tag :li, link_to(t(:module_authorization),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "Announcement"}))), :class => active_for_app_auth('Announcement') if (is_admin? rescue nil) %> <% end -%> @@ -27,7 +27,7 @@ <%= content_tag :li, link_to(t(:categories), panel_news_back_end_news_bulletin_categorys_path), :class => active_for_action('news_bulletin_categorys', 'index') || active_for_ob_auths_object("NewsBulletinCategory") %> <%= content_tag :li, link_to(t(:tags), panel_news_back_end_tags_path), :class => active_for_action('/panel/news/back_end/tags', 'index') %> <%= content_tag :li, link_to(t('approval.setting'), panel_news_back_end_approval_setting_path), :class => active_for_action('news_approvals', 'setting') if (is_manager? rescue true) %> - <%= content_tag :li, link_to(t('admin.module_authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "news"}))), :class => active_for_app_auth('news') if (is_admin? rescue nil) %> + <%= content_tag :li, link_to(t(:module_authorization),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "news"}))), :class => active_for_app_auth('news') if (is_admin? rescue nil) %> <% end -%> <% end -%> @@ -40,7 +40,7 @@ <%= link_to content_tag(:i, nil, :class => 'icons-page') + t(:page), panel_page_content_back_end_page_contexts_path %> <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('page_contexts')) do -%> <%#= content_tag :li, link_to(t(:list_), panel_page_content_back_end_page_contexts_path), :class => active_for_action('page_context', 'index') %> - <%= content_tag :li, link_to(t('admin.module_authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "page_content"}))), :class => active_for_app_auth('page_content') if (is_admin? rescue nil) %> + <%= content_tag :li, link_to(t(:module_authorization),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "page_content"}))), :class => active_for_app_auth('page_content') if (is_admin? rescue nil) %> <% end -%> <% end -%> @@ -52,7 +52,7 @@ <%#= content_tag :li, link_to(t('list.ad_banner'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %> <%#= content_tag :li, link_to(t('new.banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %> <%#= content_tag :li, link_to(t('ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %> - <%= content_tag :li, link_to(t('admin.module_authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "ad_banners"}))), :class => active_for_app_auth('ad_banners') if (is_admin? rescue nil) %> + <%= content_tag :li, link_to(t(:module_authorization),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "ad_banners"}))), :class => active_for_app_auth('ad_banners') if (is_admin? rescue nil) %> <% end -%> <% end %> @@ -63,7 +63,7 @@ <%= content_tag :li, link_to(t(:add), new_panel_web_resource_back_end_web_link_path), :class => active_for_action('web_links', 'new') %> <%= content_tag :li, link_to(t(:categories), panel_web_resource_back_end_web_link_categorys_path), :class => (active_for_action('web_link_categorys', 'index') || active_for_ob_auths_object("WebLinkCategory")) %> <%= content_tag :li, link_to(t(:tags), panel_web_resource_back_end_tags_path), :class => active_for_action('/panel/web_resource/back_end/tags', 'index') %> - <%= content_tag :li, link_to(t('admin.module_authorization'),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "web_resource"}))), :class => active_for_app_auth('web_resource') if (is_admin? rescue nil) %> + <%= content_tag :li, link_to(t(:module_authorization),admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {title: "web_resource"}))), :class => active_for_app_auth('web_resource') if (is_admin? rescue nil) %> <% end -%> <% end -%> @@ -71,7 +71,7 @@ <%#= link_to content_tag(:i, nil, :class => 'icons-link') + t(:asset), admin_assets_path %> <%#= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('assets', '/admin/asset_tags', 'asset_categories')) do -%> <%#= content_tag :li, link_to(t('list.asset'), admin_assets_path), :class => active_for_action('assets', 'index') %> - <%#= content_tag :li, link_to(t('admin.categories'), admin_asset_categories_path), :class => active_for_action('asset_categories', 'index') %> + <%#= content_tag :li, link_to(t(:categories), admin_asset_categories_path), :class => active_for_action('asset_categories', 'index') %> <%#= content_tag :li, link_to(t(:tags), admin_asset_tags_path), :class => active_for_action('/admin/asset_tags', 'index') %> <%# end -%> <%# end -%> diff --git a/app/views/shared/_privilege_user.html.erb b/app/views/shared/_privilege_user.html.erb index 504689a8..79cb4023 100644 --- a/app/views/shared/_privilege_user.html.erb +++ b/app/views/shared/_privilege_user.html.erb @@ -1,6 +1,6 @@
- <%= content_tag :div,:data=>{'original-title' => t('approval.setting_window_title'),:content => (user.cache_dept[I18n.locale.to_s] rescue '')},:class=>"checkbox clear" do %> + <%= content_tag :div,:data=>{'original-title' => t(:title),:content => (user.cache_dept[I18n.locale.to_s] rescue '')},:class=>"checkbox clear" do %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index d27a6112..5236e3c9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -77,6 +77,7 @@ en: cant_delete_self: You can not delete yourself. cant_empty_star: Cannot be empty (*) cant_revoke_self_admin: You can not revoke your admin role yourself. + categories: Categories category: Category category_auth: Category Authorization clear: Clear @@ -137,6 +138,7 @@ en: horizontal: Horizontal hot: Hot image: Image + info: Information intro: Introduction is_published: Is published item: Item @@ -167,6 +169,7 @@ en: tls: TLS user_name: User Name manager: Manager + manager: Manager me: Me member: Member menu_enabled_for: Menu enabled for @@ -312,3 +315,14 @@ en: visitors_this_year: This year's visitors visitors_today: Today's visitors yes_: "Yes" + + nccu: + date: Date + file: File + file_description: Description + file_name: Name + link_name: Name + picture: Picture + selected_file: File + tags: Tags + url: URL diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 9bc26ba1..1249dac9 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -1,6 +1,6 @@ zh_tw: - _locale: English + _locale: 中文 access: denied: @@ -77,6 +77,7 @@ zh_tw: cant_delete_self: 不可以刪除自己 cant_empty_star: 不能為空白 (*) cant_revoke_self_admin: 不可以撤銷自己的管理身份 + categories: 類別 category: 類別 category_auth: 類別授權 clear: 清除 @@ -137,6 +138,7 @@ zh_tw: horizontal: 水平的 hot: 熱門 image: 圖片 + info: 信息 intro: 簡介 is_published: 已發佈 item: 項目 @@ -167,6 +169,7 @@ zh_tw: tls: 電子郵件TLS user_name: 電子郵件帳號 manager: 管理者 + manager: 管理者 me: 我 member: 會員 menu_enabled_for: 選單啟用 @@ -190,7 +193,7 @@ zh_tw: user: 新增使用者 info: 新增使用者資訊 role: 新增使用者角色 - news: 公告 + news: 新聞 no_: "不是" no_deadline: 沒有期限 object_auth: @@ -330,3 +333,253 @@ zh_tw: web_link: title: 名稱 url: 路徑 + + nccu: + date: 起迄日期 + file: 附加檔案 + file_description: 檔案描述 + file_name: 檔案名稱 + link_name: 連結名稱 + picture: 刊頭圖片 + selected_file: 選擇檔案 + tags: 頁籤 + url: 連結位置 + + + + + + +# Chinese (Taiwan) translations for Ruby on Rails +# by tsechingho (http://github.com/tsechingho) + date: + formats: + default: "%Y-%m-%d" + short: "%b%d日" + long: "%Y年%b%d日" + day_names: [星期日, 星期一, 星期二, 星期三, 星期四, 星期五, 星期六] + abbr_day_names: [日, 一, 二, 三, 四, 五, 六] + month_names: [~, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月] + abbr_month_names: [~, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月] + order: [ :year, :month, :day ] + + time: + formats: + default: "%Y年%b%d日 %A %H:%M:%S %Z" + short: "%b%d日 %H:%M" + long: "%Y年%b%d日 %H:%M" + am: "上午" + pm: "下午" + + datetime: + distance_in_words: + half_a_minute: "半分鐘" + less_than_x_seconds: + one: "不到一秒" + other: "不到 %{count} 秒" + x_seconds: + one: "一秒" + other: "%{count} 秒" + less_than_x_minutes: + one: "不到一分鐘" + other: "不到 %{count} 分鐘" + x_minutes: + one: "一分鐘" + other: "%{count} 分鐘" + about_x_hours: + one: "大約一小時" + other: "大約 %{count} 小時" + x_days: + one: "一天" + other: "%{count} 天" + about_x_months: + one: "大約一個月" + other: "大約 %{count} 個月" + x_months: + one: "一個月" + other: "%{count} 個月" + about_x_years: + one: "大約一年" + other: "大約 %{count} 年" + over_x_years: + one: "一年多" + other: "%{count} 年多" + almost_x_years: + one: "接近一年" + other: "接近 %{count} 年" + prompts: + year: "年" + month: "月" + day: "日" + hour: "時" + minute: "分" + second: "秒" + + number: + format: + separator: "." + delimiter: "," + precision: 3 + significant: false + strip_insignificant_zeros: false + currency: + format: + format: "%u %n" + unit: "NT$" + separator: "." + delimiter: "," + precision: 2 + significant: false + strip_insignificant_zeros: false + percentage: + format: + delimiter: "" + precision: + format: + delimiter: "" + human: + format: + delimiter: "" + precision: 1 + significant: false + strip_insignificant_zeros: false + storage_units: + format: "%n %u" + units: + byte: + one: "Byte" + other: "Bytes" + kb: "KB" + mb: "MB" + gb: "GB" + tb: "TB" + decimal_units: + format: "%n %u" + units: + # 10^-21 zepto, 10^-24 yocto + atto: "渺" # 10^-18 + femto: "飛" # 10^-15 毫微微 + pico: "漠" # 10^-12 微微 + nano: "奈" # 10^-9 毫微 + micro: "微" # 10^-6 + mili: "毫" # 10^-3 milli + centi: "厘" # 10^-2 + deci: "分" # 10^-1 + unit: "" + ten: + one: "十" + other: "十" # 10^1 + hundred: "百" # 10^2 + thousand: "千" # 10^3 kilo + million: "百萬" # 10^6 mega + billion: "十億" # 10^9 giga + trillion: "兆" # 10^12 tera + quadrillion: "千兆" # 10^15 peta + # 10^18 exa, 10^21 zetta, 10^24 yotta + + support: + array: + words_connector: ", " + two_words_connector: " 和 " + last_word_connector: ", 和 " + select: + prompt: "請選擇" + + search: + not_found: "沒有搜尋結果" + domains: Google Search Domains + site_search: "全站搜尋" + sitesearch: Google Site Search + site_setting_help: 請輸入送交Google搜尋的參數 + result_get: "搜尋有關 ' %{search_word} ' 共搜尋到%{item_num}筆資料" + too_many: "搜尋有關 ' %{search_word} ' 尋找到超過 %{exceed_num} 筆資料，請嘗試加入更多關鍵字縮小搜尋範圍，以作更精確的搜尋" + + result_get: "搜尋標題有關 ' %{search_word} ' 共搜尋到%{item_num}筆資料" + unit_get: "列出由:%{unit_name}發佈的資料，共有%{item_num}筆" + activerecord: + errors: + template: # ~ 2.3.5 backward compatible + header: + one: "有 1 個錯誤發生使得「%{model}」無法被儲存。" + other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。" + body: "以下欄位發生問題：" + full_messages: + format: "%{attribute} %{message}" + messages: + inclusion: "沒有包含在列表中" + exclusion: "是被保留的關鍵字" + invalid: "是無效的" + confirmation: "不符合確認值" + accepted: "必須是可被接受的" + empty: "不能留空" + blank: "不能是空白字元" + too_long: "過長（最長是 %{count} 個字）" + too_short: "過短（最短是 %{count} 個字）" + wrong_length: "字數錯誤（必須是 %{count} 個字）" + not_a_number: "不是數字" + not_an_integer: "必須是整數" + greater_than: "必須大於 %{count}" + greater_than_or_equal_to: "必須大於或等於 %{count}" + equal_to: "必須等於 %{count}" + less_than: "必須小於 %{count}" + less_than_or_equal_to: "必須小於或等於 %{count}" + odd: "必須是奇數" + even: "必須是偶數" + taken: "已經被使用" + record_invalid: "校驗失敗: %{errors}" + + activemodel: + errors: + template: + header: + one: "有 1 個錯誤發生使得「%{model}」無法被儲存。" + other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。" + body: "以下欄位發生問題：" + + errors: + format: "%{attribute} %{message}" + messages: + inclusion: "沒有包含在列表中" + exclusion: "是被保留的關鍵字" + invalid: "是無效的" + confirmation: "不符合確認值" + accepted: "必須是可被接受的" + empty: "不能留空" + blank: "不能是空白字元" + too_long: "過長（最長是 %{count} 個字）" + too_short: "過短（最短是 %{count} 個字）" + wrong_length: "字數錯誤（必須是 %{count} 個字）" + not_a_number: "不是數字" + not_an_integer: "必須是整數" + greater_than: "必須大於 %{count}" + greater_than_or_equal_to: "必須大於或等於 %{count}" + equal_to: "必須等於 %{count}" + less_than: "必須小於 %{count}" + less_than_or_equal_to: "必須小於或等於 %{count}" + odd: "必須是奇數" + even: "必須是偶數" + template: + header: + one: "有 1 個錯誤發生使得「%{model}」無法被儲存。" + other: "有 %{count} 個錯誤發生使得「%{model}」無法被儲存。" + body: "以下欄位發生問題：" + + helpers: + select: + prompt: "請選擇" + submit: + create: "新增%{model}" + update: "更新%{model}" + submit: "儲存%{model}" + modal: + close: "關閉" + preview: "預覽" + sys: + not_previewable: "不支援預覽" + limit_of_upload_file_size: "上傳檔案大小限制: %{best_size}" + preview_only_for_img: "預覽僅支援：jpg,png,gif,bmp...等圖片格式" + can_not_display_due_to_no_context: "因為沒有中文版本，所以無法顯示" + module_page_lang_not_support: "很抱歉，本頁沒有開放中文版本" + object_disable: + change_to_true: "設為停用" + change_to_false: "重新啓用" \ No newline at end of file diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb index e427fde5..18784104 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb @@ -11,16 +11,16 @@
-

Date

+

<%= t('nccu.date') %>

- +
<%= f.datetime_select :postdate, {:use_month_numbers => true, :order => [:day, :month, :year] }, {:class => 'span1'} %>
- +
<%= f.datetime_select :deadline, {:use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, {:class => 'span1'} %>
@@ -33,7 +33,7 @@
-

Status

+

<%= t(:status) %>

<%= content_tag :label,:class => "checkbox inline" do -%> @@ -67,7 +67,7 @@
-

Tags

+

<%= t('nccu.tags') %>

<% @tags.each do |tag| %> @@ -147,7 +147,7 @@

-

Link

+

<%= t(:link) %>

<%= t("admin.key") %><%= t(:key) %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
- - + + @@ -191,7 +191,7 @@
-

File

+

<%= t('nccu.file') %>

@@ -199,9 +199,9 @@
URLName<%= t('nccu.url') %><%= t('nccu.link_name') %>
- - - + + + diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb index 23ac4c6e..13bc51b3 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb @@ -1,8 +1,8 @@ -
FileName<%= t('description') %><%= t('nccu.selected_file') %><%= t('nccu.file_name') %><%= t('nccu.file_description') %>
- - + + @@ -230,7 +230,7 @@
-

File

+

<%= t('nccu.file') %>

@@ -238,9 +238,9 @@
URLName<%= t('nccu.url') %><%= t('nccu.link_name') %>
- - - + + + diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb index 4b5e063d..fe478387 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb @@ -11,7 +11,7 @@ <%= t(:top) %> <% end %> <% if news_bulletin.is_hot? %> - <%= t('news.hot') %> + <%= t('news_bulletin.hot') %> <% end %> <% if news_bulletin.is_hidden? %> <%= t(:hidden) %> diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_quick_edit_basic.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_quick_edit_basic.html.erb index b20221c3..6eb3b4c7 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_quick_edit_basic.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_quick_edit_basic.html.erb @@ -40,7 +40,7 @@
- +
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/edit.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/edit.html.erb index 695e816b..03517b1c 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/edit.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/edit.html.erb @@ -1,8 +1,8 @@ -
    +
    <%= form_for @news_bulletin, :url => panel_news_back_end_news_bulletin_path(@news_bulletin), :html => {:class => 'clear nccu_ajax_form'} do |f| %> <%= render :partial => 'form', :locals => {:f => f} %> diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb index 9bd85122..b332b6f2 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb @@ -16,9 +16,9 @@
FileName<%= t('description') %><%= t('nccu.selected_file') %><%= t('nccu.file_name') %><%= t('nccu.file_description') %>
- + - + <% @news_bulletins.each do |post| %> diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.rss.builder b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.rss.builder index be9e1304..951c8427 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.rss.builder +++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.rss.builder @@ -4,7 +4,7 @@ xml.rss :version => "2.0" do if @current_category xml.title @current_category.title_translations[I18n.locale.to_s] else - xml.title t('news.campus_news') + xml.title t('news_bulletin.campus_news') end xml.link url_for(:action=>"index", :controller=>"panel/news/front_end/news_bulletins" ,:format=> :rss,:only_path=>false,:inner=>true) diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.rss.builder b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.rss.builder index 33b77f41..f6791f60 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.rss.builder +++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.rss.builder @@ -4,7 +4,7 @@ xml.rss :version => "2.0" do if @current_category xml.title @current_category.title_translations[I18n.locale.to_s] else - xml.title t('news.campus_news') + xml.title t('news_bulletin.campus_news') end xml.link url_for(:action=>"index", :controller=>"panel/news/front_end/news_bulletins" ,:format=> :rss,:only_path=>false,:inner=>true) diff --git a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb index c7f26835..5efd6a8a 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb @@ -1,5 +1,5 @@ <% if @news_bulletins and !@news_bulletins.nil? %> -

<%= link_to t('news.campus_news'), panel_news_front_end_news_bulletins_path %>

+

<%= link_to t('news_bulletin.campus_news'), panel_news_front_end_news_bulletins_path %>

<%#= link_to t(:more_plus),panel_news_front_end_news_bulletins_path(), :class => "topic_note" %>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_and_web_links.html.erb b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_and_web_links.html.erb index 5c761a60..6ca165e5 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_and_web_links.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_and_web_links.html.erb @@ -5,7 +5,7 @@
-

<%= t("news.news_bulletins") %>

+

<%= t("news_bulletin.news_bulletins") %>

diff --git a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_list.html.erb b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_list.html.erb index 588c34f0..c75b8612 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_list.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/news_bulletins_list.html.erb @@ -12,7 +12,7 @@ <% @tags.each_with_index do |tag, index| %>
-

<%= t("news.news_bulletins") %>

+

<%= t("news_bulletin.news_bulletins") %>

prev
next
<%= t('news.news_bulletin.image') %><%= t('news_bulletin.news_bulletin.image') %> <%= t(:text) %><%= t('news.news_bulletin.postdate') %><%= t('news_bulletin.news_bulletin.postdate') %>