diff --git a/app/views/admin/ad_banners/_ad_banner_tab.html.erb b/app/views/admin/ad_banners/_ad_banner_tab.html.erb index 257b15715..561609315 100644 --- a/app/views/admin/ad_banners/_ad_banner_tab.html.erb +++ b/app/views/admin/ad_banners/_ad_banner_tab.html.erb @@ -30,7 +30,7 @@ <% if at_least_module_manager %> <%= show_ad_banner_permission_link ad_banner_tab%> - <%= link_to t('ad.delete_banner'),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %> + <%= link_to t(:delete),admin_ad_banner_path(ad_banner_tab),:class => 'btn',:method => :delete,:confirm => t('sure?') %> <% end -%> <%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %> diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb index 90902b05d..008421bc9 100644 --- a/app/views/admin/ad_images/_form.html.erb +++ b/app/views/admin/ad_images/_form.html.erb @@ -19,7 +19,7 @@
-

Date

+

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

@@ -73,7 +73,7 @@
-

Picture

+

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

@@ -101,7 +101,7 @@
-

Type

+

<%= t(:type) %>

<%= f.select :link_open ,AdImage::LINK_OPEN_TYPES%>
@@ -111,7 +111,7 @@
-

FEQ

+

<%= t(:frequency) %>

<%= f.text_field :weight ,:class=> 'span3',:placeholder=>"在套圖中出現次數 1次請輸入1" %>
@@ -121,7 +121,7 @@
-

Link

+

<%= t(:link) %>

