Internationalization of key page

5 files changed, 73 insertions, 30 deletions

diff --git a/web/i18n/de.yml b/web/i18n/de.yml
index 95097f8..0491f57 100644
--- a/web/i18n/de.yml
+++ b/web/i18n/de.yml
@@ -135,7 +135,9 @@ pages:
             ways: Nur Ways
             relations: Nur Relations
         number_objects: Anzahl Objekte
+        number_values: Anzahl Values
         values_used: Values für diesen Key
+        tag_description_from_wiki: Beschreibung dieses Tags aus dem Wiki (falls vorhanden in der gewählten Sprache, sonst auf englisch).
         overview:
             objects_last_edited_by: Objekte mit diesem Key wurden zuletzt von %1 verschiedenen Usern editiert.
             no_endorsement: (Das bedeutet nicht, dass alle diese User den Key befürworten.)
@@ -143,6 +145,9 @@ pages:
         other_keys_used:
             title: Andere Keys, die mit diesem Key benutzt werden
             other: Andere Keys
+            to_count_tooltip: Anzahl Objekte mit diesem Key, die auch den anderen Key haben.
+            other_key_tooltip: Andere Keys, die zusammen mit diesem Key vorkommt.
+            from_count_tooltip: Anzahle Objekte mit dem anderen Key, die auch diesen Key haben.
         geographic_distribution:
             title: Geographische Verteilung dieses Keys
             relations: Relations haben keinen geographischen Ort, daher kann keine Karte angezeigt werden.
@@ -150,10 +155,15 @@ pages:
             title: Wiki-Seiten zu diesem Key
             none_found: Keine Wiki-Seiten für diesen Key vorhanden.
             create: Wiki-Seite für diesen Key anlegen
-        josm_rules:
+            wiki_page: Wiki-Seite
+            implied_tags: Implizite Tags
+            combined_tags: Verbundene Tags
+            linked_tags: Ähnliche Tags
+        josm:
             title: JOSM-Stil-Regeln mit diesem Key
             choice: |
                   Stil auswählen:
+            no_styles: Keine JOSM-Stilregeln für diesen Key.
     tag:
         description_from_wiki: Beschreibung dieses Tags aus dem Wiki (falls vorhanden in der gewählten Sprache, sonst auf englisch).
         no_description_in_wiki: Keine Beschreibung dieses Tags im Wiki.
@@ -221,6 +231,15 @@ misc:
     empty_string: leere Zeichenkette
     unknown: unbekannt
     count: Anzahl
+    image: Bild
     no_image: kein Bild
     all: Alle
+    object: Objekt
+    objects: Objekte
+    object_type: Typ
+    description: Beschreibung
+    icon: Icon
+    line: Linie
+    area: Fläche
+    language: Sprache
 
diff --git a/web/i18n/en.yml b/web/i18n/en.yml
index 2f95631..dcfaa93 100644
--- a/web/i18n/en.yml
+++ b/web/i18n/en.yml
@@ -131,7 +131,9 @@ pages:
             ways: Ways only
             relations: Relations only
         number_objects: Number of objects
+        number_values: Number of values
         values_used: Values used with this key
+        tag_description_from_wiki: Description of the tag from the wiki (if available in your chosen language, otherwise in English).
         overview:
             objects_last_edited_by: Objects with this key were last edited by %1 different users.
             no_endorsement: (This does not mean that all those users endorse this key.)
@@ -139,6 +141,9 @@ pages:
         other_keys_used:
             title: Other keys used together with this key
             other: Other keys
+            to_count_tooltip: Number of objects with this key that also have the other key.
+            other_key_tooltip: Key used together with this key.
+            from_count_tooltip: Number of objects with other key that also have this key.
         geographic_distribution:
             title: Geographical distribution of this key
             relations: Relations do not have a geographical location, so no map can be shown.
@@ -146,10 +151,15 @@ pages:
             title: Wiki pages about this key
             none_found: No wiki page available for this key.
             create: Create wiki page for this key
-        josm_rules:
+            wiki_page: Wiki page
+            implied_tags: Implied Tags
+            combined_tags: Combined Tags
+            linked_tags: Linked Tags
+        josm:
             title: JOSM style rules with this key
             choice: |
                   Choose style:
+            no_styles: No JOSM styles for this key.
     tag:
         description_from_wiki: Description of this tag from the wiki (if available in your chosen language, otherwise in English).
         no_description_in_wiki: No description for this tag in the wiki.
@@ -276,6 +286,15 @@ misc:
     empty_string: empty string
     unknown: unknown
     count: Count
+    image: Image
     no_image: no image
     all: All
