more new style javascript and translations

4 files changed, 40 insertions, 80 deletions

diff --git a/web/views/reports/characters_in_keys.erb b/web/views/reports/characters_in_keys.erb
index 94fe728..390e091 100644
--- a/web/views/reports/characters_in_keys.erb
+++ b/web/views/reports/characters_in_keys.erb
@@ -1,56 +1,28 @@
-<h1><%= @title %></h1>
+<h1><%= t.reports.characters_in_keys.name %></h1>
 
-<p>Any valid Unicode character can appear in an OSM key but usually only lower
-case latin letters (a-z) and the underscore (_) are used. Sometimes the colon
-(:) is added as a separator character.</p>
+<%= t.reports.characters_in_keys.intro %>
 
 <div id="tabs">
     <ul>
-        <li><a href="#statistics">Statistics</a></li>
-        <li><a href="#whitespace"><span style="background-color: #d62727;">&nbsp;&nbsp;&nbsp;</span> Whitespace</a></li>
-        <li><a href="#problematic"><span style="background-color: #ff9896;">&nbsp;&nbsp;&nbsp;</span> Problematic</a></li>
+        <li><a href="#statistics"><%= t.reports.characters_in_keys.statistics.tab %></a></li>
+        <li><a href="#whitespace"><span style="background-color: #d62727;">&nbsp;&nbsp;&nbsp;</span> <%= t.reports.characters_in_keys.whitespace.tab %></a></li>
+        <li><a href="#problematic"><span style="background-color: #ff9896;">&nbsp;&nbsp;&nbsp;</span> <%= t.reports.characters_in_keys.problematic.tab %></a></li>
     </ul>
     <div id="statistics">
-        <h2>Statistics Overview</h2>
+        <h2><%= t.reports.characters_in_keys.statistics.title %></h2>
         <div class="canvas" id="canvas"></div>
         <p></p>
         <table id="grid-statistics">
+<% letter='A'
+   colors = { :A => '#2ca02c', :B => '#98df8a', :C => '#dbdb8d', :D => '#d62728', :E => '#ff9896', :F => '#aec7e8' }
+   %w(plain colon letters space problem rest).each do |type| %>
             <tr>
-                <td style="background-color: #2ca02c;">A</td>
-                <td><%= @db.stats('characters_in_keys_plain') %></td>
-                <td><%= sprintf '%.2f', @db.stats('characters_in_keys_plain') * 100.0 / @db.stats('num_keys') %>%</td>
-                <td>Only latin lowercase letters (<span class="char">a</span> to <span class="char">z</span>) and underscore (<span class="char">_</span>), first and last characters are letters.</td>
-            </tr>
-            <tr>
-                <td style="background-color: #98df8a;">B</td>
-                <td><%= @db.stats('characters_in_keys_colon') %></td>
-                <td><%= sprintf '%.2f', @db.stats('characters_in_keys_colon') * 100.0 / @db.stats('num_keys') %>%</td>
-                <td>Like A but with one or more colons (<span class="char">:</span>) inside.</td>
-            </tr>
-            <tr>
-                <td style="background-color: #dbdb8d;">C</td>
-                <td><%= @db.stats('characters_in_keys_letters') %></td>
-                <td><%= sprintf '%.2f', @db.stats('characters_in_keys_letters') * 100.0 / @db.stats('num_keys') %>%</td>
-                <td>Like B but with uppercase latin letters or letters from other alphabets.</td>
-            </tr>
-            <tr>
-                <td style="background-color: #d62728;">D</td>
-                <td><%= @db.stats('characters_in_keys_space') %></td>
-                <td><%= sprintf '%.2f', @db.stats('characters_in_keys_space') * 100.0 / @db.stats('num_keys') %>%</td>
-                <td>Like C but contains at least one whitespace character (space, tab, new line, carriage return, or from other alphabets).</td>
-            </tr>
-            <tr>
-                <td style="background-color: #ff9896;">E</td>
-                <td><%= @db.stats('characters_in_keys_problem') %></td>
-                <td><%= sprintf '%.2f', @db.stats('characters_in_keys_problem') * 100.0 / @db.stats('num_keys') %>%</td>
-                <td>Like C but contains possibly problematic characters: <span class="char">=+/&amp;&lt;&gt;;'"?%#@\,</span>.</td>
-            </tr>
-            <tr>
-                <td style="background-color: #aec7e8;">F</td>
-                <td><%= @db.stats('characters_in_keys_rest') %></td>
-                <td><%= sprintf '%.2f', @db.stats('characters_in_keys_rest') * 100.0 / @db.stats('num_keys') %>%</td>
-                <td>Everything else.</td>
+                <td style="background-color: <%= colors[letter.to_sym] %>;"><%= letter %></td>
+                <td><%= @db.stats('characters_in_keys_' + type) %></td>
+                <td><%= sprintf '%.2f', @db.stats('characters_in_keys_' + type) * 100.0 / @db.stats('num_keys') %>%</td>
+                <td><%= t.reports.characters_in_keys.statistics.characters_in_keys[type] %></td>
             </tr>
