Updated translation texts.

* Removed texts about JOSM styles etc. that are not needed any more.
* Added some more text to the "Similar keys" report to tell mappers how to properly fix errors.
* Removed HTML from some texts and put some more HTML-escaping into report code.

10 files changed, 40 insertions, 40 deletions

diff --git a/web/views/reports/characters_in_keys.erb b/web/views/reports/characters_in_keys.erb
index 4403969..7d8eaf3 100644
--- a/web/views/reports/characters_in_keys.erb
+++ b/web/views/reports/characters_in_keys.erb
@@ -1,6 +1,6 @@
 <div class="pre">
     <h1><%= h(t.reports.characters_in_keys.name) %></h1>
-    <%= t.reports.characters_in_keys.intro %>
+    <p><%= h(t.reports.characters_in_keys.intro) %></p>
 </div>
 <div id="tabs">
     <ul>
diff --git a/web/views/reports/database_statistics.erb b/web/views/reports/database_statistics.erb
index 232a37d..19e9e10 100644
--- a/web/views/reports/database_statistics.erb
+++ b/web/views/reports/database_statistics.erb
@@ -11,14 +11,14 @@
     <tr>
         <td class="box">
             <table>
-                <tr><td><%= t.reports.database_statistics.objects_in_db %>:</td><td class="number"><%= @db.stats('objects').to_s_with_ts %></td></tr>
-                <tr><td><%= t.reports.database_statistics.tags_in_db %>:</td><td class="number"><%= @db.stats('object_tags').to_s_with_ts %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.objects_in_db) %>:</td><td class="number"><%= @db.stats('objects').to_s_with_ts %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.tags_in_db) %>:</td><td class="number"><%= @db.stats('object_tags').to_s_with_ts %></td></tr>
             </table>
         </td>
         <td class="box">
             <table>
-                <tr><td><%= t.reports.database_statistics.distinct_keys %>:</td><td class="number"><%= @db.stats('num_keys').to_s_with_ts %></td></tr>
-                <tr><td><%= t.reports.database_statistics.distinct_tags %>:</td><td class="number"><%= @db.stats('num_tags').to_s_with_ts %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.distinct_keys) %>:</td><td class="number"><%= @db.stats('num_keys').to_s_with_ts %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.distinct_tags) %>:</td><td class="number"><%= @db.stats('num_tags').to_s_with_ts %></td></tr>
             </table>
         </td>
         <td></td>
@@ -31,26 +31,26 @@
     <tr>
         <td class="box">
             <table>
-                <tr><td><%= t.reports.database_statistics.nodes_in_db %>:</td><td class="number"><%= @db.stats('nodes').to_s_with_ts %></td></tr>
-                <tr><td><%= t.reports.database_statistics.nodes_with_tags_in_db %>:</td><td class="number"><%= @db.stats('nodes_with_tags').to_s_with_ts %></td></tr>
-                <tr><td><%= t.reports.database_statistics.nodes_with_tags_in_db_percent %>:</td><td class="number"><%= (10000.0 * @db.stats('nodes_with_tags') / @db.stats('nodes')).to_i.to_f / 100 %>%</td></tr>
-                <tr><td><%= t.reports.database_statistics.tags_on_nodes %>:</td><td class="number"><%= @db.stats('node_tags').to_s_with_ts %></td></tr>
-                <tr><td><%= t.reports.database_statistics.avg_tags_per_tagged_node %>:</td><td class="number"><%= ( 100.0 * @db.stats('node_tags') / @db.stats('nodes_with_tags')).to_i.to_f / 100 %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.nodes_in_db) %>:</td><td class="number"><%= @db.stats('nodes').to_s_with_ts %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.nodes_with_tags_in_db) %>:</td><td class="number"><%= @db.stats('nodes_with_tags').to_s_with_ts %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.nodes_with_tags_in_db_percent) %>:</td><td class="number"><%= (10000.0 * @db.stats('nodes_with_tags') / @db.stats('nodes')).to_i.to_f / 100 %>%</td></tr>
+                <tr><td><%= h(t.reports.database_statistics.tags_on_nodes) %>:</td><td class="number"><%= @db.stats('node_tags').to_s_with_ts %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.avg_tags_per_tagged_node) %>:</td><td class="number"><%= ( 100.0 * @db.stats('node_tags') / @db.stats('nodes_with_tags')).to_i.to_f / 100 %></td></tr>
             </table>
         </td>
         <td class="box">
             <table>
