Some text/translation improvements

5 files changed, 26 insertions, 12 deletions

diff --git a/web/i18n/de.yml b/web/i18n/de.yml
index 4fba822..4a6745c 100644
--- a/web/i18n/de.yml
+++ b/web/i18n/de.yml
@@ -119,6 +119,7 @@ pages:
         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.)
+            distribution_of_values: Aufteilung der Values
         other_keys_used:
             title: Andere Keys, die mit diesem Key benutzt werden
             other: Andere Keys
@@ -126,8 +127,9 @@ pages:
             title: Geographische Verteilung dieses Keys
             relations: Relations haben keinen geographischen Ort, daher kann keine Karte angezeigt werden.
         wiki_pages:
-            title: Wiki-Seiten über diesen Key
-            none_found: Keine Wiki-Seite für diesen Key.
+            title: Wiki-Seiten zu diesem Key
+            none_found: Keine Wiki-Seiten für diesen Key vorhanden.
+            create: Wiki-Seite anlegen
         josm_rules:
             title: JOSM-Stil-Regeln mit diesem Key
             choice: |
@@ -142,8 +144,9 @@ pages:
             title: Kombinationen
             description: Diese Tabelle zeigt nur die häufigsten Kombinationen der häufigsten Tags.
         wiki_pages:
-            title: Wiki-Seiten über dieses Tag
-            none_found: Keine Wiki-Seiten für diesen Key vorhanden.
+            title: Wiki-Seiten zu diesem Tag
+            none_found: Keine Wiki-Seiten für diesen Tag vorhanden.
+            create: Wiki-Seite anlegen
         josm_rules:
             title: JOSM-Stil-Regeln mit diesem Tag
             choice: |
@@ -190,7 +193,7 @@ reports:
     languages:
         name: Sprachen
     wiki_pages_about_non_existing_keys:
-        name: Wiki-Seiten über nicht-existierende Keys
+        name: Wiki-Seiten zu nicht-existierende Keys
 
 misc:
     values_less_than_one_percent: keine Values mit mehr als 1%
diff --git a/web/i18n/en.yml b/web/i18n/en.yml
index a9f597a..6e849d6 100644
--- a/web/i18n/en.yml
+++ b/web/i18n/en.yml
@@ -115,6 +115,7 @@ pages:
         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.)
+            distribution_of_values: Distribution of values
         other_keys_used:
             title: Other keys used together with this key
             other: Other keys
@@ -124,6 +125,7 @@ pages:
         wiki_pages:
             title: Wiki pages about this key
             none_found: No wiki page available for this key.
+            create: Create wiki page
         josm_rules:
             title: JOSM style rules with this key
             choice: |
@@ -140,6 +142,7 @@ pages:
         wiki_pages:
             title: Wiki pages about this tag
             none_found: No wiki page available for this tag.
+            create: Create wiki page
         josm_rules:
             title: JOSM style rules with this tag
             choice: |
diff --git a/web/lib/ui/keys_tags.rb b/web/lib/ui/keys_tags.rb
index 97573b3..2782be9 100644
--- a/web/lib/ui/keys_tags.rb
+++ b/web/lib/ui/keys_tags.rb
@@ -24,7 +24,11 @@ class Taginfo < Sinatra::Base
 
         @desc = h(@db.select("SELECT description FROM wiki.wikipages WHERE lang=? AND key=? AND value IS NULL", r18n.locale.code, @key).get_first_value())
         @desc = h(@db.select("SELECT description FROM wiki.wikipages WHERE lang='en' AND key=? AND value IS NULL", @key).get_first_value()) if @desc == ''
-        @desc = "<span class='empty'>#{ t.pages.key.no_description_in_wiki }</span>" if @desc == ''
+        if @desc == ''
+            @desc = "<span class='empty'>#{ t.pages.key.no_description_in_wiki }</span>"
+        else
+            @desc = "<span title='#{ t.pages.key.description_from_wiki }' tipsy='w'>#{ @desc }</span"
+        end
 
         @prevalent_values = @db.select("SELECT value, count_#{@filter_type} AS count FROM tags").
             condition('key=?', @key).
@@ -99,7 +103,11 @@ class Taginfo < Sinatra::Base
 
         @desc = h(@db.select("SELECT description FROM wiki.wikipages WHERE lang=? AND key=? AND value=?", r18n.locale.code, @key, @value).get_first_value())
         @desc = h(@db.select("SELECT description FROM wiki.wikipages WHERE lang='en' AND key=? AND value=?", @key, @value).get_first_value()) if @desc == ''
-        @desc = "<span class='empty'>#{ t.pages.tag.no_description_in_wiki }</span>" if @desc == ''
+        if @desc == ''
+            @desc = "<span class='empty'>#{ t.pages.tag.no_description_in_wiki }</span>"
+        else
+            @desc = "<span title='#{ t.pages.tag.description_from_wiki }' tipsy='w'>#{ @desc }</span"
+        end
 
         erb :tag
     end
diff --git a/web/views/key.erb b/web/views/key.erb
index cd7f869..891b286 100644
--- a/web/views/key.erb
+++ b/web/views/key.erb
@@ -17,7 +17,7 @@
         </select>
     </form>
     <h1><%= @key_pp %></h1>
-    <p><span title="<%= t.pages.key.description_from_wiki %>" tipsy="w"><%= @desc %></span></p>
+    <p><%= @desc %></p>
 </div>
 <div id="tabs">
     <ul class="no-print">
@@ -30,7 +30,7 @@
     </ul>
     <div id="overview">
         <div style="float: right; text-align: center;">
-            <p>Distribution of values</p>
+            <p><%= t.pages.key.overview.distribution_of_values %></p>
             <div class="canvas" id="canvas-values"></div>
         </div>
         <h2><%= t.taginfo.overview %></h2>
@@ -76,7 +76,7 @@
             </table>
         <% else %>
             <p class="empty"><%= t.pages.key.wiki_pages.none_found %></p>
-            <p><a class="extlink" target="_blank" rel="nofollow" href="http://wiki.openstreetmap.org/w/index.php?action=edit&title=Key:<%= @key_uri %>">Create wiki page</a></p>
+            <p><a class="extlink" target="_blank" rel="nofollow" href="http://wiki.openstreetmap.org/w/index.php?action=edit&title=Key:<%= @key_uri %>"><%= t.pages.key.wiki_pages.create %></a></p>
         <% end %>
     </div>
     <div id="josm">
diff --git a/web/views/tag.erb b/web/views/tag.erb
index c34428f..472abb7 100644
--- a/web/views/tag.erb
+++ b/web/views/tag.erb
@@ -17,7 +17,7 @@
         </select>
     </form>
     <h1><%= link_to_key(@key) %>=<%= @value_pp %></h1>
-    <p><span title="<%= t.pages.tag.description_from_wiki %>" tipsy="w"><%= @desc %></span></p>
+    <p><%= @desc %></p>
 </div>
 <div id="tabs">
     <ul>
@@ -46,7 +46,7 @@
             </table>
         <% else %>
             <p class="empty"><%= t.pages.tag.wiki_pages.none_found %></p>
-            <p><a class="extlink" target="_blank" rel="nofollow" href="http://wiki.openstreetmap.org/w/index.php?action=edit&title=Tag:<%= escape(@tag) %>">Create wiki page</a></p>
+            <p><a class="extlink" target="_blank" rel="nofollow" href="http://wiki.openstreetmap.org/w/index.php?action=edit&title=Tag:<%= escape(@tag) %>"><%= t.pages.tag.wiki_pages.create %></a></p>
         <% end %>
     </div>
     <div id="josm">