+<% letter = letter.succ; end %>
             <tr>
                 <td style="border-top: 1px solid #000000;"></td>
                 <td style="border-top: 1px solid #000000;"><%= @db.stats('num_keys') %></td>
@@ -60,32 +32,23 @@ case latin letters (a-z) and the underscore (_) are used. Sometimes the colon
         </table>
     </div>
     <div id="whitespace">
-        <h2>Keys With Whitespace</h2>
-        <p>Keys that contain whitespace characters such as space, tab, new
-        line, carriage return, or whitespace characters from other
-        alphabets.<br/>
-        Whitespace in keys can be confusing, especially at the
-        beginning or end of the key, because they are invisible. Generally
-        the underscore (_) should be used instead.</p>
+        <h2><%= t.reports.characters_in_keys.whitespace.title %></h2>
+        <%= t.reports.characters_in_keys.whitespace.intro %>
         <table id="grid-whitespace">
         </table>
     </div>
     <div id="problematic">
-        <h2>Keys With Possibly Problematic Characters</h2>
-        <p>Keys that contain possibly problematic characters: <span
-        class="char">=+/&amp;&lt;&gt;;'"?%#@\,</span>. These characters
-        can be problematic, because they are used to quote strings in
-        different programming languages or have special meanings in XML, HTML,
-        URLs, and other places. The equal sign is used often as separator
-        between tag keys and values.<br/>
-        Keys that appear in this list are not necessarily wrong though. But
-        in many cases they are just results of some error.</p>
+        <h2><%= t.reports.characters_in_keys.problematic.title %></h2>
+        <%= t.reports.characters_in_keys.problematic.intro %>
         <table id="grid-problematic">
         </table>
     </div>
 </div>
 
