Internationalization of search page

3 files changed, 19 insertions, 14 deletions

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',