Internationalization of search page

11 files changed, 38 insertions, 32 deletions

diff --git a/web/i18n/de.yml b/web/i18n/de.yml
index cfdbdbc..95097f8 100644
--- a/web/i18n/de.yml
+++ b/web/i18n/de.yml
@@ -95,9 +95,11 @@ pages:
             list: Alle Reports
             data_sources: Datenquellen
     search:
-        results:
-            title: Suchergebnisse
-            you_were_searching_for: Du hast gesucht nach
+        title: Suchergebnisse
+        you_were_searching_for: Du hast gesucht nach
+        no_keys: Keine Keys gefunden.
+        no_values: Keine Values gefunden.
+        no_tags: Keine Tags gefunden.
     keys:
         intro: |
                 Diese Tabelle zeigt alle Keys, die in der Datenbank oder einer anderen Quelle vorkommen.
diff --git a/web/i18n/en.yml b/web/i18n/en.yml
index 6a0e285..2f95631 100644
--- a/web/i18n/en.yml
+++ b/web/i18n/en.yml
@@ -91,9 +91,11 @@ pages:
             list: List of all reports
             data_sources: Data sources used
     search:
-        results:
-            title: Search results
-            you_were_searching_for: You were searching for
+        title: Search results
+        you_were_searching_for: You were searching for
+        no_keys: No keys found.
+        no_values: No values found.
+        no_tags: No tags found.
     keys:
         intro: |
                 This table shows all tag keys that exist in the database or in any of the other sources.
diff --git a/web/i18n/fr.yml b/web/i18n/fr.yml
index f807f5f..a6bb86a 100644
--- a/web/i18n/fr.yml
+++ b/web/i18n/fr.yml
@@ -67,9 +67,8 @@ pages:
                 comme par exemple des valeurs de tags beaucoup utilisées mais n'ayant pas de page sur le wiki.
             data_sources: Data Sources
     search:
-        results:
-            title: Résultats de la recherche
-            you_were_searching_for: Vous recherchez
+        title: Résultats de la recherche
+        you_were_searching_for: Vous recherchez
     key:
         no_description_in_wiki: Aucune description dans le wiki
         filter:
diff --git a/web/i18n/it.yml b/web/i18n/it.yml
index 17d51ee..843cb46 100644
--- a/web/i18n/it.yml
+++ b/web/i18n/it.yml
@@ -63,9 +63,8 @@ pages:
                 chiavi popolari senza una pagini nel wiki.
             data_sources: Fonte dati
     search:
-        results:
-            title: Risultati ricerca
-            you_were_searching_for: Stavi cercando
+        title: Risultati ricerca
+        you_were_searching_for: Stavi cercando
     key:
         no_description_in_wiki: Nessuna descrizione nel wiki
     tag:
diff --git a/web/i18n/ru.yml b/web/i18n/ru.yml
index 3736bb0..e9e0aaa 100644
--- a/web/i18n/ru.yml
+++ b/web/i18n/ru.yml
@@ -67,9 +67,8 @@ pages:
                 часто используемые ключи без соответствующих вики-страниц.
             data_sources: Источники данных
     search:
-        results:
-            title: Результаты поиска
-            you_were_searching_for: Вы искали
+        title: Результаты поиска
+        you_were_searching_for: Вы искали
     key:
         no_description_in_wiki: Нет описания в вики
     tag:
diff --git a/web/lib/ui/search.rb b/web/lib/ui/search.rb
index 61292b8..d99cf69 100644
--- a/web/lib/ui/search.rb
+++ b/web/lib/ui/search.rb
@@ -3,7 +3,7 @@ class Taginfo < Sinatra::Base
 
     # The search results page
     get '/search' do
-        @title = t.pages.search.results.title
+        @title = t.pages.search.title
 
         @query = params[:q]
         if @query =~ /(.*)=(.*)/
diff --git a/web/views/search.erb b/web/views/search.erb
index b4eee41..7e085ed 100644
--- a/web/views/search.erb
+++ b/web/views/search.erb
@@ -1,6 +1,6 @@
 <div class="pre">
     <h1 class="section"><%= @title %></h1>
-    <p><b><%= t.pages.search.results.you_were_searching_for %>:</b> <%= escape_html(@query) %></p>
+    <p><b><%= t.pages.search.you_were_searching_for %>:</b> <%= escape_html(@query) %></p>
 </div>
 <div id="tabs">
     <ul>
diff --git a/web/views/search_tags.erb b/web/views/search_tags.erb
index 79597da..c240c72 100644
--- a/web/views/search_tags.erb
+++ b/web/views/search_tags.erb
@@ -1,6 +1,6 @@
 <div class="pre">
     <h1 class="section"><%= @title %></h1>
-    <p><b><%= t.pages.search.results.you_were_searching_for %>:</b> <%= escape_html(@query) %></p>
+    <p><b><%= t.pages.search.you_were_searching_for %>:</b> <%= escape_html(@query) %></p>
 </div>
 <div id="tabs">
     <ul>
