diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 019d997f584..e447ca7822d 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1239,6 +1239,8 @@ en: read_time_word_count: "Word count per minute for calculating estimated reading time." + topic_page_title_includes_category: "Topic page title includes the category name." + full_name_required: "Full name is a required field of a user's profile." enable_names: "Show the user's full name on their profile, user card, and emails. Disable to hide full name everywhere." display_name_on_posts: "Show a user's full name on their posts in addition to their @username." diff --git a/config/site_settings.yml b/config/site_settings.yml index 772b96beb84..a82948acd9f 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -1091,6 +1091,8 @@ uncategorized: default: 500 client: true + topic_page_title_includes_category: true + user_preferences: default_email_digest_frequency: enum: 'DigestEmailSiteSetting' diff --git a/lib/topic_view.rb b/lib/topic_view.rb index 9f84dd8063b..d29952311ce 100644 --- a/lib/topic_view.rb +++ b/lib/topic_view.rb @@ -133,7 +133,7 @@ class TopicView def page_title title = @topic.title - if @topic.category_id != SiteSetting.uncategorized_category_id && @topic.category_id && @topic.category + if SiteSetting.topic_page_title_includes_category && @topic.category_id != SiteSetting.uncategorized_category_id && @topic.category_id && @topic.category title += " - #{topic.category.name}" end title