Internationalized keys and tags tables

4 files changed, 58 insertions, 14 deletions

diff --git a/web/i18n/de.yml b/web/i18n/de.yml
index bf7a8d1..cfdbdbc 100644
--- a/web/i18n/de.yml
+++ b/web/i18n/de.yml
@@ -101,9 +101,27 @@ pages:
     keys:
         intro: |
                 Diese Tabelle zeigt alle Keys, die in der Datenbank oder einer anderen Quelle vorkommen.
+        table:
+            total: Alle
+            total_tooltip: Anzahl der Objekte mit diesem Key (als Absolutwert und als Bruchteil aller Nodes, Ways und Relations).
+            nodes_tooltip: Anzahl der Nodes mit diesem Key (als Absolutwert und als Bruchteil aller Nodes mit Tags, d.h. Nodes ohne jegliche Tags werden ignoriert).
+            ways_tooltip: Anzahl der Ways mit diesem Key (als Absolutwert und als Bruchteil aller Ways).
+            relations_tooltip: Anzahl der Relations mit diesem Key (als Absolutwert und als Bruchteil aller Relations).
+            users_tooltip: Anzahl unterschiedlicher User, die die Objekte mit diesem Key zuletzt geändert haben.
+            in_wiki_tooltip: Zu diesem Key gibt es mindestens eine Wiki-Seite.
+            in_josm_tooltip: Der Key erscheint in der JOSM-Konfiguration.
+            values_tooltip: Anzahl verschiedener Values zu diesem Key.
+            prevalent_values: Häufige Values
+            prevalent_values_tooltip: Bis zu zehn der häufigsten Values zu diesem Key (Anzeige nur, wenn mehr als 1% der Tags mit diesem Key auch diesen Value haben).
     tags:
         intro: |
                 Diese Tabelle zeigt die häufigsten Tags in der Datenbank.
+        table:
+            total: Alle
+            total_tooltip: Anzahl der Objekte mit diesem Tag (als Absolutwert und als Bruchteil aller Nodes, Ways und Relations).
+            nodes_tooltip: Anzahl der Nodes mit diesem Tag (als Absolutwert und als Bruchteil aller Nodes mit Tags, d.h. Nodes ohne jegliche Tags werden ignoriert).
+            ways_tooltip: Anzahl der Ways mit diesem Tag (als Absolutwert und als Bruchteil aller Ways).
+            relations_tooltip: Anzahl der Relations mit diesem Tag (als Absolutwert und als Bruchteil aller Relations).
     key:
         description_from_wiki: Beschreibung dieses Keys aus dem Wiki (falls vorhanden in der gewählten Sprache, sonst auf englisch).
         no_description_in_wiki: Keine Beschreibung dieses Keys im Wiki.
diff --git a/web/i18n/en.yml b/web/i18n/en.yml
index 65875e2..6a0e285 100644
--- a/web/i18n/en.yml
+++ b/web/i18n/en.yml
@@ -97,9 +97,27 @@ pages:
     keys:
         intro: |
                 This table shows all tag keys that exist in the database or in any of the other sources.
+        table:
+            total: Total
+            total_tooltip: Number of objects with this key (as absolute value and as percentage of all nodes, ways, and relations).
+            nodes_tooltip: Number of nodes with this key (as absolute value and as percentage of tagged nodes, ie. nodes without any tags are ignored).
+            ways_tooltip: Number of ways with this key (as absolute value and as percentage of all ways).
+            relations_tooltip: Number of relations with this key (as absolute value and as percentage of all relations).
+            users_tooltip: Number of distinct users who last changed objects with this key.
+            in_wiki_tooltip: Key has at least one wiki page.
+            in_josm_tooltip: Key appears in JOSM config.
+            values_tooltip: Number of different values for this key.
+            prevalent_values: Prevalent values
+            prevalent_values_tooltip: Up to ten of the most common values for this key (only if more than 1% of tags with this key have this value).
     tags:
         intro: |
                 This table shows the most common tags in the database.
+        table:
+            total: Total
+            total_tooltip: Number of objects with this tag (as absolute value and as percentage of all nodes, ways, and relations).
+            nodes_tooltip: Number of nodes with this tag (as absolute value and as percentage of tagged nodes, ie. nodes without any tags are ignored).
+            ways_tooltip: Number of ways with this tag (as absolute value and as percentage of all ways).
+            relations_tooltip: Number of relations with this tag (as absolute value and as percentage of all relations).
     key:
         description_from_wiki: Description of this key from the wiki (if available in your chosen language, otherwise in English).
         no_description_in_wiki: No description for this key in the wiki.
