From 6b6b87349ba9b07c4b0a31b5d84cb28c8ea7ec4f Mon Sep 17 00:00:00 2001
From: Artem Baikuzin <ybinzu@gmail.com>
Date: Wed, 29 Nov 2017 18:37:29 +0300
Subject: Add Settings/Display/Issue HTML title format (#24533)

---
 app/views/issues/show.html.erb       | 8 +++++++-
 app/views/settings/_display.html.erb | 2 ++
 config/locales/en.yml                | 3 +++
 config/locales/ru.yml                | 3 +++
 config/settings.yml                  | 2 ++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index f1f279170..8268624c3 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -149,7 +149,13 @@ end %>
   <%= f.link_to 'PDF' %>
 <% end %>
 
-<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
+<% if Setting.issue_html_title == '0' %>
+  <% title = "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
+<% else %>
+  <% title = "##{@issue.id} #{@issue.tracker.name}: #{@issue.subject}" %>
+<% end %>
+
+<% html_title title %>
 
 <% content_for :sidebar do %>
   <%= render :partial => 'issues/sidebar' %>
diff --git a/app/views/settings/_display.html.erb b/app/views/settings/_display.html.erb
index b3187c7eb..5e3a71a40 100644
--- a/app/views/settings/_display.html.erb
+++ b/app/views/settings/_display.html.erb
@@ -28,6 +28,8 @@
 <p><%= setting_text_field :thumbnails_size, :size => 6 %></p>
 
 <p><%= setting_select :new_item_menu_tab, [[l(:label_none), '0'], [l(:label_new_project_issue_tab_enabled), '1'], [l(:label_new_object_tab_enabled), '2']] %></p>
+
+<p><%= setting_select :issue_html_title, [[l(:label_issue_html_title_tracker_first), '0'], [l(:label_issue_html_title_number_first), '1']] %></p>
 </div>
 
 <%= submit_tag l(:button_save) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3fb86c14c..83c6fb90a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -467,6 +467,7 @@ en:
   setting_time_entry_list_defaults: Timelog list defaults
   setting_timelog_accept_0_hours: Accept time logs with 0 hours
   setting_timelog_max_hours_per_day: Maximum hours that can be logged per day and user
+  setting_issue_html_title: Issue HTML title format
 
   permission_add_project: Create project
   permission_add_subprojects: Create subprojects
@@ -1025,6 +1026,8 @@ en:
   label_font_monospace: Monospaced font
   label_font_proportional: Proportional font
   label_last_notes: Last notes
+  label_issue_html_title_number_first: "#Number Tracker: Subject"
+  label_issue_html_title_tracker_first: "Tracker #Number: Subject"
 
   button_login: Login
   button_submit: Submit
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index c62290c6b..ddae195df 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1334,3 +1334,6 @@ ru:
   setting_timelog_accept_0_hours: Accept time logs with 0 hours
   setting_timelog_max_hours_per_day: Maximum hours that can be logged per day and user
   label_x_revisions: "%{count} revisions"
+  setting_issue_html_title: Формат вкладки браузера у задач
+  label_issue_html_title_number_first: "#Номер Трекер: Тема"
+  label_issue_html_title_tracker_first: "Трекер #Номер: Тема"
diff --git a/config/settings.yml b/config/settings.yml
index c10ae1acc..bdabd0bf8 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -306,3 +306,5 @@ timelog_accept_0_hours:
 timelog_max_hours_per_day:
   format: int
   default: 999
+issue_html_title:
+  default: 0
-- 
2.15.0