Avoid double-escaping display names when sent through the translation system

[rails.git] / app / views / browse / changeset.html.erb

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 81e930812c883310f7d8525d6dbdf83855743905..9ad35b2a7d5c71bba58a14854a49a01f56edf7c2 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,25 +1,25 @@
-<% set_title(t('.title', :id => @changeset.id)) %>
+<% set_title(t(".title", :id => @changeset.id)) %>

 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>

-  <%= t('.title', :id => @changeset.id) %>
+  <%= t(".title", :id => @changeset.id) %>

 </h2>
 
 <div class="browse-section">
 </h2>
 
 <div class="browse-section">

-  <h4><%= linkify(h(@changeset.tags['comment'].to_s.presence || t('browse.no_comment'))) %></h4>
+  <h4><%= linkify(h(@changeset.tags["comment"].to_s.presence || t("browse.no_comment"))) %></h4>

   <div class="details"><%= changeset_details(@changeset) %></div>
 
   <div class="details"><%= changeset_details(@changeset) %></div>
 

-  <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>
+  <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>

 
 

-  <h4 class="comments-header"><%= t('.discussion') %></h4>
+  <h4 class="comments-header"><%= t(".discussion") %></h4>

 
   <% if current_user %>
     <div class="buttons clearfix subscribe-buttons">
       <form action="#">
         <% if @changeset.subscribers.exists?(current_user.id) %>
 
   <% if current_user %>
     <div class="buttons clearfix subscribe-buttons">
       <form action="#">
         <% if @changeset.subscribers.exists?(current_user.id) %>

-          <input class="action-button" type="submit" name="unsubscribe" value="<%= t('javascripts.changesets.show.unsubscribe') %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
+          <input class="action-button" type="submit" name="unsubscribe" value="<%= t("javascripts.changesets.show.unsubscribe") %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />

         <% else %>
         <% else %>

-          <input class="action-button" type="submit" name="subscribe" value="<%= t('javascripts.changesets.show.subscribe') %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
+          <input class="action-button" type="submit" name="subscribe" value="<%= t("javascripts.changesets.show.subscribe") %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />

         <% end %>
       </form>
     </div>
         <% end %>
       </form>
     </div>


