Merge branch 'master' of github.com:Rulingcom/NCCU

config/initializers/redis_search.rb

@@ -14,5 +14,5 @@ Redis::Search.configure do |config|
   # use rmmseg, true to disable it, it can save memroy
   config.disable_rmmseg = false
 end
-Bulletin.new
-NewsBulletin.new
+# Bulletin.new
+# NewsBulletin.new

config/locales/en.yml

@@ -305,4 +305,4 @@ en:
     site_search: Site Search
     sitesearch: Google Site Search
     site_setting_help: Please Enter the search argument for Google search.
-    result_get: "Found %{item_num} items"
+    result_get: "Searched about '  %{search_word}  ' Found %{item_num} items"

config/locales/zh_tw.yml

@@ -442,7 +442,7 @@ zh_tw:
     site_search: "全站搜尋"
     sitesearch: Google Site Search
     site_setting_help: 請輸入送交Google搜尋的參數
-    result_get: "共搜尋到%{item_num}筆資料"
+    result_get: "搜尋標題有關 ' %{search_word} ' 共搜尋到%{item_num}筆資料"
   activerecord:
     errors:
       template: # ~ 2.3.5 backward compatible