-<script type="text/javascript">
+<% javascript do
+    JQuery.ready do
+        JS.raw(<<"JAVASCRIPT")
+
 var tabs = jQuery('#tabs').tabs({
     show: function(event, ui) { 
         window.location.hash = ui.tab.hash;
@@ -93,7 +56,7 @@ var tabs = jQuery('#tabs').tabs({
     }
 });
 
-var data = <%= i = '@'; %w(plain colon letters space problem rest).map{ |type| i=i.next; [ { :label => i, :value => @db.stats('characters_in_keys_' + type) } ] }.to_json() %>;
+var data = #{ i = '@'; %w(plain colon letters space problem rest).map{ |type| i=i.next; [ { :label => i, :value => @db.stats('characters_in_keys_' + type) } ] }.to_json() };
 
 var w=968, h=50;
 
@@ -102,9 +65,9 @@ var vis = new pv.Panel()
     .width(w + 20)
     .height(h);
 
-var colors = { A: '#2ca02c', B: '#98df8a', C: '#dbdb8d', D: '#d62728', E: '#ff9896', F: '#aec7e8' };
+var colors = #{ colors.to_json };
 
-var scale = pv.Scale.linear(0, <%= @db.stats('num_keys') %>).range(0, w);
+var scale = pv.Scale.linear(0, #{ @db.stats('num_keys') }).range(0, w);
 
 vis.add(pv.Layout.Stack)
     .orient('left-top')
@@ -121,5 +84,7 @@ vis.add(pv.Layout.Stack)
     .text(function(d) { return d.label; });
 
 vis.render();
-
-</script>
+JAVASCRIPT
+    end
+end
+%>
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 1f9b5c9..4a231a7 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
@@ -9,9 +9,9 @@
     end
     @languages_lookup = @languages.map{ |lang| "'#{lang}': #{lang_lookup[lang]}" }.join(', ')
 %>
-<h1><%= @title %></h1>
+<h1><%= t.reports.language_comparison_table_for_keys_in_the_wiki.name %></h1>
 
-<p>This table shows all tag keys for which there are wiki pages available and in what languages they are.</p>
+<%= t.reports.language_comparison_table_for_keys_in_the_wiki.intro %>
 
 <table id="grid-keys">
 </table>
@@ -19,10 +19,11 @@
 <p></p>
 
 <table>
-    <tr><td><img src="/img/sources/wiki/wiki-t.png" alt="[t]"/></td><td>Page in wiki available and contains standard template.</td></tr>
-    <tr><td><img src="/img/sources/wiki/wiki-e.png" alt="[e]"/></td><td>Page in wiki available and contains standard template, but couldn't be parsed.</td></tr>
-    <tr><td><img src="/img/sources/wiki/wiki-p.png" alt="[p]"/></td><td>Page in wiki available but doesn't contain standard template.</td></tr>
-    <tr><td><img src="/img/sources/wiki/wiki-r.png" alt="[r]"/></td><td>Page is a redirect.</td></tr>
+    
+    <tr><td><img src="/img/sources/wiki/wiki-t.png" alt="[t]"/></td><td><%= t.reports.language_comparison_table_for_keys_in_the_wiki.icons.template %></td></tr>
+    <tr><td><img src="/img/sources/wiki/wiki-e.png" alt="[e]"/></td><td><%= t.reports.language_comparison_table_for_keys_in_the_wiki.icons.error    %></td></tr>
+    <tr><td><img src="/img/sources/wiki/wiki-p.png" alt="[p]"/></td><td><%= t.reports.language_comparison_table_for_keys_in_the_wiki.icons.page     %></td></tr>
+    <tr><td><img src="/img/sources/wiki/wiki-r.png" alt="[r]"/></td><td><%= t.reports.language_comparison_table_for_keys_in_the_wiki.icons.redirect %></td></tr>
 </table>
 
 <script type="text/javascript">
diff --git a/web/views/reports/languages.erb b/web/views/reports/languages.erb
index 77855d6..9cf7047 100644
--- a/web/views/reports/languages.erb
+++ b/web/views/reports/languages.erb
@@ -1,9 +1,6 @@
-<h1><%= @title %></h1>
+<h1><%= t.reports.languages.name %></h1>
 
-<p>OpenStreetMap is an international project. Tags and their descriptions can
-be in any language. This table lists the languages Taginfo knows about and how
-many wiki pages there are in these languages documenting keys and tags,
-respectively.</p>
+<%= t.reports.languages.intro %>
 
 <table id="grid-langs">
 </table>
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 42c91d2..f030386 100644
--- a/web/views/reports/wiki_pages_about_non_existing_keys.erb
+++ b/web/views/reports/wiki_pages_about_non_existing_keys.erb
@@ -1,9 +1,6 @@
-<h1><%= @title %></h1>
+<h1><%= t.reports.wiki_pages_about_non_existing_keys.name %></h1>
 
-<p>This table shows keys for which a wiki page exists but there is not a single
-instance in the database. This is not necessarily an error (maybe somebody
-added the documentation in the wiki as preparation for using a key or the wiki
-page documents a now obsolete key), but it can also be a typo or other error.</p>
+<%= t.reports.wiki_pages_about_non_existing_keys.intro %>
 
 <table id="grid-keys">
 </table>