@@ -36,10 +36,11 @@
               <li id="c<%= comment.id %>">
                 <small class='deemphasize'>
                   <%= t(".commented_by",
               <li id="c<%= comment.id %>">
                 <small class='deemphasize'>
                   <%= t(".commented_by",

-                    :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),
-                    :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>
+                        :when => friendly_date_ago(comment.created_at),
+                        :exact_time => l(comment.created_at),
+                        :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>

                   <% if current_user and current_user.moderator? %>
                   <% if current_user and current_user.moderator? %>

-                    — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t('javascripts.changesets.show.hide_comment') %></span>
+                    — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t("javascripts.changesets.show.hide_comment") %></span>

                   <% end %>
                 </small>
                 <%= comment.body.to_html %>
                   <% end %>
                 </small>
                 <%= comment.body.to_html %>


@@ -48,9 +49,10 @@
               <li id="c<%= comment.id %>">
                 <small class='deemphasize'>
                   <%= t(".hidden_commented_by",
               <li id="c<%= comment.id %>">
                 <small class='deemphasize'>
                   <%= t(".hidden_commented_by",

-                    :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),
-                    :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>
-                  — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t('javascripts.changesets.show.unhide_comment') %></span>
+                        :when => friendly_date_ago(comment.created_at),
+                        :exact_time => l(comment.created_at),
+                        :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>
+                  — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></span>

                  </small>
                 <%= comment.body.to_html %>
               </li>
                  </small>
                 <%= comment.body.to_html %>
               </li>


@@ -63,7 +65,7 @@
 
   <% unless current_user %>
     <div class="notice">
 
   <% unless current_user %>
     <div class="notice">

-      <%= link_to(t(".join_discussion"), :controller => 'users', :action => 'login', :referer => request.fullpath) %>
+      <%= link_to(t(".join_discussion"), :controller => "users", :action => "login", :referer => request.fullpath) %>

     </div>
   <% end %>
 
     </div>
   <% end %>
 


@@ -72,48 +74,48 @@
       <form action="#">
         <textarea class="comment" name="text" cols="40" rows="5"></textarea>
         <div class="buttons clearfix">
       <form action="#">
         <textarea class="comment" name="text" cols="40" rows="5"></textarea>
         <div class="buttons clearfix">

-          <input type="submit" name="comment" value="<%= t('javascripts.changesets.show.comment') %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1"/>
+          <input type="submit" name="comment" value="<%= t("javascripts.changesets.show.comment") %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" />

         </div>
       </form>
     <% else %>
       <div class="notice">
         </div>
       </form>
     <% else %>
       <div class="notice">

-      <%= t('.still_open') %>
+      <%= t(".still_open") %>

       </div>
     <% end %>
   <% end %>
 
   <% unless @ways.empty? %>
     <h4>
       </div>
     <% end %>
   <% end %>
 
   <% unless @ways.empty? %>
     <h4>

-      <%= type_and_paginated_count('way', @way_pages) %>
-      <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
+      <%= type_and_paginated_count("way", @way_pages) %>
+      <%= render :partial => "paging_nav", :locals => { :pages => @way_pages, :page_param => "way_page" } %>

     </h4>
     <ul>
       <% @ways.each do |way| %>
     </h4>
     <ul>
       <% @ways.each do |way| %>

-        <li><%= link_to printable_name(way, true), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
+        <li><%= link_to printable_name(way, true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>

       <% end %>
     </ul>
   <% end %>
 
   <% unless @relations.empty? %>
     <h4>
       <% end %>
     </ul>
   <% end %>
 
   <% unless @relations.empty? %>
     <h4>

-      <%= type_and_paginated_count('relation', @relation_pages) %>
-      <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
+      <%= type_and_paginated_count("relation", @relation_pages) %>
+      <%= render :partial => "paging_nav", :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>

     </h4>
     <ul>
       <% @relations.each do |relation| %>
     </h4>
     <ul>
       <% @relations.each do |relation| %>

-        <li><%= link_to printable_name(relation, true), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
+        <li><%= link_to printable_name(relation, true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %></li>

       <% end %>
     </ul>
   <% end %>
 
   <% unless @nodes.empty? %>
     <h4>
       <% end %>
     </ul>
   <% end %>
 
   <% unless @nodes.empty? %>
     <h4>

-      <%= type_and_paginated_count('node', @node_pages) %>
-      <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
+      <%= type_and_paginated_count("node", @node_pages) %>
+      <%= render :partial => "paging_nav", :locals => { :pages => @node_pages, :page_param => "node_page" } %>

     </h4>
     <ul>
       <% @nodes.each do |node| %>
     </h4>
     <ul>
       <% @nodes.each do |node| %>

-        <li><%= link_to printable_name(node, true), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node), :rel => link_follow(node) %></li>
+        <li><%= link_to printable_name(node, true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class("node", node), :title => link_title(node), :rel => link_follow(node) } %></li>

       <% end %>
     </ul>
   <% end %>
       <% end %>
     </ul>
   <% end %>


@@ -125,10 +127,8 @@
       <%= link_to "<< #{@prev_by_user.id}", :id => @prev_by_user.id %>
       &middot;
     <% end %>
       <%= link_to "<< #{@prev_by_user.id}", :id => @prev_by_user.id %>
       &middot;
     <% end %>

-    <%=
-        user = (@prev_by_user || @next_by_user).user.display_name
-        link_to content_tag(:bdi, user), :controller => "changeset", :action => "index", :display_name => user
-    %>
+    <%= user = (@prev_by_user || @next_by_user).user.display_name
+        link_to content_tag(:bdi, user), :controller => "changesets", :action => "index", :display_name => user %>

     <% if @next_by_user %>
       &middot;
       <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %>
     <% if @next_by_user %>
       &middot;
       <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %>


@@ -137,7 +137,7 @@
 <% end %>
 
 <div class='secondary-actions'>
 <% end %>
 
 <div class='secondary-actions'>

-  <%= link_to(t('.changesetxml'), :controller => "changeset", :action => "read") %>
+  <%= link_to(t(".changesetxml"), :controller => "api/changesets", :action => "show") %>

   &middot;
   &middot;

-  <%= link_to(t('.osmchangexml'), :controller => "changeset", :action => "download") %>
+  <%= link_to(t(".osmchangexml"), :controller => "api/changesets", :action => "download") %>

 </div>
 </div>