<%= f.text_field :out_link ,:class=> 'span3',:placeholder => "輸入連結"%>
diff --git a/app/views/admin/module_apps_new_interface/setting.html.erb b/app/views/admin/module_apps_new_interface/setting.html.erb index b3c04c5f6..c221ecdfa 100644 --- a/app/views/admin/module_apps_new_interface/setting.html.erb +++ b/app/views/admin/module_apps_new_interface/setting.html.erb @@ -27,7 +27,7 @@ <% form_tag admin_module_app_manager_auth_proc_path do %> <%= render :partial => "layouts/users_checkbox_ary" %>
- <%= submit_tag "Update", :class => 'btn btn-primary' %> + <%= submit_tag t(:update_), :class => 'btn btn-primary' %>
<% end -%> <% end -%> diff --git a/app/views/admin/object_auths_new_interface/setting.html.erb b/app/views/admin/object_auths_new_interface/setting.html.erb index 7f64f8812..048832843 100644 --- a/app/views/admin/object_auths_new_interface/setting.html.erb +++ b/app/views/admin/object_auths_new_interface/setting.html.erb @@ -29,7 +29,7 @@ <%= render :partial => "layouts/users_checkbox_ary" %>
<%= hidden_field_tag 'app_key', @module_app.key %> - <%= submit_tag "Update", :class => 'btn btn-primary' %> + <%= submit_tag t(:update_), :class => 'btn btn-primary' %>
<% end -%> <% end -%> diff --git a/app/views/admin/page_parts/_edit.html.erb b/app/views/admin/page_parts/_edit.html.erb index 27a3f350d..5a27bc686 100644 --- a/app/views/admin/page_parts/_edit.html.erb +++ b/app/views/admin/page_parts/_edit.html.erb @@ -2,7 +2,7 @@ <% LIST[:page_part_kinds].each do |kind| %> <%= f.radio_button :kind, kind, :class => 'part_kind' %> - <%= t(kind, :scope => 'page_part_kinds' %> + <%= t(kind, :scope => 'page_part_kinds') %> <% end %> <% LIST[:page_part_kinds].each do |kind| %> diff --git a/app/views/admin/tags/_add.html.erb b/app/views/admin/tags/_add.html.erb index 12194c9f4..986096f40 100644 --- a/app/views/admin/tags/_add.html.erb +++ b/app/views/admin/tags/_add.html.erb @@ -3,5 +3,5 @@ <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %> <% end %> <%= f.hidden_field :module_app_id, :value => @module_app_id %> - <%= f.submit %> + <%= f.submit t(:add) %> <% end %> \ No newline at end of file diff --git a/app/views/admin/tags/_form.html.erb b/app/views/admin/tags/_form.html.erb index 566e42ac4..f097fcf3b 100644 --- a/app/views/admin/tags/_form.html.erb +++ b/app/views/admin/tags/_form.html.erb @@ -3,5 +3,5 @@ <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %> <% end %> <%= f.hidden_field :module_app_id, :value => tag.module_app_id %> - <%= f.submit %> + <%= f.submit t(:update_) %> <% end %> \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 5236e3c9d..cfbaabeb0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -130,6 +130,7 @@ en: file_: File file_type: File Type forgot_password: Forgot your password? + frequency: Frequency help: Help hidden: Hidden hide: Hide @@ -266,6 +267,7 @@ en: status: Status structure: Structure sub_manager: SubManager + subtitle: Subtitle submit: Submit submit_approval: Submit approval submit_user_list: Submit user list diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 1249dac9e..de925dcd7 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -130,6 +130,7 @@ zh_tw: file_: 檔案 file_type: 檔案類型 forgot_password: 忘記密碼? + frequency: 頻率 help: 幫助 hidden: 隱藏的 hide: 隱藏 @@ -266,6 +267,7 @@ zh_tw: status: 身份 structure: 結構 sub_manager: 次管理員 + subtitle: 副標題 submit: 送出 submit_approval: 送出已核准 submit_user_list: 送出使用者列表 diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/setting.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/setting.html.erb index 7f875d4b0..018327d6e 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/setting.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/approvals/setting.html.erb @@ -25,7 +25,7 @@ <% form_tag panel_announcement_back_end_approval_setting_path do %> <%= render :partial => "layouts/users_checkbox_ary" %>
- <%= submit_tag "Update", :class => 'btn btn-primary' %> + <%= submit_tag t(:update_), :class => 'btn btn-primary' %>
<% end -%> <% end -%> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb index 0de7d2e85..9c9880b8e 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb @@ -2,10 +2,10 @@ <%= form_for(@bulletin_category, :remote => true, :url => @url) do |f| %> -

<%= (@bulletin_category.new_record? ? 'Add' : 'Edit') %>

+

<%= @bulletin_category.new_record? ? t(:add) : t(:edit) %>

- <%= f.label :key %> + <%= f.label :key, t(:key) %> <%= f.text_field :key %>
@@ -13,7 +13,7 @@ <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %>
- <%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> + <%= label_tag "name-#{locale}", "#{t(:name)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
<%= f.text_field locale, :class => 'input-xxlarge', :value => (@bulletin_category.title_translations[locale] rescue nil) %>
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 187841046..9d4d8df81 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 @@ -57,7 +57,7 @@
-

Approval Status

+

<%= t('approval.stat') %>

<%= @bulletin.not_checked_reason rescue t("rejected_reason_empty") %>
@@ -129,7 +129,7 @@
- <%= f.label :text ,t('announcement.bulletin.text')%> + <%= f.label :text ,t(:text)%> <%= f.fields_for :text_translations do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea', :value => (@bulletin.text_translations[locale] rescue nil) %> diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb index 0870d9c44..c5fd90347 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb @@ -12,7 +12,7 @@ <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %>
- <%= label_tag "title-#{locale}", "Title-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> + <%= label_tag "title-#{locale}", "#{t(:title)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
<%= f.text_field locale, :class => 'input-xxlarge', :value => (bulletin.title_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb index 006213320..f93bb4cf6 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb @@ -5,4 +5,4 @@ ['start_date', 'postdate', 'span1-2', :start_date], ['end_date', 'deadline', 'span1-2', :end_date], ['tags', 'tags', 'span1-2', :tags], - ['last_modified', 'update_user_id','span1-3', 'bulletin.last_modified']).html_safe %> + ['last_modified', 'update_user_id','span1-3', 'last_modified']).html_safe %> diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb index 5edddd043..7832a7329 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_approvals/setting.html.erb @@ -25,7 +25,7 @@ <% form_tag panel_news_back_end_approval_setting_path do %> <%= render :partial => "layouts/users_checkbox_ary" %>
- <%= submit_tag "Update", :class => 'btn btn-primary' %> + <%= submit_tag t(:update_), :class => 'btn btn-primary' %>
<% end -%> <% end -%> diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_form.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_form.html.erb index c7860c0ce..3f45b910d 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_form.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/_form.html.erb @@ -2,10 +2,10 @@ <%= form_for(@news_bulletin_category, :remote => true, :url => @url) do |f| %> -