diff --git a/web/viewsjs/keys.js.erb b/web/viewsjs/keys.js.erb
index e1bfac4..c39cb80 100644
--- a/web/viewsjs/keys.js.erb
+++ b/web/viewsjs/keys.js.erb
@@ -6,7 +6,7 @@ function page_init() {
     create_flexigrid('grid-keys', {
         url: '/api/2/db/keys?include=prevalent_values',
         colModel: [
-            { display: '<%= @trans.t.osm.key %>', name: 'key', width: 160, sortable: true },
+            { display: '<%= osm.key %>', name: 'key', width: 160, sortable: true },
             { display: '<span title="<%= table.total_tooltip %>"><img src="/img/types/all.16.png" width="16" height="16" alt=""/> <%= table.total %></span>', name: 'count_all', width: 200, sortable: true, align: 'center' },
             { display: '<span title="<%= table.nodes_tooltip %>"><img src="/img/types/node.16.png" width="16" height="16" alt=""/> <%= osm.nodes %></span>', name: 'count_nodes', width: 220, sortable: true, align: 'center' },
             { display: '<span title="<%= table.ways_tooltip %>"><img src="/img/types/way.16.png" width="16" height="16" alt=""/> <%= osm.ways %></span>', name: 'count_ways', width: 220, sortable: true, align: 'center' },
@@ -18,7 +18,7 @@ function page_init() {
             { display: '<span title="<%= table.prevalent_values_tooltip %>"><%= table.prevalent_values %></span>', name: 'prevalent_values', width: 500, sortable: true }
         ],
         searchitems: [
-            { display: '<%= @trans.t.osm.key %>', name: 'key' }
+            { display: '<%= osm.key %>', name: 'key' }
         ],
         sortname: 'count_all',
         sortorder: 'desc',
diff --git a/web/viewsjs/search.js.erb b/web/viewsjs/search.js.erb
index ee7d33b..eb1c9cf 100644
--- a/web/viewsjs/search.js.erb
+++ b/web/viewsjs/search.js.erb
@@ -1,14 +1,19 @@
+<%
+    osm = @trans.t.osm
+    misc = @trans.t.misc
+    search = @trans.t.pages.search
+ %>
 var create_flexigrid_for = {
     keys: function(query) {
         create_flexigrid('grid-keys', {
             url: '/api/2/db/keys?query=' + encodeURIComponent(query),
             colModel: [
-                { display: texts.misc.count, name: 'count_all', width: 80, sortable: true, align: 'right' },
-                { display: texts.osm.key, name: 'key', width: 500, sortable: true }
+                { display: '<%= misc.count %>', name: 'count_all', width: 80, sortable: true, align: 'right' },
+                { display: '<%= osm.key %>', name: 'key', width: 500, sortable: true }
             ],
             sortname: 'count_all',
             sortorder: 'desc',
-            emptymsg: 'No keys found.',
+            emptymsg: '<%= search.no_keys %>',
             preProcess: function(data) {
                 data.rows = jQuery.map(data.data, function(row, i) {
                     return { 'cell': [
@@ -24,13 +29,13 @@ var create_flexigrid_for = {
         create_flexigrid('grid-values', {
             url: '/api/2/search/values?q=' + encodeURIComponent(query),
             colModel: [
-                { display: texts.misc.count, name: 'count_all', width: 80, sortable: true, align: 'right' },
-                { display: texts.osm.key, name: 'key', width: 250, sortable: true },
-                { display: texts.osm.value, name: 'value', width: 500, sortable: true }
+                { display: '<%= misc.count %>', name: 'count_all', width: 80, sortable: true, align: 'right' },
+                { display: '<%= osm.key %>', name: 'key', width: 250, sortable: true },
+                { display: '<%= osm.value %>', name: 'value', width: 500, sortable: true }
             ],
             sortname: 'count_all',
             sortorder: 'desc',
-            emptymsg: 'No values found.',
+            emptymsg: '<%= search.no_values %>',
             preProcess: function(data) {
                 data.rows = jQuery.map(data.data, function(row, i) {
                     return { 'cell': [
@@ -48,13 +53,13 @@ var create_flexigrid_for = {
         create_flexigrid('grid-tags', {
             url: '/api/2/search/tags?q=' + encodeURIComponent(query),
             colModel: [
-                { display: texts.misc.count, name: 'count_all', width: 80, sortable: true, align: 'right' },
-                { display: texts.osm.key, name: 'key', width: 300, sortable: true },
-                { display: texts.osm.value, name: 'value', width: 500, sortable: true }
+                { display: '<%= misc.count %>', name: 'count_all', width: 80, sortable: true, align: 'right' },
+                { display: '<%= osm.key %>', name: 'key', width: 300, sortable: true },
+                { display: '<%= osm.value %>', name: 'value', width: 500, sortable: true }
             ],
             sortname: 'count_all',
             sortorder: 'desc',
-            emptymsg: 'No tags found.',
+            emptymsg: '<%= search.no_tags %>',
             preProcess: function(data) {
                 data.rows = jQuery.map(data.data, function(row, i) {
                     return { 'cell': [
diff --git a/web/viewsjs/tags.js.erb b/web/viewsjs/tags.js.erb
index fa378bd..9ebf6b0 100644
--- a/web/viewsjs/tags.js.erb
+++ b/web/viewsjs/tags.js.erb
@@ -13,7 +13,7 @@ function page_init() {
             { display: '<span title="<%= table.relations_tooltip %>"><img src="/img/types/relation.16.png" width="16" height="16" alt=""/> <%= osm.relations %></span>', name: 'count_relations',  width: 220, sortable: true, align: 'center' }
         ],
         searchitems: [
-            { display: texts.osm.tag, name: 'tag' }
+            { display: '<%= osm.tag %>', name: 'tag' }
         ],
         sortname: 'count_all',
         sortorder: 'desc',