More I18N cleanup

5 files changed, 38 insertions, 13 deletions

diff --git a/web/viewsjs/reports/characters_in_keys.js.erb b/web/viewsjs/reports/characters_in_keys.js.erb
index 48235dd..65ebd8c 100644
--- a/web/viewsjs/reports/characters_in_keys.js.erb
+++ b/web/viewsjs/reports/characters_in_keys.js.erb
@@ -1,9 +1,14 @@
+<%
+    osm = @trans.t.osm
+    misc = @trans.t.misc
+    page = @trans.t.reports.characters_in_keys
+ %>
 var create_flexigrid_for = {
     whitespace: function() {
         create_flexigrid('grid-whitespace', {
             url: '/api/2/db/keys?filters=characters_space&include=prevalent_values',
             colModel: [
-                { display: texts.osm.key, name: 'key', width: 250, sortable: true },
+                { display: '<%= osm.key %>', name: 'key', width: 250, sortable: true },
                 { display: '<span title="Number of objects with this key"><img src="/img/types/all.16.png" alt=""/> Total</span>',           name: 'count_all',        width: 250, sortable: true, align: 'center' },
                 { display: 'Users', name: 'users_all', width: 44, sortable: true, align: 'right' },
                 { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" title="Wiki"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
@@ -14,7 +19,7 @@ var create_flexigrid_for = {
                 { display: 'Prevalent Values', name: 'prevalent_values', width: 500, sortable: true }
             ],
             searchitems: [
-                { display: texts.osm.key, name: 'key' }
+                { display: '<%= osm.key %>', name: 'key' }
             ],
             sortname: 'count_all',
             sortorder: 'desc',
@@ -40,7 +45,7 @@ var create_flexigrid_for = {
         create_flexigrid('grid-problematic', {
             url: '/api/2/db/keys?filters=characters_problematic&include=prevalent_values',
             colModel: [
-                { display: texts.osm.key, name: 'key', width: 250, sortable: true },
+                { display: '<%= osm.key %>', name: 'key', width: 250, sortable: true },
                 { display: '<span title="Number of objects with this key"><img src="/img/types/all.16.png" alt=""/> Total</span>',           name: 'count_all',        width: 250, sortable: true, align: 'center' },
                 { display: 'Users', name: 'users_all', width: 44, sortable: true, align: 'right' },
                 { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" title="Wiki"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
@@ -51,7 +56,7 @@ var create_flexigrid_for = {
                 { display: 'Prevalent Values', name: 'prevalent_values', width: 500, sortable: true }
             ],
             searchitems: [
-                { display: texts.osm.key, name: 'key' }
+                { display: '<%= osm.key %>', name: 'key' }
             ],
             sortname: 'count_all',
             sortorder: 'desc',
diff --git a/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb b/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb
index cf3a846..b799a5d 100644
--- a/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb
+++ b/web/viewsjs/reports/frequently_used_keys_without_wiki_page.js.erb
@@ -1,16 +1,21 @@
+<%
+    osm = @trans.t.osm
+    misc = @trans.t.misc
+    page = @trans.t.reports.frequently_used_keys_without_wiki_page
+ %>
 function create_flexigrid_with_option(english) {
     create_flexigrid('grid-keys', {
         url: '/api/2/reports/frequently_used_keys_without_wiki_page?english=' + english,
         colModel: [
             { display: 'Create Wiki Page...', name: 'create_wiki_page', width: 200, sortable: false },
-            { display: texts.osm.key, name: 'key', width: 180, sortable: true },
+            { display: '<%= osm.key %>', name: 'key', width: 180, sortable: true },
             { display: '<span title="Number of objects with this key">Total</span>', name: 'count_all', width: 70, sortable: true, align: 'right' },
             { display: 'Users', name: 'users_all', width: 44, sortable: true, align: 'right' },
             { display: '<span title="Number of different values for this key">Values</span>', name: 'values_all', width: 70, sortable: true, align: 'right' },
             { display: 'Prevalent Values', name: 'prevalent_values', width: 500, sortable: true }
         ],
         searchitems: [
-            { display: texts.osm.key, name: 'key' }
+            { display: '<%= osm.key %>', name: 'key' }
         ],
         sortname: 'count_all',
         sortorder: 'desc',
diff --git a/web/viewsjs/reports/josm_styles.js.erb b/web/viewsjs/reports/josm_styles.js.erb
index 4e4ec13..a49e1c6 100644
--- a/web/viewsjs/reports/josm_styles.js.erb
+++ b/web/viewsjs/reports/josm_styles.js.erb
@@ -1,15 +1,20 @@
+<%
+    osm = @trans.t.osm
+    misc = @trans.t.misc
+    page = @trans.t.reports.josm_styles
+ %>
 function create_flexigrid_with_option(stylename) {
     create_flexigrid('grid-rules', {
         url: '/api/2/josm/styles/' + stylename,
         colModel: [
-            { display: texts.osm.key,   name: 'k', width: 300, sortable: true },
-            { display: texts.osm.value, name: 'v', width: 300, sortable: true },
+            { display: '<%= osm.key %>',   name: 'k', width: 300, sortable: true },
+            { display: '<%= osm.value %>', name: 'v', width: 300, sortable: true },
             { display: 'Icon', name: 'icon', width: 30, sortable: false, align: 'center' },
             { display: 'Line', name: 'line', width: 30, sortable: false, align: 'center' },
             { display: 'Area', name: 'area', width: 30, sortable: false, align: 'center' }
         ],
         searchitems: [
-            { display: 'Key/Value', name: 'k' }
+            { display: '<%= osm.key %>/<%= osm.value %>', name: 'k' }
         ],
         sortname: 'k',
         sortorder: 'asc',
diff --git a/web/viewsjs/reports/key_lengths.js.erb b/web/viewsjs/reports/key_lengths.js.erb
index 65ff8ce..3cff6fb 100644
--- a/web/viewsjs/reports/key_lengths.js.erb
+++ b/web/viewsjs/reports/key_lengths.js.erb
@@ -1,10 +1,15 @@
+<%
+    osm = @trans.t.osm
+    misc = @trans.t.misc
+    page = @trans.t.reports.key_lengths
+ %>
 var create_flexigrid_for = {
     keys: function() {
         create_flexigrid('grid-keys', {
             url: '/api/2/db/keys?include=prevalent_values',
             colModel: [
                 { display: 'Length', name: 'length', width: 60, sortable: true, align: 'right' },
-                { display: texts.osm.key, name: 'key', width: 180, sortable: true },
+                { display: '<%= osm.key %>', name: 'key', width: 180, sortable: true },
                 { display: 'Number of Objects', name: 'count_all', width: 250, sortable: true, align: 'center' },
                 { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" title="Wiki"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
                 { display: '<img src="/img/sources/josm.16.png" alt="JOSM" title="JOSM"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
@@ -14,7 +19,7 @@ var create_flexigrid_for = {
                 { display: 'Prevalent Values', name: 'prevalent_values', width: 500, sortable: true }
             ],
             searchitems: [
-                { display: texts.osm.key, name: 'key' }
+                { display: '<%= osm.key %>', name: 'key' }
             ],
             sortname: 'length',
             sortorder: 'asc',
diff --git a/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb b/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb
index 9de24a6..f31dc45 100644
--- a/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb
+++ b/web/viewsjs/reports/wiki_pages_about_non_existing_keys.js.erb
@@ -1,3 +1,8 @@
+<%
+    osm = @trans.t.osm
+    misc = @trans.t.misc
+    page = @trans.t.reports.wiki_pages_about_non_existing_keys
+ %>
 function page_init() {
     create_flexigrid('grid-keys', {
         url: '/api/2/db/keys?filters=in_wiki,not_in_db&include=wikipages',
@@ -6,11 +11,11 @@ function page_init() {
             { display: '<img src="/img/sources/josm.16.png" alt="JOSM" title="JOSM"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
         //   { display: '<img src="/img/sources/potlatch.16.png" alt="Potlatch 2" title="Potlatch 2"/>', name: 'in_potlatch', width: 20, sortable: true, align: 'center' },
         //   { display: '<img src="/img/sources/merkaartor.16.png" alt="Merkaartor" title="Merkaartor"/>', name: 'in_merkaartor', width: 20, sortable: true, align: 'center' },
-            { display: texts.osm.key, name: 'key', width: 260, sortable: true, align: 'left' },
+            { display: '<%= osm.key %>', name: 'key', width: 260, sortable: true, align: 'left' },
             { display: 'Wiki Pages', name: 'wikipages', width: 400, sortable: false, align: 'left' }
         ],
         searchitems: [
-            { display: texts.osm.key, name: 'key' }
+            { display: '<%= osm.key %>', name: 'key' }
         ],
         sortname: 'count_all',
         sortorder: 'desc',