From 4dfe3e7b3bcf689ff9a0c2cff0146480d4ac6b97 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Mon, 10 Sep 2012 15:19:29 +0800
Subject: [PATCH] =?UTF-8?q?Change=20=E7=86=B1=E9=96=80=20to=20=E9=A0=AD?=
 =?UTF-8?q?=E7=89=88=20for=20news?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/news/back_end/news_bulletins/_filter_status.html.erb  | 2 +-
 .../panel/news/back_end/news_bulletins/_news_bulletin.html.erb  | 2 +-
 .../news/back_end/news_bulletins/_quick_edit_basic.html.erb     | 2 +-
 vendor/built_in_modules/news/config/locales/zh_tw.yml           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
index 6611e81b7..37c3ec03f 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
@@ -1,6 +1,6 @@
 <div class="accordion-inner" data-toggle="buttons-checkbox">
 	<%= link_to t(:top), panel_news_back_end_news_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_top'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_top')}" %>
-	<%= link_to t(:hot), panel_news_back_end_news_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hot'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_hot')}" %>
+	<%= link_to t('news.hot'), panel_news_back_end_news_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hot'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_hot')}" %>
 	<%= link_to t(:hidden), panel_news_back_end_news_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hidden'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_hidden')}" %>
 	<%= link_to t(:pending), panel_news_back_end_news_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_pending'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_pending')}" %>
 	<%= link_to t(:passed), panel_news_back_end_news_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_checked'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn js_history#{is_filter_active?('status', 'is_checked')}" %>
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 01decfbd3..2390aabe3 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 @@
 					<span class="label label-success"><%= t(:top) %></span>
 				<% end %>
 				<% if news_bulletin.is_hot? %>
-					<span class="label label-important"><%= t(:hot) %></span>
+					<span class="label label-important"><%= t('news.hot') %></span>
 				<% end %>
 				<% if news_bulletin.is_hidden? %>
 					<span class="label"><%= t(:hidden) %></span>
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 084421ccb..b20221c38 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 @@
 			<div class="control-group">
 				<label class="control-label"><%= t(:status) %></label>
 				<div class="controls">
-					<label class="checkbox inline"><%= f.check_box :is_hot %><%= t(:hot) %></label>
+					<label class="checkbox inline"><%= f.check_box :is_hot %><%= t('news.hot') %></label>
 					<label class="checkbox inline"><%= f.check_box :is_top %><%= t(:top) %></label>
 					<label class="checkbox inline"><%= f.check_box :is_hidden %><%= t(:hidden) %></label>
 				</div>
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 4ed7d00be..420eb9c67 100644
--- a/vendor/built_in_modules/news/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/news/config/locales/zh_tw.yml
@@ -24,7 +24,6 @@ zh_tw:
   update: 更新
   yes_: "Yes"
 
-  hot: 熱門
   top: 置頂
   hidden: 隱藏
   passed: 審核通過
@@ -37,6 +36,7 @@ zh_tw:
   quick_edit: 快速編輯
 
   news:
+    hot: 頭版
     add_new: 新增
     all_articles: 列表
     tags: 標籤