diff --git a/web/viewsjs/keys.js.erb b/web/viewsjs/keys.js.erb
index b1aebe4..e1bfac4 100644
--- a/web/viewsjs/keys.js.erb
+++ b/web/viewsjs/keys.js.erb
@@ -1,17 +1,21 @@
+<%
+    osm = @trans.t.osm
+    table = @trans.t.pages.keys.table
+ %>
 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: '<span title="Number of objects with this key (as absolute value and as percentage of all nodes, ways, and relations)"><img src="/img/types/all.16.png" alt=""/> Total</span>', name: 'count_all', width: 200, sortable: true, align: 'center' },
-            { display: '<span title="Number of nodes with this key (as absolute value and as percentage of tagged nodes, ie. nodes without any tags are ignored)"><img src="/img/types/node.16.png" alt=""/> Nodes</span>', name: 'count_nodes', width: 220, sortable: true, align: 'center' },
-            { display: '<span title="Number of ways with this key (as absolute value and as percentage of all ways)"><img src="/img/types/way.16.png" alt=""/> Ways</span>', name: 'count_ways', width: 220, sortable: true, align: 'center' },
-            { display: '<span title="Number of relations with this key (as absolute value and as percentage of all relations)"><img src="/img/types/relation.16.png" alt=""/> Relation</span>', name: 'count_relations',  width: 220, sortable: true, align: 'center' },
-            { display: '<span title="Number of different users who last changed objects with this key">Users</span>', name: 'users_all', width: 44, sortable: true, align: 'right' },
-            { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" title="Key has a wiki page"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
-            { display: '<img src="/img/sources/josm.16.png" alt="JOSM" title="Key appears in JOSM config"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
-            { display: '<span title="Number of different values for this key">Values</span>', name: 'values_all', width: 70, sortable: true, align: 'right' },
-            { display: '<span title="Up to ten of the most common values for this key (only if more than 1% of tags with this key have this value)">Prevalent Values</span>', name: 'prevalent_values', width: 500, 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' },
+            { 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' },
+            { display: '<span title="<%= table.users_tooltip %>"><%= osm.users %></span>', name: 'users_all', width: 44, sortable: true, align: 'right' },
+            { display: '<img src="/img/sources/wiki.16.png" alt="Wiki" width="16" height="16" title="<%= table.in_wiki_tooltip %>"/>', name: 'in_wiki', width: 20, sortable: true, align: 'center' },
+            { display: '<img src="/img/sources/josm.16.png" alt="JOSM" width="16" height="16" title="<%= table.in_josm_tooltip %>"/>', name: 'in_josm', width: 20, sortable: true, align: 'center' },
+            { display: '<span title="<%= table.values_tooltip %>"><%= osm.values %></span>', name: 'values_all', width: 70, sortable: true, align: 'right' },
+            { 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' }
diff --git a/web/viewsjs/tags.js.erb b/web/viewsjs/tags.js.erb
index 07133c5..fa378bd 100644
--- a/web/viewsjs/tags.js.erb
+++ b/web/viewsjs/tags.js.erb
@@ -1,12 +1,16 @@
+<%
+    osm = @trans.t.osm
+    table = @trans.t.pages.tags.table
+ %>
 function page_init() {
     create_flexigrid('grid-tags', {
         url: '/api/2/db/tags',
         colModel: [
-            { display: texts.osm.tag, name: 'tag', width: 300, sortable: true },
-            { display: '<span title="Number of objects with this tag (as absolute value and as percentage of all nodes, ways, and relations)"><img src="/img/types/all.16.png" alt=""/> Total</span>', name: 'count_all', width: 260, sortable: true, align: 'center' },
-            { display: '<span title="Number of nodes with this tag (as absolute value and as percentage of tagged nodes, ie. nodes without any tags are ignored)"><img src="/img/types/node.16.png" alt=""/> Nodes</span>', name: 'count_nodes', width: 220, sortable: true, align: 'center' },
-            { display: '<span title="Number of ways with this tag (as absolute value and as percentage of all ways)"><img src="/img/types/way.16.png" alt=""/> Ways</span>', name: 'count_ways', width: 220, sortable: true, align: 'center' },
-            { display: '<span title="Number of relations with this tag (as absolute value and as percentage of all relations)"><img src="/img/types/relation.16.png" alt=""/> Relation</span>', name: 'count_relations',  width: 220, sortable: true, align: 'center' }
+            { display: '<%= osm.tag %>', name: 'tag', width: 300, 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: 260, 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' },
+            { 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' }