-                <tr><td><%= t.reports.database_statistics.ways_in_db %>:</td><td class="number"><%= @db.stats('ways').to_s_with_ts %></td></tr>
-                <tr><td><%= t.reports.database_statistics.closed_ways_in_db %>:</td><td class="number"><%= @db.stats('closed_ways').to_s_with_ts %></td></tr>
-                <tr><td><%= t.reports.database_statistics.tags_on_ways %>:</td><td class="number"><%= @db.stats('way_tags').to_s_with_ts %></td></tr>
-                <tr><td><%= t.reports.database_statistics.avg_tags_per_way %>:</td><td class="number"><%= ( 100.0 * @db.stats('way_tags') / @db.stats('ways')).to_i.to_f / 100 %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.ways_in_db) %>:</td><td class="number"><%= @db.stats('ways').to_s_with_ts %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.closed_ways_in_db) %>:</td><td class="number"><%= @db.stats('closed_ways').to_s_with_ts %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.tags_on_ways) %>:</td><td class="number"><%= @db.stats('way_tags').to_s_with_ts %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.avg_tags_per_way) %>:</td><td class="number"><%= ( 100.0 * @db.stats('way_tags') / @db.stats('ways')).to_i.to_f / 100 %></td></tr>
             </table>
         </td>
         <td class="box">
             <table>
-                <tr><td><%= t.reports.database_statistics.relations_in_db %>:</td><td class="number"><%= @db.stats('relations').to_s_with_ts %></td></tr>
-                <tr><td><%= t.reports.database_statistics.tags_on_relations %>:</td><td class="number"><%= @db.stats('relation_tags').to_s_with_ts %></td></tr>
-                <tr><td><%= t.reports.database_statistics.avg_tags_per_relation %>:</td><td class="number"><%= ( 100.0 * @db.stats('relation_tags') / @db.stats('relations')).to_i.to_f / 100 %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.relations_in_db) %>:</td><td class="number"><%= @db.stats('relations').to_s_with_ts %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.tags_on_relations) %>:</td><td class="number"><%= @db.stats('relation_tags').to_s_with_ts %></td></tr>
+                <tr><td><%= h(t.reports.database_statistics.avg_tags_per_relation) %>:</td><td class="number"><%= ( 100.0 * @db.stats('relation_tags') / @db.stats('relations')).to_i.to_f / 100 %></td></tr>
             </table>
         </td>
     </tr>
diff --git a/web/views/reports/frequently_used_keys_without_wiki_page.erb b/web/views/reports/frequently_used_keys_without_wiki_page.erb
index 8033863..0e4f7d4 100644
--- a/web/views/reports/frequently_used_keys_without_wiki_page.erb
+++ b/web/views/reports/frequently_used_keys_without_wiki_page.erb
@@ -1,12 +1,12 @@
 <div class="pre">
-    <h1><%= t.reports.frequently_used_keys_without_wiki_page.name %></h1>
+    <h1><%= h(t.reports.frequently_used_keys_without_wiki_page.name) %></h1>
     <%= t.reports.frequently_used_keys_without_wiki_page.intro %>
 </div>
 <div class="box resize">
     <div class="boxpre">
         <form method="" type="GET" style="margin-bottom: 10px;">
             <input type="checkbox" name="english" id="english"<%= params[:english] == '1' ? ' checked="checked"' : '' %>/>
-            <%= t.reports.frequently_used_keys_without_wiki_page.also_show_keys %>
+            <%= h(t.reports.frequently_used_keys_without_wiki_page.also_show_keys) %>
         </form>
     </div>
     <table id="grid-keys">
diff --git a/web/views/reports/historic_development.erb b/web/views/reports/historic_development.erb
index d1763b0..10449da 100644
--- a/web/views/reports/historic_development.erb
+++ b/web/views/reports/historic_development.erb
@@ -1,23 +1,23 @@
 <div class="pre">
-    <h1><%= t.reports.historic_development.name %></h1>
-    <%= t.reports.historic_development.intro %>
+    <h1><%= h(t.reports.historic_development.name) %></h1>
+    <p><%= h(t.reports.historic_development.intro) %></p>
 </div>
 <div id="tabs">
     <ul>
-        <li><a href="#num_keys"><%= t.osm.keys %></a></li>
-        <li><a href="#num_tags"><%= t.osm.tags %></a></li>
-        <li><a href="#relation_types"><%= t.osm.relation_types %></a></li>
+        <li><a href="#num_keys"><%= h(t.osm.keys) %></a></li>
+        <li><a href="#num_tags"><%= h(t.osm.tags) %></a></li>
+        <li><a href="#relation_types"><%= h(t.osm.relation_types) %></a></li>
     </ul>
     <div id="num_keys">
-        <h2><%= t.reports.historic_development.keys.title %></h2>
+        <h2><%= h(t.reports.historic_development.keys.title) %></h2>
         <div class="canvas" id="canvas_num_keys"></div>
     </div>
     <div id="num_tags">
-        <h2><%= t.reports.historic_development.tags.title %></h2>
+        <h2><%= h(t.reports.historic_development.tags.title) %></h2>
         <div class="canvas" id="canvas_num_tags"></div>
     </div>
     <div id="relation_types">
-        <h2><%= t.reports.historic_development.relation_types.title %></h2>
+        <h2><%= h(t.reports.historic_development.relation_types.title) %></h2>
         <div class="canvas" id="canvas_relation_types"></div>
     </div>
 </div>
