Fix titles for widgets
Add translations
This commit is contained in:
1 parent
4ae8299949
commit
62e9a772f6
13 files changed
+22
-14
No files matched your search
+1
-1
@@ -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)
|
||||
|
||||
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
Vendored
+2
-2
@@ -3,9 +3,9 @@
|
||||
<%= flash_messages %>
|
||||
|
||||
<% if @current_category %>
|
||||
<h1 class="h1"><%= @current_category.i18n_variable[I18n.locale] + t('announcement.bulletin.list_lower') %></h1>
|
||||
<h1 class="h1"><%= @current_category.i18n_variable[I18n.locale] %></h1>
|
||||
<% else %>
|
||||
<h1 class="h1"><%= t('announcement.list_announcement') %></h1>
|
||||
<h1 class="h1"><%= t('announcement.announcement') %></h1>
|
||||
<% end %>
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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: 張貼人
|
||||
|
||||
Vendored
+1
-1
@@ -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)
|
||||
|
||||
+2
-2
@@ -3,9 +3,9 @@
|
||||
<%= flash_messages %>
|
||||
|
||||
<% if @current_category %>
|
||||
<h1 class="h1"><%= @current_category.i18n_variable[I18n.locale] + t('news.news_bulletin.list_lower') %></h1>
|
||||
<h1 class="h1"><%= @current_category.i18n_variable[I18n.locale] %></h1>
|
||||
<% else %>
|
||||
<h1 class="h1"><%= t('news.list_news') %></h1>
|
||||
<h1 class="h1"><%= t('news.news') %></h1>
|
||||
<% end %>
|
||||
|
||||
<table class="table table-bordered">
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+2
-2
@@ -43,9 +43,9 @@ zh_tw:
|
||||
sure?: 確定嗎?
|
||||
campus_news: 校園新聞
|
||||
more: 更多+
|
||||
news_bulletins: 公告訊息
|
||||
news_bulletins: 新聞訊息
|
||||
related_links: 相關連結
|
||||
list_news: 公告列表
|
||||
news: 新聞
|
||||
news_bulletin:
|
||||
category: 分類
|
||||
list_lower: 列表
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController
|
||||
|
||||
|
||||
def home_list
|
||||
@title = params[:page_title]
|
||||
@title = params[:part_title]
|
||||
|
||||
# deadline
|
||||
|
||||
|
||||
Reference in new issue
Block a user