+    object: Object
+    objects: Objects
+    object_type: Type
+    description: Description
+    icon: Icon
+    line: Line
+    area: Area
+    language: Language
 
diff --git a/web/i18n/fr.yml b/web/i18n/fr.yml
index a6bb86a..bb485bb 100644
--- a/web/i18n/fr.yml
+++ b/web/i18n/fr.yml
@@ -91,7 +91,7 @@ pages:
         wiki_pages:
             title: Pages du wiki sur cette clé
             none_found: Aucune page du wiki trouvée.
-        josm_rules:
+        josm:
             title: Régles de style JOSM sur cette clé
             choice: |
                   Choix du style :
diff --git a/web/views/key.erb b/web/views/key.erb
index 891b286..58e54c9 100644
--- a/web/views/key.erb
+++ b/web/views/key.erb
@@ -80,9 +80,9 @@
         <% end %>
     </div>
     <div id="josm">
-        <h2><%= t.pages.key.josm_rules.title %></h2>
+        <h2><%= t.pages.key.josm.title %></h2>
 <!--        <form>
-            <label for="josm-style"><%= t.pages.key.josm_rules.choice %></label>
+            <label for="josm-style"><%= t.pages.key.josm.choice %></label>
             <select id="josm-style" name="josm-style">
                 <option>Standard</option>
             </select>