<%= (@news_bulletin_category.new_record? ? 'Add' : 'Edit') %>

+

<%= (@news_bulletin_category.new_record? ? t(:edit) : t(:add)) %>

- <%= f.label :key %> + <%= f.label :key, t(:key) %> <%= f.text_field :key %>
@@ -13,7 +13,7 @@ <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %>
- <%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> + <%= label_tag "name-#{locale}", "#{t(:name)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
<%= f.text_field locale, :class => 'input-xxlarge', :value => (@news_bulletin_category.title_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb index c0e6cb91c..95de498c9 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb @@ -106,7 +106,7 @@
-

Approval Status

+

<%= t('approval.stat') %>

<%= @news_bulletin.not_checked_reason rescue t("rejected_reason_empty") %>
@@ -131,7 +131,7 @@
<%= alert_block_tag(t("activerecord.errors.template.body"),session[:in_validate_object].errors.messages) unless session[:in_validate_object].blank? %> - <%= f.label :unit_list_for_anc,t('news_bulletin.news_bulletin.unit_name')%> + <%= f.label :unit_list_for_anc,t(:unit_name)%> <%= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title, t.id ]}, {:prompt => t("news_bulletin.ut_prompt")}, :class => "input-medium" %> <%= f.label :category,t(:category) %> 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 6eb3b4c72..08a7d000a 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 @@ -12,7 +12,7 @@ <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %>
- <%= label_tag "title-#{locale}", "Title-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> + <%= label_tag "title-#{locale}", "#{t(:title)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
<%= f.text_field locale, :class => 'input-xxlarge', :value => (news_bulletin.title_translations[locale] rescue nil) %>
diff --git a/vendor/built_in_modules/news/config/locales/en.yml b/vendor/built_in_modules/news/config/locales/en.yml index 6168077fc..a1ae98a6d 100644 --- a/vendor/built_in_modules/news/config/locales/en.yml +++ b/vendor/built_in_modules/news/config/locales/en.yml @@ -1,6 +1,6 @@ en: - news: + news_bulletin: campus_news: Campus News create_news_bulletin_category_success: News category was successfully created create_news_bulletin_success: News was successfully created diff --git a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb index d41fb6d9c..6fe7c0644 100644 --- a/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb +++ b/vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb @@ -5,7 +5,7 @@
- <%= f.label :name %> + <%= f.label :name, t(:name) %> <%= @page_context.page.title %>
@@ -22,7 +22,7 @@
">
- <%= f.label :context %> + <%= f.label :context, t(:content) %> <%= f.fields_for :context_translations do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea', :value => (@page_context.context_translations[locale] rescue nil) %> diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb index 4b19235d6..6c9e5ac3b 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_link_categorys/_form.html.erb @@ -2,10 +2,10 @@ <%= form_for(@web_link_category, :remote => true, :url => @url) do |f| %> -

<%= (@web_link_category.new_record? ? 'Add' : 'Edit') %>

+

<%= (@web_link_category.new_record? ? t(:add) : t(:edit)) %>

- <%= f.label :key %> + <%= f.label :key, t(:key) %> <%= f.text_field :key %>
@@ -13,7 +13,7 @@ <%= f.fields_for :title_translations do |f| %> <% @site_valid_locales.each do |locale| %>
- <%= label_tag "name-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %> + <%= label_tag "name-#{locale}", "#{t(:name)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
<%= f.text_field locale, :class => 'input-xxlarge', :value => (@web_link_category.title_translations[locale] rescue nil) %>
@@ -23,7 +23,7 @@
- <%= f.submit 'Submit/送出', :class=>'btn btn-primary' %> + <%= f.submit t(:submit), :class=>'btn btn-primary' %>
<% end %> diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb index 3200574ff..d657ce7b1 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb @@ -77,7 +77,7 @@
- <%= f.label :describe,t("web_resource.describe") %> + <%= f.label :describe, t(:description) %> <%= f.fields_for :context_translations do |f| %> <%= I18nVariable.from_locale(locale) %> <%= f.text_area locale, :style=>"width:100%", :value => (@web_link.context_translations[locale] rescue nil) %>