From 62e9a772f65ea9aadc6af1cad80c4691155f841a Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Sun, 13 May 2012 23:09:48 +0800 Subject: [PATCH] Fix titles for widgets Add translations --- app/views/admin/page_parts/_edit.html.erb | 2 +- config/locales/en.yml | 4 ++++ config/locales/zh_tw.yml | 4 ++++ lib/parsers/parser_common.rb | 2 +- .../panel/announcement/widget/bulletins_controller.rb | 2 +- .../panel/announcement/front_end/bulletins/index.html.erb | 4 ++-- vendor/built_in_modules/announcement/config/locales/en.yml | 2 +- vendor/built_in_modules/announcement/config/locales/zh_tw.yml | 2 +- .../panel/news/widget/news_bulletins_controller.rb | 2 +- .../views/panel/news/front_end/news_bulletins/index.html.erb | 4 ++-- vendor/built_in_modules/news/config/locales/en.yml | 2 +- vendor/built_in_modules/news/config/locales/zh_tw.yml | 4 ++-- .../panel/web_resource/widget/web_links_controller.rb | 2 +- 13 files changed, 22 insertions(+), 14 deletions(-) diff --git a/app/views/admin/page_parts/_edit.html.erb b/app/views/admin/page_parts/_edit.html.erb index ec99c555..eaee4d8f 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) %> + <%= t(kind, :scope => 'admin.page_part_kinds') %> <% end %> <% LIST[:page_part_kinds].each do |kind| %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 07bfe189..0d0707cc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -200,6 +200,10 @@ en: options: Options orig_upload_file: Original filename page: Page + page_part_kinds: + text: Text Area + public_r_tag: System Widget + module_widget: Plug-in Module Widget position: Position published?: Published? purchase: Purchase diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index ae1b92f3..b4d644c7 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -195,6 +195,10 @@ zh_tw: options: 選項 orig_upload_file: 原上傳檔名 page: 頁面管理 + page_part_kinds: + text: 文字區塊 + public_r_tag: 系統模塊 + module_widget: 外掛模塊 position: 位置 published?: 發布? purchase: 購買 diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index b9c56642..4afa586c 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -183,7 +183,7 @@ module ParserCommon ret << part.i18n_variable[I18n.locale] rescue '' when 'module_widget' url = "/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true" - options = "&category_id=#{!part[:category].blank? ? part[:category].blank? : params[:category_id]}&tag_id=#{!part[:tag].blank? ? part[:tag] : params[:tag_id]}&page=#{params[:page]}&part_title=part_title" + options = "&category_id=#{!part[:category].blank? ? part[:category].blank? : params[:category_id]}&tag_id=#{!part[:tag].blank? ? part[:tag] : params[:tag_id]}&page=#{params[:page]}&part_title=#{Rack::Utils.escape(part_title).gsub("+", "%20") rescue nil}" ret << "
" when 'public_r_tag' ret << "" diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb index 2a7c6b1f..316a715b 100644 --- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb +++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb @@ -9,7 +9,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController # GET /bulletins.xml def index - @title = params[:page_title] + @title = params[:part_title] date_now = Time.now if !params[:category_id].blank? @bulletins = Bulletin.can_display.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10) diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb index f09d8b70..16ac7d8b 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb @@ -3,9 +3,9 @@ <%= flash_messages %> <% if @current_category %> -

<%= @current_category.i18n_variable[I18n.locale] + t('announcement.bulletin.list_lower') %>

+

<%= @current_category.i18n_variable[I18n.locale] %>

<% else %> -

<%= t('announcement.list_announcement') %>

+

<%= t('announcement.announcement') %>

<% end %> diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml index 5a1d2f13..4d4d426d 100644 --- a/vendor/built_in_modules/announcement/config/locales/en.yml +++ b/vendor/built_in_modules/announcement/config/locales/en.yml @@ -58,6 +58,7 @@ en: announcement: all_articles: List add_new: Add + announcement: Announcement categories: Categories error: no_avilb_cate_for_posting: You need a category to submit your post,please contact admin @@ -66,7 +67,6 @@ en: more: more+ bulletins: Bulletins related_links: Related Links - list_announcement: List Announcement bulletin: submit_user_list: Submit User category: Category diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml index 5e559b6a..4fb22bb9 100644 --- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml @@ -37,6 +37,7 @@ zh_tw: announcement: add_new: 新增 all_articles: 列表 + announcement: 公告 error: no_avilb_cate_for_posting: 您目前沒有分類可以刊登公告，請聯絡系統管理員為您開通分類 tags: 標籤 @@ -47,7 +48,6 @@ zh_tw: more: 更多+ bulletins: 公告訊息 related_links: 相關連結 - list_announcement: 公告列表 bulletin: category: 分類 submit_user_list: 張貼人 diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/widget/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/widget/news_bulletins_controller.rb index 263d8302..dad3c781 100644 --- a/vendor/built_in_modules/news/app/controllers/panel/news/widget/news_bulletins_controller.rb +++ b/vendor/built_in_modules/news/app/controllers/panel/news/widget/news_bulletins_controller.rb @@ -9,7 +9,7 @@ class Panel::News::Widget::NewsBulletinsController < OrbitWidgetController # GET /news_bulletins.xml def index - @title = params[:page_title] + @title = params[:part_title] date_now = Time.now if !params[:category_id].blank? @news_bulletins = NewsBulletin.can_display.where(:news_bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(5) 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 ade5e6a7..4c2292a6 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 @@ -3,9 +3,9 @@ <%= flash_messages %> <% if @current_category %> -

<%= @current_category.i18n_variable[I18n.locale] + t('news.news_bulletin.list_lower') %>

+

<%= @current_category.i18n_variable[I18n.locale] %>

<% else %> -

<%= t('news.list_news') %>

+

<%= t('news.news') %>

<% end %> diff --git a/vendor/built_in_modules/news/config/locales/en.yml b/vendor/built_in_modules/news/config/locales/en.yml index 557a643b..37f06ea4 100644 --- a/vendor/built_in_modules/news/config/locales/en.yml +++ b/vendor/built_in_modules/news/config/locales/en.yml @@ -63,7 +63,7 @@ en: more: more+ news_bulletins: NewsBulletins related_links: Related Links - list_news: List News + news: News news_bulletin: category: Category list_lower: " list" diff --git a/vendor/built_in_modules/news/config/locales/zh_tw.yml b/vendor/built_in_modules/news/config/locales/zh_tw.yml index afbca2b0..290df5e6 100644 --- a/vendor/built_in_modules/news/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/news/config/locales/zh_tw.yml @@ -43,9 +43,9 @@ zh_tw: sure?: 確定嗎? campus_news: 校園新聞 more: 更多+ - news_bulletins: 公告訊息 + news_bulletins: 新聞訊息 related_links: 相關連結 - list_news: 公告列表 + news: 新聞 news_bulletin: category: 分類 list_lower: 列表 diff --git a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb index 441933d4..504e82e1 100644 --- a/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb +++ b/vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb @@ -25,7 +25,7 @@ class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController def home_list - @title = params[:page_title] + @title = params[:part_title] # deadline