diff --git a/web/viewsjs/key.js.erb b/web/viewsjs/key.js.erb
index adf8339..92775bc 100644
--- a/web/viewsjs/key.js.erb
+++ b/web/viewsjs/key.js.erb
@@ -1,11 +1,16 @@
+<%
+    osm = @trans.t.osm
+    misc = @trans.t.misc
+    page = @trans.t.pages.key
+ %>
 var create_flexigrid_for = {
     overview: function(key, filter_type) {
         create_flexigrid('grid-overview', {
             url: '/api/3/db/keys/overview?key=' + encodeURIComponent(key),
             colModel: [
-                { display: 'Type', name: 'type', width: 100, sortable: true },
-                { display: 'Number of objects', name: 'count', width: 260, sortable: true, align: 'center' },
-                { display: 'Number of values', name: 'value', width: 140, sortable: true, align: 'right' }
+                { display: '<%= misc.object_type %>', name: 'type', width: 100, sortable: true },
+                { display: '<%= page.number_objects %>', name: 'count', width: 260, sortable: true, align: 'center' },
+                { display: '<%= page.number_values %>', name: 'value', width: 140, sortable: true, align: 'right' }
             ],
             usepager: false,
             useRp: false,
@@ -28,12 +33,12 @@ var create_flexigrid_for = {
         create_flexigrid('grid-values', {
             url: '/api/2/db/keys/values?key=' + encodeURIComponent(key) + '&filter=' + encodeURIComponent(filter_type) + '&lang=' + encodeURIComponent(lang),
             colModel: [
-                { display: texts.osm.value, name: 'value', width: 200, sortable: true },
-                { display: texts.misc.count, name: 'count', width: 240, sortable: true, align: 'center' },
-                { display: 'Description', name: 'description', width: 600, sortable: false, align: 'left' }
+                { display: '<%= osm.value %>', name: 'value', width: 200, sortable: true },
+                { display: '<%= misc.count %>', name: 'count', width: 240, sortable: true, align: 'center' },
+                { display: '<span title="<%= page.tag_description_from_wiki %>"><%= misc.description %></span>', name: 'description', width: 600, sortable: false, align: 'left' }
             ],
             searchitems: [
-                { display: texts.osm.value, name: 'value' }
+                { display: '<%= osm.value %>', name: 'value' }
             ],
             sortname: 'count',
             sortorder: 'desc',
@@ -54,12 +59,12 @@ var create_flexigrid_for = {
         create_flexigrid('grid-keys', {
             url: '/api/2/db/keys/keys?key=' + encodeURIComponent(key) + '&filter=' + encodeURIComponent(filter_type),
             colModel: [
-                { display: '<span title="Number of objects with this key that also have the other key">' + texts.misc.count + ' &rarr;</span>', name: 'to_count', width: 320, sortable: true, align: 'center' },
-                { display: '<span title="Key used together with this key">' + texts.pages.key.other_keys_used.other + '</span>', name: 'other_key', width: 340, sortable: true },
-                { display: '<span title="Number of objects with other key that also have this key">&rarr; ' + texts.misc.count + '</span>', name: 'from_count', width: 320, sortable: true, align: 'center' }
+                { display: '<span title="<%= page.other_keys_used.to_count_tooltip %>"><%= misc.count %> &rarr;</span>', name: 'to_count', width: 320, sortable: true, align: 'center' },
+                { display: '<span title="<%= page.other_keys_used.other_key_tooltip %>"><%= page.other_keys_used.other %></span>', name: 'other_key', width: 340, sortable: true },
+                { display: '<span title="<%= page.other_keys_used.from_count_tooltip %>">&rarr; <%= misc.count %></span>', name: 'from_count', width: 320, sortable: true, align: 'center' }
             ],
             searchitems: [
-                { display: 'Other key', name: 'other_key' }
+                { display: '<%= page.other_keys_used.other %>', name: 'other_key' }
             ],
             sortname: 'to_count',
             sortorder: 'desc',
@@ -79,14 +84,14 @@ var create_flexigrid_for = {
         create_flexigrid('grid-josm', {
             url: '/api/2/josm/styles/standard/keys?key=' + encodeURIComponent(key),
             colModel: [
-                { display: texts.osm.value, name: 'v', width: 400, 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' }
+                { display: '<%= osm.value %>', name: 'v', width: 400, sortable: true },
+                { display: '<%= misc.icon %>', name: 'icon', width: 40, sortable: false, align: 'center' },
+                { display: '<%= misc.line %>', name: 'line', width: 40, sortable: false, align: 'center' },
+                { display: '<%= misc.area %>', name: 'area', width: 40, sortable: false, align: 'center' }
             ],
             sortname: 'v',
             sortorder: 'asc',
-            emptymsg: 'No JOSM styles for this key.',
+            emptymsg: '<%= page.josm.no_styles %>',
             preProcess: function(data) {
                 data.rows = jQuery.map(data.data, function(row, i) {
                     return { 'cell': [
@@ -104,14 +109,14 @@ var create_flexigrid_for = {
         create_flexigrid('grid-wiki', {
             url: '/api/2/wiki/keys?key=' + encodeURIComponent(key),
             colModel: [
-                { display: 'Language',      name: 'lang',             width: 150, sortable: false },
-                { display: 'Wiki page',     name: 'title',            width: 160, sortable: false, align: 'right' },
-                { display: 'Description',   name: 'description',      width: 400, sortable: false },
-                { display: 'Image',         name: 'image',            width: 120, sortable: false },
-                { display: 'Objects',       name: 'objects',          width:  80, sortable: false },
-                { display: 'Implied Tags',  name: 'tags_implied',     width: 120, sortable: false },
-                { display: 'Combined Tags', name: 'tags_combination', width: 120, sortable: false },
-                { display: 'Linked Tags',   name: 'tags_linked',      width: 220, sortable: false }
+                { display: '<%= misc.language %>', name: 'lang', width: 150, sortable: false },
+                { display: '<%= page.wiki_pages.wiki_page %>', name: 'title', width: 160, sortable: false, align: 'right' },
+                { display: '<%= misc.description %>', name: 'description', width: 400, sortable: false },
+                { display: '<%= misc.image %>', name: 'image', width: 120, sortable: false },
+                { display: '<%= misc.objects %>', name: 'objects', width:  80, sortable: false },
+                { display: '<%= page.wiki_pages.implied_tags %>', name: 'tags_implied', width: 120, sortable: false },
+                { display: '<%= page.wiki_pages.combined_tags %>', name: 'tags_combination', width: 120, sortable: false },
+                { display: '<%= page.wiki_pages.linked_tags %>', name: 'tags_linked', width: 220, sortable: false }
             ],
             usepager: false,
             useRp: false,
@@ -124,7 +129,7 @@ var create_flexigrid_for = {
                             print_language(row.lang, row.language, row.language_en),
                             print_wiki_link(row.title),
                             row.description,
-                            row.image == ''   ? empty(texts.misc.no_image) : hover_expand(print_wiki_link(row.image)),
+                            row.image == ''   ? empty('<%= misc.no_image %>') : hover_expand(print_wiki_link(row.image)),
                             (row.on_node      ? '<img src="/img/types/node.16.png"     alt="yes" width="16" height="16"/>' : '<img src="/img/types/none.16.png" alt="no" width="16" height="16"/>') + ' ' +
                             (row.on_way       ? '<img src="/img/types/way.16.png"      alt="yes" width="16" height="16"/>' : '<img src="/img/types/none.16.png" alt="no" width="16" height="16"/>') + ' ' +
                             (row.on_area      ? '<img src="/img/types/area.16.png"     alt="yes" width="16" height="16"/>' : '<img src="/img/types/none.16.png" alt="no" width="16" height="16"/>') + ' ' +