Mark some locale lookups as raw

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 97f57e41c56f6c15eba8cdab23c1961305103475..aff873e4528ac419e0dae4a768be770769baae8c 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -8,5 +8,5 @@
 <% end %>
 <%= render :partial => "changeset_details", :object => @changeset %>
 <hr />
-<%= t 'browse.changeset.download', :changeset_xml_link => link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read"), 
-                                   :osmchange_xml_link => link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
+<%= raw t 'browse.changeset.download', :changeset_xml_link => link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read"), 
+                                       :osmchange_xml_link => link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>

diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index e388d65aefc1531abac0e4cf5b9ef8e7574c232a..dfa5bc8069c9474a01d7d0cf9939f4eb782994f0 100644 (file)
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -6,7 +6,7 @@
       id_link = link_to(changeset.id,
                         {:controller => 'browse', :action => 'changeset', :id => changeset.id},
                         {:title => t('changeset.changeset.view_changeset_details')})
-      t'changeset.changeset.id', :id => id_link
+      raw t 'changeset.changeset.id', :id => id_link
     %>
   </td>
 

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 8c079d0f1374e8e140e02b22506623f943eb87b4..66392095b88682eb1fd0e96d07072f34bf5154cb 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -42,7 +42,7 @@
       <table>
         <tr id="login_openid_url">
           <td class="fieldName nowrap">
-            <%= t 'user.login.openid', :logo => openid_logo %>
+            <%= raw t 'user.login.openid', :logo => openid_logo %>
           </td>
           <td>
             <%= text_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %>

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 04c86b5a8ea89dba89a830d7504818ddb988b1df..a829773f05b2b8f76eee1c062e7611fff50bd708 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -59,7 +59,7 @@
     <tr>
       <td></td>
       <td>
-        <span id="openid_prompt" class="minorNote"><%= link_to_function(t('user.new.use openid', :logo => openid_logo), "enableOpenID()") %></span>
+        <span id="openid_prompt" class="minorNote"><%= link_to_function(raw(t('user.new.use openid', :logo => openid_logo)), "enableOpenID()") %></span>
         <span id="openid_note" class="minorNote"><%= t 'user.new.openid no password' %></span>
       </td>
     </tr>

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index eab21e455684e433afa60fd18d586575dfaa5330..24f0f5bb6ccbe4ea2ccdc1f3e4da881e0f6a81c7 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -52,5 +52,5 @@
     </div>
   </p>
   <br clear="all" />
-  <p id="contributorGuidance"><%= t 'user.terms.guidance', :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %></p>
+  <p id="contributorGuidance"><%= raw t 'user.terms.guidance', :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %></p>
 <% end %>