From 33f0d80ed5f60c68289c4fd918a491b0f122ee60 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Fri, 27 Oct 2017 08:11:10 +0530
Subject: [PATCH] UX: better title on search page

---
 .../javascripts/discourse/routes/full-page-search.js.es6       | 3 ++-
 .../javascripts/discourse/widgets/search-menu-results.js.es6   | 2 --
 app/controllers/search_controller.rb                           | 3 ++-
 app/views/search/show.html.erb                                 | 2 +-
 config/locales/client.en.yml                                   | 3 +--
 config/locales/server.en.yml                                   | 1 +
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
index 427120bb6d7..73598c948ef 100644
--- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
@@ -2,12 +2,13 @@ import { ajax } from 'discourse/lib/ajax';
 import { translateResults, getSearchKey, isValidSearchTerm } from "discourse/lib/search";
 import PreloadStore from 'preload-store';
 import { getTransient, setTransient } from 'discourse/lib/page-tracker';
+import { escapeExpression } from 'discourse/lib/utilities';
 
 export default Discourse.Route.extend({
   queryParams: { q: {}, expanded: false, context_id: {}, context: {}, skip_context: {} },
 
   titleToken() {
-    return I18n.t('search.results_page');
+    return I18n.t('search.results_page', { term: escapeExpression(this.controllerFor("full-page-search").get('searchTerm')) });
   },
 
   model(params) {
diff --git a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
index f66b8497375..05aa2d705bc 100644
--- a/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
+++ b/app/assets/javascripts/discourse/widgets/search-menu-results.js.es6
@@ -31,8 +31,6 @@ function createSearchResult({ type, linkField, builder }) {
           href: r.get(linkField),
           contents: () => builder.call(this, r, attrs.term),
           className: 'search-link',
-          title: 'search.link_title',
-          titleOptions: { term: escapeExpression(attrs.term) },
           searchResultId,
           searchResultType: type,
           searchContextEnabled: attrs.searchContextEnabled,
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 6972bc2dd3f..b0d44da59dc 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -29,7 +29,8 @@ class SearchController < ApplicationController
     search_args[:ip_address] = request.remote_ip
     search_args[:user_id] = current_user.id if current_user.present?
 
-    search = Search.new(params[:q], search_args)
+    @search_term = params[:q]
+    search = Search.new(@search_term, search_args)
     result = search.execute
 
     result.find_user_data(guardian) if result
diff --git a/app/views/search/show.html.erb b/app/views/search/show.html.erb
index 95d04d44e6c..809e0011e40 100644
--- a/app/views/search/show.html.erb
+++ b/app/views/search/show.html.erb
@@ -1 +1 @@
-<% content_for :title do %><%= t 'js.search.results_page' %> - <%= SiteSetting.title %><% end %>
+<% content_for :title do %><%= I18n.t('search.results_page', term: @search_term) %> - <%= SiteSetting.title %><% end %>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b00423b5dbf..fa1a8b1edbb 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1349,12 +1349,11 @@ en:
         one: "1 result for <span class='term'>{{term}}</span>"
         other: "{{count}} results for <span class='term'>{{term}}</span>"
       title: "search topics, posts, users, or categories"
-      link_title: "search result for '{{term}}'"
       no_results: "No results found."
       no_more_results: "No more results found."
       searching: "Searching ..."
       post_format: "#{{post_number}} by {{username}}"
-      results_page: "Search Results"
+      results_page: "Search results for '{{term}}'"
       more_results: "There are more results. Please narrow your search criteria."
       cant_find: "Can’t find what you’re looking for?"
       start_new_topic: "Perhaps start a new topic?"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 8e6ba8516f1..eafb42e43da 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1618,6 +1618,7 @@ en:
       category: 'Categories'
       topic: 'Results'
       user: 'Users'
+    results_page: "Search results for '%{term}'"
 
   sso:
     login_error: "Login Error"