diff --git a/app/controllers/personal_honors_controller.rb b/app/controllers/personal_honors_controller.rb index b0c370a..da7e199 100644 --- a/app/controllers/personal_honors_controller.rb +++ b/app/controllers/personal_honors_controller.rb @@ -4,7 +4,7 @@ class PersonalHonorsController < ApplicationController filter_value = params[:honors_filter_value] honors = nil - if filter_value.nil? || filter_value == 'all' || filter_value.empty? + if filter_value.nil? || filter_value == t("personal_honor.honor_types_all") || filter_value.empty? honors = Honor.where(:award_name.ne => nil).or(:award_name.ne => "").sort_for_frontend.page(OrbitHelper.params[:page_no]).per(OrbitHelper.page_data_count) else honor_type_id = HonorType.or({ 'title.en' => filter_value }, { 'title.zh_tw' => filter_value }).first.id @@ -56,7 +56,7 @@ class PersonalHonorsController < ApplicationController current_locale = I18n.locale honor_types = HonorType.all.pluck(:title).map { |title| { 'honor_type' => title[current_locale] } } - honor_types.unshift({ 'honor_type' => 'all' }) + honor_types.unshift({ 'honor_type' => t("personal_honor.honor_types_all") }) { "honors" => honor_list, diff --git a/config/locales/en.yml b/config/locales/en.yml index 6005be9..220653b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -9,6 +9,7 @@ en: awarding_unit : "Awarding Unit" honor_category : "Honor Category" honor_type: "Honor Category" + honor_types_all: "All Honor Types" extracted_chapters : "Extracted Chapters" publishers : "Publishers" honoree: "Honoree" @@ -59,4 +60,4 @@ en: save: "save" hintText: "Type in a search term" noResultsText: "No results" - searchingText: "Searching…" \ No newline at end of file + searchingText: "Searching…" diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 81c0ee1..d44f0c7 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -9,6 +9,7 @@ zh_tw: awarding_unit : "頒獎單位" honor_category : "類別" honor_type: "類別" + honor_types_all: "所有榮譽項目" honoree: "受獎人" authors : "作者" tags : "領域" @@ -55,4 +56,4 @@ zh_tw: save: "儲存" hintText: "請輸入搜尋關鍵字" noResultsText: "沒有相關的比對結果" - searchingText: "搜尋中…" \ No newline at end of file + searchingText: "搜尋中…"