From 5db621c5feb92c0552056b96dcd8e14e7e640475 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@discourse.org>
Date: Mon, 16 Jun 2014 16:20:57 -0700
Subject: [PATCH] normalize to search.title for search help

---
 .../javascripts/discourse/views/search-text-field.js.es6     | 2 +-
 config/locales/client.en.yml                                 | 5 ++---
 test/javascripts/views/search_text_field_test.js             | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/views/search-text-field.js.es6 b/app/assets/javascripts/discourse/views/search-text-field.js.es6
index 9a1d05d6266..c7aeb13b079 100644
--- a/app/assets/javascripts/discourse/views/search-text-field.js.es6
+++ b/app/assets/javascripts/discourse/views/search-text-field.js.es6
@@ -28,6 +28,6 @@ export default TextField.extend({
       }
     }
 
-    return I18n.t('search.placeholder');
+    return I18n.t('search.title');
   }.property('searchContext')
 });
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 9e735b1ed74..177e33235f9 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -488,7 +488,7 @@ en:
     last_seen: 'Seen'
     created: 'Created'
     trust_level: 'Trust Level'
-    search_hint: 'Username or email'
+    search_hint: 'username or email'
 
     create_account:
       title: "Create New Account"
@@ -645,8 +645,7 @@ en:
       image_link: "link your image will point to"
 
     search:
-      title: "search for topics, posts, users, or categories"
-      placeholder: "type your search terms here"
+      title: "search topics, posts, users, or categories"
       no_results: "No results found."
       searching: "Searching ..."
 
diff --git a/test/javascripts/views/search_text_field_test.js b/test/javascripts/views/search_text_field_test.js
index c1f58a4b646..05bdd4be52e 100644
--- a/test/javascripts/views/search_text_field_test.js
+++ b/test/javascripts/views/search_text_field_test.js
@@ -21,7 +21,7 @@ module("view:search-text-field", {
 });
 
 test("formats placeholder correctly when no searchContext is provided", function() {
-  placeholderUsesKeyAndContext("search.placeholder", undefined);
+  placeholderUsesKeyAndContext("search.title", undefined);
 });
 
 test("formats placeholder correctly when user searchContext is provided", function() {