Search label and placeholder should be individually configurable

app/views/catalog/_search_form.html.erb

@@ -7,8 +7,8 @@
       <span class="sr-only"><%= t('blacklight.search.form.search_field.post_label') %></span>
     <% end %>
     <div class="input-group search-input-group">
-        <label for="q" class="sr-only"><%= t('blacklight.search.form.q') %></label>
-         <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.q'), :class => "search_q q form-control", :id => "q", :autofocus => should_autofocus_on_search_box? %>
+        <label for="q" class="sr-only"><%= t('blacklight.search.form.search.label') %></label>
+         <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.search.placeholder'), :class => "search_q q form-control", :id => "q", :autofocus => should_autofocus_on_search_box? %>
 
       <span class="input-group-btn">
         <button type="submit" class="btn btn-primary search-btn" id="search">

config/locales/blacklight.de.yml

@@ -158,7 +158,9 @@ de:
           label: 'Suchen in'
           title: 'gezeilte Suchoptionen'
           post_label: 'für'
-        q: 'Suchen...'
+        search:
+          label: 'suchen nach'
+          placeholder: 'Suchen...'
         submit: 'Suchen'
       pagination:
         title: 'Ergebnisse Navigation'

config/locales/blacklight.en.yml

@@ -158,7 +158,9 @@ en:
           label: 'Search in'
           title: 'Targeted search options'
           post_label: 'for'
-        q: 'Search...'
+        search:
+          label: 'search for'
+          placeholder: 'Search...'
         submit: 'Search'
       pagination:
         title: 'Results navigation'

config/locales/blacklight.es.yml

@@ -158,7 +158,9 @@ es:
           label: 'Buscar en'
           title: 'Opciones de Búsqueda temática'
           post_label: 'para'
-        q: 'Buscar...'
+        search:
+          label: 'buscar'
+          placeholder: 'Buscar...'
         submit: 'Buscar'
       pagination:
         title: 'Resultados de navegación'

config/locales/blacklight.fr.yml

@@ -171,7 +171,9 @@ fr:
           label: 'dans'
           title: 'Options de recherche'
         post_label: 'pour'
-        q: 'Rechercher '
+        search:
+          label: 'Rechercher'
+          placeholder: 'Rechercher'
         submit: 'Chercher'
       pagination:
         title: 'Navigation dans les résultats'

config/locales/blacklight.pt-BR.yml

@@ -178,7 +178,9 @@ pt-BR:
           label: 'Procurar em'
           title: 'Opções da Busca'
           post_label: 'por'
-        q: 'Busca...'
+        search:
+          label: 'busca'
+          placeholder: 'Busca...'
         submit: 'Buscar'
       pagination:
         title: 'Navegação nos Resultados'