diff --git a/web/views/reports/index.erb b/web/views/reports/index.erb
index d37f8ae..2d2adbc 100644
--- a/web/views/reports/index.erb
+++ b/web/views/reports/index.erb
@@ -6,7 +6,7 @@
     <h2><%= h(t.pages.reports.list) %></h2>
     <ul>
 <% Report.each_visible_with_index do |report, n| c = (n%2!=0) ? ' even' : '' %>
-        <li><a href="<%= report.url %>"><%= t.reports[report.name].name %></a></li>
+        <li><a href="<%= report.url %>"><%= h(t.reports[report.name].name) %></a></li>
 <% end %>
     </ul>
 </div>
diff --git a/web/views/reports/key_lengths.erb b/web/views/reports/key_lengths.erb
index 8cbd857..b603507 100644
--- a/web/views/reports/key_lengths.erb
+++ b/web/views/reports/key_lengths.erb
@@ -1,20 +1,20 @@
 <div class="pre">
-    <h1><%= t.reports.key_lengths.name %></h1>
-    <%= t.reports.key_lengths.intro %>
+    <h1><%= h(t.reports.key_lengths.name) %></h1>
+    <p><%= h(t.reports.key_lengths.intro) %></p>
 </div>
 <div id="tabs">
     <ul>
-        <li><a href="#keys"><%= t.osm.keys %></a></li>
-        <li><a href="#histogram"><%= t.reports.key_lengths.histogram.name %></a></li>
+        <li><a href="#keys"><%= h(t.osm.keys) %></a></li>
+        <li><a href="#histogram"><%= h(t.reports.key_lengths.histogram.name) %></a></li>
     </ul>
     <div id="keys">
-        <h2><%= t.osm.keys %></h2>
+        <h2><%= h(t.osm.keys) %></h2>
         <table id="grid-keys">
         </table>
     </div>
     <div id="histogram">
-        <h2><%= t.reports.key_lengths.histogram.name %></h2>
-        <p><%= t.reports.key_lengths.histogram.intro %><p>
+        <h2><%= h(t.reports.key_lengths.histogram.name) %></h2>
+        <p><%= h(t.reports.key_lengths.histogram.intro) %><p>
         <div class="canvas" id="canvas-histogram"></div>
     </div>
 </div>
diff --git a/web/views/reports/language_comparison_table_for_keys_in_the_wiki.erb b/web/views/reports/language_comparison_table_for_keys_in_the_wiki.erb
index 6b81119..ca8cafa 100644
--- a/web/views/reports/language_comparison_table_for_keys_in_the_wiki.erb
+++ b/web/views/reports/language_comparison_table_for_keys_in_the_wiki.erb
@@ -1,6 +1,6 @@
 <div class="pre">
     <h1><%= h(t.reports.language_comparison_table_for_keys_in_the_wiki.name) %></h1>
-    <%= t.reports.language_comparison_table_for_keys_in_the_wiki.intro %>
+    <p><%= h(t.reports.language_comparison_table_for_keys_in_the_wiki.intro) %></p>
 </div>
 <div class="box resize">
     <table id="grid-keys">
diff --git a/web/views/reports/languages.erb b/web/views/reports/languages.erb
index 175bd78..9f1d545 100644
--- a/web/views/reports/languages.erb
+++ b/web/views/reports/languages.erb
@@ -1,6 +1,6 @@
 <div class="pre">
     <h1><%= h(t.reports.languages.name) %></h1>
-    <%= t.reports.languages.intro %>
+    <p><%= h(t.reports.languages.intro) %></p>
 </div>
 <div class="box">
     <table id="grid-langs">
diff --git a/web/views/reports/similar_keys.erb b/web/views/reports/similar_keys.erb
index cab3a70..f9dca6c 100644
--- a/web/views/reports/similar_keys.erb
+++ b/web/views/reports/similar_keys.erb
@@ -1,6 +1,6 @@
 <div class="pre">
-    <h1><%= t.reports.similar_keys.name %></h1>
-    <%= t.reports.similar_keys.intro %>
+    <h1><%= h(t.reports.similar_keys.name) %></h1>
+    <p><%= h(t.reports.similar_keys.intro) %></p>
 </div>
 <div class="box resize">
 <% begin @db.count('db.similar_keys_common_rare').execute() %>
diff --git a/web/views/reports/wiki_pages_about_non_existing_keys.erb b/web/views/reports/wiki_pages_about_non_existing_keys.erb
index 46771d0..4decbe9 100644
--- a/web/views/reports/wiki_pages_about_non_existing_keys.erb
+++ b/web/views/reports/wiki_pages_about_non_existing_keys.erb
@@ -1,6 +1,6 @@
 <div class="pre">
     <h1><%= h(t.reports.wiki_pages_about_non_existing_keys.name) %></h1>
-    <%= t.reports.wiki_pages_about_non_existing_keys.intro %>
+    <p><%= h(t.reports.wiki_pages_about_non_existing_keys.intro) %></p>
 </div>
 <div class="box resize">
     <table id="grid-keys">