erblint: fix remaining single quoted strings

diff --git a/.erb-lint.yml b/.erb-lint.yml
index f1da5efb3c5bb0ccbaf764ecb9b61c7f6483a38b..ac8dbb95d9235a9c7ba7a95146b082fe6067bef9 100644 (file)
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -25,25 +25,6 @@ linters:
         Enabled: false
       Rails/OutputSafety:
         Enabled: false
         Enabled: false
       Rails/OutputSafety:
         Enabled: false

-      Style/StringLiterals:
-        Exclude: # TODO
-          - app/views/browse/*
-          - app/views/changesets/*
-          - app/views/changeset_comments/*
-          - app/views/diary_entries/*
-          - app/views/geocoder/*
-          - app/views/issues/*
-          - app/views/layouts/*
-          - app/views/messages/*
-          - app/views/notes/*
-          - app/views/notifier/*
-          - app/views/oauth/*
-          - app/views/oauth_clients/*
-          - app/views/redactions/*
-          - app/views/reports/*
-          - app/views/traces/*
-          - app/views/user_blocks/*
-          - app/views/users/*

       Rails/DynamicFindBy:
         Enabled: false # TODO
       Style/AndOr:
       Rails/DynamicFindBy:
         Enabled: false # TODO
       Style/AndOr:

diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index e035076b6f0f51c37d6548c7eee7640c6ca48633..3f235959974cfec95fb86790657626318036459f 100644 (file)
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -1,8 +1,8 @@
 <h4>
   <% if common_details.changeset.tags['comment'].present? %>
 <h4>
   <% if common_details.changeset.tags['comment'].present? %>

-    <%= linkify(h(common_details.changeset.tags['comment'])) %>
+    <%= linkify(h(common_details.changeset.tags["comment"])) %>

   <% else %>
   <% else %>

-    <%= t 'browse.no_comment' %>
+    <%= t "browse.no_comment" %>

   <% end %>
 </h4>
 
   <% end %>
 </h4>
 


@@ -16,17 +16,17 @@
 </div>
 
 <div class="details">
 </div>
 
 <div class="details">

-  <%= t 'browse.version' %>
+  <%= t "browse.version" %>

   #<%= h(common_details.version) %>
   &middot;
   #<%= h(common_details.version) %>
   &middot;

-  <%= t 'browse.in_changeset' %>
+  <%= t "browse.in_changeset" %>

   #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
 </div>
 
 <% if @type == "node" and common_details.visible? %>
 <div class="details geo">
   #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
 </div>
 
 <% if @type == "node" and common_details.visible? %>
 <div class="details geo">

-  <%= t 'browse.location' %>
-  <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), :controller => 'site', :action => 'index', :anchor => "map=18/#{common_details.lat}/#{common_details.lon}") %>
+  <%= t "browse.location" %>
+  <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), :controller => "site", :action => "index", :anchor => "map=18/#{common_details.lat}/#{common_details.lon}") %>

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

diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb
index 391462d925f1611fd2ba7e32cf79c5ee6ba3c061..1dca0c26ee3de7ef23efff21238339a60da90a2e 100644 (file)
--- a/app/views/browse/_containing_relation.html.erb
+++ b/app/views/browse/_containing_relation.html.erb
@@ -1,9 +1,9 @@
 <li><%=
   linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s
   if containing_relation.member_role.blank?
 <li><%=
   linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s
   if containing_relation.member_role.blank?

-    raw t '.entry', :relation_name => linked_name
+    raw t ".entry", :relation_name => linked_name

   else
   else

-    raw t '.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role)
+    raw t ".entry_role", :relation_name => linked_name, :relation_role => h(containing_relation.member_role)

   end
     %>
 </li>
   end
     %>
 </li>

diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb
index e0eb55c1b4f941cd74f7431a9d62e0ceb1f47897..52502ad4b42c2e82deeb1470e3522cf9db37d0bc 100644 (file)
--- a/app/views/browse/_node.html.erb
+++ b/app/views/browse/_node.html.erb
@@ -1,9 +1,9 @@
 <% if node.redacted? %>
   <div class='browse-section browse-redacted'>
 <% if node.redacted? %>
   <div class='browse-section browse-redacted'>

-    <%= t 'browse.redacted.message_html',
-          :type => t('browse.redacted.type.node'),
+    <%= t "browse.redacted.message_html",
+          :type => t("browse.redacted.type.node"),

           :version => node.version,
           :version => node.version,

-          :redaction_link => link_to(t('browse.redacted.redaction',
+          :redaction_link => link_to(t("browse.redacted.redaction",

                                        :id => node.redaction.id), node.redaction) %>
   </div>
 <% else %>
                                        :id => node.redaction.id), node.redaction) %>
   </div>
 <% else %>


@@ -11,10 +11,10 @@
     <%= render :partial => "common_details", :object => node %>
 
     <% unless node.ways.empty? and node.containing_relation_members.empty? %>
     <%= render :partial => "common_details", :object => node %>
 
     <% unless node.ways.empty? and node.containing_relation_members.empty? %>

-      <h4><%= t 'browse.part_of' %></h4>
+      <h4><%= t "browse.part_of" %></h4>

       <ul>
         <% node.ways.uniq.each do |way| %>
       <ul>
         <% node.ways.uniq.each do |way| %>

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

         <% end %>
         <%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %>
       </ul>
         <% end %>
         <%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %>
       </ul>

diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb
index e7c4817b06f35fd02d314e12eb54aa7a9cbe1198..452556364530c1c16ca77a578f665e81ad61b002 100644 (file)
--- a/app/views/browse/_relation.html.erb
+++ b/app/views/browse/_relation.html.erb
@@ -1,9 +1,9 @@
 <% if relation.redacted? %>
   <div class='browse-section browse-redacted'>
 <% if relation.redacted? %>
   <div class='browse-section browse-redacted'>

-    <%= t 'browse.redacted.message_html',
-          :type => t('browse.redacted.type.relation'),
+    <%= t "browse.redacted.message_html",
+          :type => t("browse.redacted.type.relation"),

           :version => relation.version,
           :version => relation.version,

-          :redaction_link => link_to(t('browse.redacted.redaction',
+          :redaction_link => link_to(t("browse.redacted.redaction",

                                        :id => relation.redaction.id), relation.redaction) %>
   </div>
 <% else %>
                                        :id => relation.redaction.id), relation.redaction) %>
   </div>
 <% else %>


@@ -11,12 +11,12 @@
     <%= render :partial => "common_details", :object => relation %>
 
     <% unless relation.containing_relation_members.empty? %>
     <%= render :partial => "common_details", :object => relation %>
 
     <% unless relation.containing_relation_members.empty? %>

-      <h4><%= t 'browse.part_of' %></h4>
+      <h4><%= t "browse.part_of" %></h4>

       <ul><%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %></ul>
     <% end %>
 
     <% unless relation.relation_members.empty? %>
       <ul><%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %></ul>
     <% end %>
 
     <% unless relation.relation_members.empty? %>

-      <h4><%= t '.members' %></h4>
+      <h4><%= t ".members" %></h4>

       <ul><%= render :partial => "relation_member", :collection => relation.relation_members %></ul>
     <% end %>
   </div>
       <ul><%= render :partial => "relation_member", :collection => relation.relation_members %></ul>
     <% end %>
   </div>

diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index ef8c67e59c0ca00c3f33520f7f740e6eecab547d..a707c3ba13b86950924358e3a814c05ced1bf8a2 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,14 +1,14 @@
 <%
   member_class = link_class(relation_member.member_type.downcase, relation_member.member)
   linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) }
 <%
   member_class = link_class(relation_member.member_type.downcase, relation_member.member)
   linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) }

-  type_str = t '.type.' + relation_member.member_type.downcase
+  type_str = t ".type." + relation_member.member_type.downcase

 %>
 <li class="<%= member_class %>">
   <%=
     if relation_member.member_role.blank?
 %>
 <li class="<%= member_class %>">
   <%=
     if relation_member.member_role.blank?

-      raw t '.entry', :type => type_str, :name => linked_name
+      raw t ".entry", :type => type_str, :name => linked_name

     else
     else

-      raw t '.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
+      raw t ".entry_role", :type => type_str, :name => linked_name, :role => h(relation_member.member_role)

     end
   %>
 </li>
     end
   %>
 </li>

diff --git a/app/views/browse/_tag_details.html.erb b/app/views/browse/_tag_details.html.erb
index 9c3fbbfc206961291a77d8bdb37f0dc75fdffc18..0e1a3fbef17934319b3a2cecac941f648431d2c1 100644 (file)
--- a/app/views/browse/_tag_details.html.erb
+++ b/app/views/browse/_tag_details.html.erb
@@ -1,5 +1,5 @@
 <% unless tag_details.empty? %>
 <% unless tag_details.empty? %>

-  <h4><%= t '.tags' %></h4>
+  <h4><%= t ".tags" %></h4>

   <table class='browse-tag-list'>
     <%= render :partial => "tag", :collection => tag_details.sort %>
   </table>
   <table class='browse-tag-list'>
     <%= render :partial => "tag", :collection => tag_details.sort %>
   </table>

diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb
index 49a1bced10e22a3172e335acb1b8b28d71c505b8..ed206c59bcc7399f803a2bca50e1882ccff569c1 100644 (file)
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -1,9 +1,9 @@
 <% if way.redacted? %>
   <div class='browse-section browse-redacted'>
 <% if way.redacted? %>
   <div class='browse-section browse-redacted'>

-    <%= t 'browse.redacted.message_html',
-          :type => t('browse.redacted.type.way'),
+    <%= t "browse.redacted.message_html",
+          :type => t("browse.redacted.type.way"),

           :version => way.version,
           :version => way.version,

-          :redaction_link => link_to(t('browse.redacted.redaction',
+          :redaction_link => link_to(t("browse.redacted.redaction",

                                        :id => way.redaction.id), way.redaction) %>
   </div>
 <% else %>
                                        :id => way.redaction.id), way.redaction) %>
   </div>
 <% else %>


@@ -11,21 +11,21 @@
     <%= render :partial => "common_details", :object => way %>
 
     <% unless way.containing_relation_members.empty? %>
     <%= render :partial => "common_details", :object => way %>
 
     <% unless way.containing_relation_members.empty? %>

-      <h4><%= t 'browse.part_of' %></h4>
+      <h4><%= t "browse.part_of" %></h4>

       <ul>
         <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
       </ul>
     <% end %>
 
     <% unless way.way_nodes.empty? %>
       <ul>
         <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
       </ul>
     <% end %>
 
     <% unless way.way_nodes.empty? %>

-      <h4><%= t '.nodes' %></h4>
+      <h4><%= t ".nodes" %></h4>

       <ul>
         <% way.way_nodes.each do |wn| %>
           <li>
       <ul>
         <% way.way_nodes.each do |wn| %>
           <li>

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

             <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>
             <% if related_ways.size > 0 then %>
             <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>
             <% if related_ways.size > 0 then %>

-              (<%= raw t '.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(printable_name(w), { :action => "way", :id => w.id.to_s }, { :class => link_class('way', w), :title => link_title(w) }) }.to_sentence %>)
+              (<%= raw t ".also_part_of", :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(printable_name(w), { :action => "way", :id => w.id.to_s }, { :class => link_class("way", w), :title => link_title(w) }) }.to_sentence %>)

             <% end %>
           </li>
         <% end %>
             <% end %>
           </li>
         <% end %>

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 4cb15306fab26768d77e0a760ad4f223862433fa..f39d8263ff9cc8a45a0be04db4c4465382fac199 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>


@@ -40,7 +40,7 @@
                         :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? %>
                         :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? %>

-                    — <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 %>


@@ -52,7 +52,7 @@
                         :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(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>
+                  — <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>


@@ -65,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 %>
 


@@ -74,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 %>


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

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

   &middot;
   &middot;

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

 </div>
 </div>

diff --git a/app/views/browse/feature.html.erb b/app/views/browse/feature.html.erb
index d21d8d0c2b3d513d0b13af3d792fb87e62cef75a..6c94b0a9dfd50aa8dab39c5ec33611c29c4abd2e 100644 (file)
--- a/app/views/browse/feature.html.erb
+++ b/app/views/browse/feature.html.erb
@@ -8,7 +8,7 @@
 <%= render :partial => @type, :object => @feature %>
 
 <div class='secondary-actions'>
 <%= render :partial => @type, :object => @feature %>
 
 <div class='secondary-actions'>

-  <%= link_to(t('browse.download_xml'), :controller => "api/#{@type.pluralize}", :action => :show) %>
+  <%= link_to(t("browse.download_xml"), :controller => "api/#{@type.pluralize}", :action => :show) %>

   &middot;
   &middot;

-  <%= link_to(t('browse.view_history'), :action => "#{@type}_history") %>
+  <%= link_to(t("browse.view_history"), :action => "#{@type}_history") %>

 </div>
 </div>

diff --git a/app/views/browse/history.html.erb b/app/views/browse/history.html.erb
index b7de0093a2a2565503b05f388a22893155a479f8..0a2c1811c0d72c64465a163f2570c43ac17c9388 100644 (file)
--- a/app/views/browse/history.html.erb
+++ b/app/views/browse/history.html.erb
@@ -8,7 +8,7 @@
 <%= render :partial => @type, :collection => @feature.send("old_#{@type}s").reverse %>
 
 <div class='secondary-actions'>
 <%= render :partial => @type, :collection => @feature.send("old_#{@type}s").reverse %>
 
 <div class='secondary-actions'>

-  <%= link_to(t('browse.download_xml'), :controller => "api/old_#{@type.pluralize}", :action => "history") %>
+  <%= link_to(t("browse.download_xml"), :controller => "api/old_#{@type.pluralize}", :action => "history") %>

   &middot;
   &middot;

-  <%= link_to(t('browse.view_details'), :action => @type) %>
+  <%= link_to(t("browse.view_details"), :action => @type) %>

 </div>
 </div>

diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb
index e8b64b705777a75c77c3fc5cbac914c3d4081c02..53279d24eea524f559e1a646dce174c54d07a8d0 100644 (file)
--- a/app/views/browse/new_note.html.erb
+++ b/app/views/browse/new_note.html.erb
@@ -6,13 +6,13 @@
 </h2>
 
 <div class="note browse-section">
 </h2>
 
 <div class="note browse-section">

-  <p class="warning"><%= t('javascripts.notes.new.intro') %></p>
+  <p class="warning"><%= t("javascripts.notes.new.intro") %></p>

   <form action="#">
     <input type="hidden" name="lon">
     <input type="hidden" name="lat">
   <form action="#">
     <input type="hidden" name="lon">
     <input type="hidden" name="lat">

-    <textarea class="comment" name="text" cols="40" rows="10" maxlength="2000" placeholder="<%= t('javascripts.notes.new.advice') %>"></textarea>
+    <textarea class="comment" name="text" cols="40" rows="10" maxlength="2000" placeholder="<%= t("javascripts.notes.new.advice") %>"></textarea>

     <div class="buttons clearfix">
     <div class="buttons clearfix">

-      <input type="submit" name="add" value="<%= t('javascripts.notes.new.add') %>" disabled="1">
+      <input type="submit" name="add" value="<%= t("javascripts.notes.new.add") %>" disabled="1">

     </div>
   </form>
 </div>
     </div>
   </form>
 </div>

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index a677a7c14e72684bbb6c776961bd6236d57900f0..75d85ae0488b5f11c497a162cb1fd6c7c9456ec6 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,4 +1,4 @@
-<% set_title(t('.title', :id => @note.id)) %>
+<% set_title(t(".title", :id => @note.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>


@@ -6,13 +6,13 @@
 </h2>
 
 <div class="browse-section">
 </h2>
 
 <div class="browse-section">

-  <h4><%= t('.description') %></h4>
+  <h4><%= t(".description") %></h4>

   <div class="note-description">
     <%= h(@note_comments.first.body.to_html) %>
   </div>
 
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
   <div class="note-description">
     <%= h(@note_comments.first.body.to_html) %>
   </div>
 
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">

-    <%= note_event('open', @note.created_at, @note.author) %>
+    <%= note_event("open", @note.created_at, @note.author) %>

     <% if @note.status == "closed" %>
       <br/>
       <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>
     <% if @note.status == "closed" %>
       <br/>
       <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>


@@ -45,12 +45,12 @@
       <textarea class="comment" name="text" cols="40" rows="5" maxlength="2000"></textarea>
       <div class="buttons clearfix">
         <% if current_user and current_user.moderator? -%>
       <textarea class="comment" name="text" cols="40" rows="5" maxlength="2000"></textarea>
       <div class="buttons clearfix">
         <% if current_user and current_user.moderator? -%>

-          <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
+          <input type="submit" name="hide" value="<%= t("javascripts.notes.show.hide") %>" class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>">

         <% end -%>
         <% if current_user -%>
         <% end -%>
         <% if current_user -%>

-          <input type="submit" name="close" value="<%= t('javascripts.notes.show.resolve') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, 'json') %>">
+          <input type="submit" name="close" value="<%= t("javascripts.notes.show.resolve") %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, "json") %>">

         <% end -%>
         <% end -%>

-        <input type="submit" name="comment" value="<%= t('javascripts.notes.show.comment') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, 'json') %>" disabled="1">
+        <input type="submit" name="comment" value="<%= t("javascripts.notes.show.comment") %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, "json") %>" disabled="1">

       </div>
     </form>
   <% else %>
       </div>
     </form>
   <% else %>


@@ -58,10 +58,10 @@
       <input type="hidden" name="text" value="">
       <div class="buttons clearfix">
         <% if current_user and current_user.moderator? -%>
       <input type="hidden" name="text" value="">
       <div class="buttons clearfix">
         <% if current_user and current_user.moderator? -%>

-          <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>">
+          <input type="submit" name="hide" value="<%= t("javascripts.notes.show.hide") %>" class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>">

         <% end -%>
         <% if current_user -%>
         <% end -%>
         <% if current_user -%>

-          <input type="submit" name="reopen" value="<%= t('javascripts.notes.show.reactivate') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, 'json') %>">
+          <input type="submit" name="reopen" value="<%= t("javascripts.notes.show.reactivate") %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, "json") %>">

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

diff --git a/app/views/browse/timeout.html.erb b/app/views/browse/timeout.html.erb
index e6dd7b68d5d20ede57ae500b2692e44ca3ffabdd..a9f53db15bd782a04447cb364eaa4bd7a5d5da35 100644 (file)
--- a/app/views/browse/timeout.html.erb
+++ b/app/views/browse/timeout.html.erb
@@ -1,4 +1,4 @@
 <div class="browse-section">
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
 <div class="browse-section">
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>

-  <%= t '.sorry', :type => t(".type.#{@type}"), :id => params[:id] %>
+  <%= t ".sorry", :type => t(".type.#{@type}"), :id => params[:id] %>

 </div>
 </div>

diff --git a/app/views/changeset_comments/timeout.html.erb b/app/views/changeset_comments/timeout.html.erb
index 84432bc8d77acdf3da49e10a09fde9096b8938b0..641b1dfb837535eae0f978ad5bcd85763d0b906d 100644 (file)
--- a/app/views/changeset_comments/timeout.html.erb
+++ b/app/views/changeset_comments/timeout.html.erb
@@ -1 +1 @@
-<p><%= t '.sorry' %></p>
+<p><%= t ".sorry" %></p>

diff --git a/app/views/changesets/_changeset.html.erb b/app/views/changesets/_changeset.html.erb
index 1bd916bbcb866242feea3e5146f54ec980201ec9..e4d229f9a74c9963de3f671e225903edbbaebf9a 100644 (file)
--- a/app/views/changesets/_changeset.html.erb
+++ b/app/views/changesets/_changeset.html.erb
@@ -15,7 +15,7 @@
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data } do %>
   <h4>
     <a class="changeset_id" href="<%= changeset_path(changeset) %>">
 <%= content_tag "li", :id => "changeset_#{changeset.id}", :data => { :changeset => changeset_data } do %>
   <h4>
     <a class="changeset_id" href="<%= changeset_path(changeset) %>">

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

     </a>
   </h4>
   <div class="comments comments-<%= changeset.comments.length %>">
     </a>
   </h4>
   <div class="comments comments-<%= changeset.comments.length %>">

diff --git a/app/views/changesets/history.html.erb b/app/views/changesets/history.html.erb
index 1117f01b3b46229282c09d4545d6ad70896d0355..f27aacb8cd96a8a31b651afba07eaad4b06718db 100644 (file)
--- a/app/views/changesets/history.html.erb
+++ b/app/views/changesets/history.html.erb
@@ -7,7 +7,7 @@
 <%
    set_title(changeset_index_title(params, current_user))
    if params[:display_name]
 <%
    set_title(changeset_index_title(params, current_user))
    if params[:display_name]

-     @heading = t('changesets.index.title_user', :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe
+     @heading = t("changesets.index.title_user", :user => link_to(params[:display_name], user_path(:display_name => params[:display_name]))).html_safe

    else
      @heading = @title
    end
    else
      @heading = @title
    end

diff --git a/app/views/changesets/index.html.erb b/app/views/changesets/index.html.erb
index cedd3e83aa4d4e75f1f32641e730122b0e6b2aad..1ce98301a3145bedd94c3b5ed0f1efaa1567d2f6 100644 (file)
--- a/app/views/changesets/index.html.erb
+++ b/app/views/changesets/index.html.erb
@@ -1,17 +1,17 @@
 <% if @edits.present? %>
   <ol class="changesets">
 <% if @edits.present? %>
   <ol class="changesets">

-    <%= render :partial => 'changeset', :collection => @edits %>
+    <%= render :partial => "changeset", :collection => @edits %>

   </ol>
 <% if @edits.size == 20 -%>
   <div class="changeset_more">
   </ol>
 <% if @edits.size == 20 -%>
   <div class="changeset_more">

-    <%= link_to t('.load_more'), url_for(@params.merge(:max_id => @edits.last.id - 1)), :class => "button load_more" %>
+    <%= link_to t(".load_more"), url_for(@params.merge(:max_id => @edits.last.id - 1)), :class => "button load_more" %>

     <div class="loader"><%= image_tag "searching.gif" %></div>
   </div>
 <% end -%>
 <% elsif params[:bbox] %>
     <div class="loader"><%= image_tag "searching.gif" %></div>
   </div>
 <% end -%>
 <% elsif params[:bbox] %>

-  <div class="inner22"><%= t(params[:max_id] ? '.no_more_area' : '.empty_area') %></div>
+  <div class="inner22"><%= t(params[:max_id] ? ".no_more_area" : ".empty_area") %></div>

 <% elsif params[:display_name] %>
 <% elsif params[:display_name] %>

-  <div class="inner22"><%= t(params[:max_id] ? '.no_more_user' : '.empty_user') %></div>
+  <div class="inner22"><%= t(params[:max_id] ? ".no_more_user" : ".empty_user") %></div>

 <% else %>
 <% else %>

-  <div class="inner22"><%= t(params[:max_id] ? '.no_more' : '.empty') %></div>
+  <div class="inner22"><%= t(params[:max_id] ? ".no_more" : ".empty") %></div>

 <% end %>
 <% end %>

diff --git a/app/views/changesets/timeout.html.erb b/app/views/changesets/timeout.html.erb
index 84432bc8d77acdf3da49e10a09fde9096b8938b0..641b1dfb837535eae0f978ad5bcd85763d0b906d 100644 (file)
--- a/app/views/changesets/timeout.html.erb
+++ b/app/views/changesets/timeout.html.erb
@@ -1 +1 @@
-<p><%= t '.sorry' %></p>
+<p><%= t ".sorry" %></p>

diff --git a/app/views/diary_entries/_diary_comment.html.erb b/app/views/diary_entries/_diary_comment.html.erb
index 2bc892a86beafdabccd4af248da83e18409183c4..9ee67534304e2c709582f28c40fc0b1ee5d17f1b 100644 (file)
--- a/app/views/diary_entries/_diary_comment.html.erb
+++ b/app/views/diary_entries/_diary_comment.html.erb
@@ -1,6 +1,6 @@
 <div class="clearfix diary-comment">
   <%= user_thumbnail diary_comment.user %>
 <div class="clearfix diary-comment">
   <%= user_thumbnail diary_comment.user %>

-  <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= raw(t('.comment_from', :link_user => (link_to h(diary_comment.user.display_name), user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}"))) %>
+  <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= raw(t(".comment_from", :link_user => (link_to h(diary_comment.user.display_name), user_path(diary_comment.user)), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}"))) %>

     <% if current_user and diary_comment.user.id != current_user.id %>
       | <%= report_link(t(".report"), diary_comment) %>
     <% end %>
     <% if current_user and diary_comment.user.id != current_user.id %>
       | <%= report_link(t(".report"), diary_comment) %>
     <% end %>


@@ -9,7 +9,7 @@
   <div class="richtext"><%= diary_comment.body.to_html %></div>
   <% if current_user && current_user.administrator? %>
     <span>
   <div class="richtext"><%= diary_comment.body.to_html %></div>
   <% if current_user && current_user.administrator? %>
     <span>

-      <%= link_to t('.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t('.confirm') } %>
+      <%= link_to t(".hide_link"), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data => { :confirm => t(".confirm") } %>

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

diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb
index e41eeae662dc5d5167e6149b3d5bbc19e49f3ffc..6f0626cc23667c7a7dde9c96b678bc19f426493f 100644 (file)
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -7,7 +7,7 @@
     <h2><%= link_to h(diary_entry.title), diary_entry_path(diary_entry.user, diary_entry) %></h2>
 
     <small class='deemphasize'>
     <h2><%= link_to h(diary_entry.title), diary_entry_path(diary_entry.user, diary_entry) %></h2>
 
     <small class='deemphasize'>

-      <%= raw(t '.posted_by', :link_user => (link_to h(diary_entry.user.display_name), user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entries', :action => 'index', :display_name => nil, :language => diary_entry.language_code)) %>
+      <%= raw(t ".posted_by", :link_user => (link_to h(diary_entry.user.display_name), user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code)) %>

     </small>
 
   </div>
     </small>
 
   </div>


@@ -22,13 +22,13 @@
 
   <ul class='secondary-actions clearfix'>
     <% if params[:action] == 'index' %>
 
   <ul class='secondary-actions clearfix'>
     <% if params[:action] == 'index' %>

-      <li><%= link_to t('.comment_link'), diary_entry_path(diary_entry.user, diary_entry, :anchor => 'newcomment') %></li>
-      <li><%= link_to t('.reply_link'), new_message_path(diary_entry.user, :message => { :title => "Re: #{diary_entry.title}" }) %></li>
-      <li><%= link_to t('.comment_count', :count => diary_entry.visible_comments.count), diary_entry_path(diary_entry.user, diary_entry, :anchor => 'comments') %></li>
+      <li><%= link_to t(".comment_link"), diary_entry_path(diary_entry.user, diary_entry, :anchor => "newcomment") %></li>
+      <li><%= link_to t(".reply_link"), new_message_path(diary_entry.user, :message => { :title => "Re: #{diary_entry.title}" }) %></li>
+      <li><%= link_to t(".comment_count", :count => diary_entry.visible_comments.count), diary_entry_path(diary_entry.user, diary_entry, :anchor => "comments") %></li>

     <% end %>
 
     <% if current_user && current_user == diary_entry.user %>
     <% end %>
 
     <% if current_user && current_user == diary_entry.user %>

-      <li><%= link_to t('.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></li>
+      <li><%= link_to t(".edit_link"), :action => "edit", :display_name => diary_entry.user.display_name, :id => diary_entry.id %></li>

     <% end %>
 
     <% if current_user and diary_entry.user != current_user %>
     <% end %>
 
     <% if current_user and diary_entry.user != current_user %>


@@ -39,7 +39,7 @@
 
     <% if current_user && current_user.administrator? %>
       <li>
 
     <% if current_user && current_user.administrator? %>
       <li>

-        <%= link_to t('.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('.confirm') } %>
+        <%= link_to t(".hide_link"), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t(".confirm") } %>

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

diff --git a/app/views/diary_entries/_location.html.erb b/app/views/diary_entries/_location.html.erb
index 6828cd4dc282b536567731a55ede2bcaa4d5e12a..e85be917a27bb2541d03c54f167ee7440616323e 100644 (file)
--- a/app/views/diary_entries/_location.html.erb
+++ b/app/views/diary_entries/_location.html.erb
@@ -1,6 +1,6 @@
-<%= t '.location' %>
+<%= t ".location" %>

 
 

-<a href="<%= url_for :controller => 'site', :action => 'index', :anchor => "map=14/#{location.latitude}/#{location.longitude}" %>">
+<a href="<%= url_for :controller => "site", :action => "index", :anchor => "map=14/#{location.latitude}/#{location.longitude}" %>">

 <abbr class="geo" title="<%= number_with_precision(location.latitude, :precision => 4) %>; <%= number_with_precision(location.longitude, :precision => 4) %>">
 <%= describe_location location.latitude, location.longitude, 14, location.language_code %>
 </abbr>
 <abbr class="geo" title="<%= number_with_precision(location.latitude, :precision => 4) %>; <%= number_with_precision(location.longitude, :precision => 4) %>">
 <%= describe_location location.latitude, location.longitude, 14, location.language_code %>
 </abbr>

diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb
index 63df5f9c6026852712856a9d1b2eb6330e765e46..4c4fd01e9f0efa03003b877932e9e1fd9e78e3d0 100644 (file)
--- a/app/views/diary_entries/comments.html.erb
+++ b/app/views/diary_entries/comments.html.erb
@@ -1,24 +1,24 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t('.has_commented_on', :display_name => @user.display_name) %></h1>
+  <h1><%= t(".has_commented_on", :display_name => @user.display_name) %></h1>

 <% end %>
 
 <table class="messages" width="100%">
   <tr>
 <% end %>
 
 <table class="messages" width="100%">
   <tr>

-    <th width="25%"><%= t '.post' %></th>
-    <th width="25%"><%= t '.when' %></th>
-    <th width="50%"><%= t '.comment' %></th>
+    <th width="25%"><%= t ".post" %></th>
+    <th width="25%"><%= t ".when" %></th>
+    <th width="50%"><%= t ".comment" %></th>

   </tr>
   <% @comments.each do |comment| -%>
   </tr>
   <% @comments.each do |comment| -%>

-  <% cl = cycle('table0', 'table1') %>
+  <% cl = cycle("table0", "table1") %>

   <tr class="<%= cl %>">
     <td width="25%"><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %></td>
   <tr class="<%= cl %>">
     <td width="25%"><%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %></td>

-    <td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= t '.ago', :ago => time_ago_in_words(comment.created_at) %></span></td>
+    <td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= t ".ago", :ago => time_ago_in_words(comment.created_at) %></span></td>

     <td width="50%" class="richtext"><%= comment.body.to_html %></td>
   </tr>
   <% end -%>
 </table>
 
 <div class='secondary-actions clearfix'>
     <td width="50%" class="richtext"><%= comment.body.to_html %></td>
   </tr>
   <% end -%>
 </table>
 
 <div class='secondary-actions clearfix'>

-  <span><%= link_to t('.older_comments'), :page => @comment_pages.current.next if @comment_pages.current.next %>
-  <%= link_to t('.newer_comments'), :page => @comment_pages.current.previous if @comment_pages.current.previous %></span>
+  <span><%= link_to t(".older_comments"), :page => @comment_pages.current.next if @comment_pages.current.next %>
+  <%= link_to t(".newer_comments"), :page => @comment_pages.current.previous if @comment_pages.current.previous %></span>

 </div>
 </div>

diff --git a/app/views/diary_entries/edit.html.erb b/app/views/diary_entries/edit.html.erb
index 881a6ac84935ccd8ef0d5e71e09965f242a340e5..62aed884c08296ee8aa61cc20135f493655ab2d8 100644 (file)
--- a/app/views/diary_entries/edit.html.erb
+++ b/app/views/diary_entries/edit.html.erb
@@ -6,46 +6,46 @@
   <h1><%= @title %></h1>
 <% end %>
 
   <h1><%= @title %></h1>
 <% end %>
 

-<%= error_messages_for 'diary_entry' %>
+<%= error_messages_for "diary_entry" %>

 
 <%= form_for :diary_entry do |f| %>
   <div class="diary_entry standard-form">
     <fieldset>
       <div class='form-row'>
 
 <%= form_for :diary_entry do |f| %>
   <div class="diary_entry standard-form">
     <fieldset>
       <div class='form-row'>

-        <label class="standard-label"><%= t '.subject' -%></label>
+        <label class="standard-label"><%= t ".subject" -%></label>

         <%= f.text_field :title, :class => "richtext_title" %>
       </div>
       <div class='form-row'>
         <%= f.text_field :title, :class => "richtext_title" %>
       </div>
       <div class='form-row'>

-        <label class="standard-label"><%= t '.body' -%></label>
+        <label class="standard-label"><%= t ".body" -%></label>

         <%= richtext_area :diary_entry, :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %>
       </div>
       <div class='form-row'>
         <%= richtext_area :diary_entry, :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %>
       </div>
       <div class='form-row'>

-        <label class="standard-label"><%= t '.language' -%></label>
+        <label class="standard-label"><%= t ".language" -%></label>

         <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
     </div>
     </fieldset>
     <fieldset class='location'>
         <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
     </div>
     </fieldset>
     <fieldset class='location'>

-      <label class="standard-label"><%= t '.location' -%></label>
+      <label class="standard-label"><%= t ".location" -%></label>

       <%= content_tag "div", "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
       <div class='form-row clearfix'>
         <div class='form-column'>
       <%= content_tag "div", "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
       <div class='form-row clearfix'>
         <div class='form-column'>

-          <label class="secondary standard-label"><%= t '.latitude' -%></label>
+          <label class="secondary standard-label"><%= t ".latitude" -%></label>

           <%= f.text_field :latitude, :size => 20, :id => "latitude" %>
         </div>
         <div class='form-column'>
           <%= f.text_field :latitude, :size => 20, :id => "latitude" %>
         </div>
         <div class='form-column'>

-          <label class="secondary standard-label"><%= t '.longitude' -%></label>
+          <label class="secondary standard-label"><%= t ".longitude" -%></label>

           <%= f.text_field :longitude, :size => 20, :id => "longitude" %>
         </div>
         <div class='form-column'>
           <%= f.text_field :longitude, :size => 20, :id => "longitude" %>
         </div>
         <div class='form-column'>

-          <a href="#" id="usemap"><%= t '.use_map_link' -%></a>
+          <a href="#" id="usemap"><%= t ".use_map_link" -%></a>

         </div>
       </div>
     </fieldset>
 
     <% if action_name == 'new' %>
         </div>
       </div>
     </fieldset>
 
     <% if action_name == 'new' %>

-      <%= submit_tag t('diary_entries.new.publish_button') %>
+      <%= submit_tag t("diary_entries.new.publish_button") %>

     <% else %>
     <% else %>

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

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

diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index 59fa96a834d36662777fba9af512e0260b722a17..ba42ae23c2f997afc8386a75cf891b42711e8642 100644 (file)
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -7,19 +7,19 @@
 
     <ul class='secondary-actions clearfix'>
       <% unless params[:friends] or params[:nearby] -%>
 
     <ul class='secondary-actions clearfix'>
       <% unless params[:friends] or params[:nearby] -%>

-        <li><%= rss_link_to :action => 'rss', :language => params[:language] %></li>
+        <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>

       <% end -%>
 
       <% if @user %>
         <% if @user == current_user %>
           <div>
       <% end -%>
 
       <% if @user %>
         <% if @user == current_user %>
           <div>

-            <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t('.new'), diary_new_path, :title => t('.new_title') %></li>
+            <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t(".new"), diary_new_path, :title => t(".new_title") %></li>

           </div>
         <% end %>
       <% else %>
         <% if current_user %>
           <div>
           </div>
         <% end %>
       <% else %>
         <% if current_user %>
           <div>

-            <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t('.new'), diary_new_path, :title => t('.new_title') %></li>
+            <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t(".new"), diary_new_path, :title => t(".new_title") %></li>

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


@@ -28,35 +28,35 @@
 <% end %>
 
 <% if @entries.empty? %>
 <% end %>
 
 <% if @entries.empty? %>

-  <h4><%= t '.no_entries' %></h4>
+  <h4><%= t ".no_entries" %></h4>

 <% else %>
 <% else %>

-  <h4><%= t '.recent_entries' %></h4>
+  <h4><%= t ".recent_entries" %></h4>

 
   <% if @user %>
 
   <% if @user %>

-    <%= render :partial => 'diary_entry', :collection => @entries %>
+    <%= render :partial => "diary_entry", :collection => @entries %>

   <% else %>
   <% else %>

-    <%= render :partial => 'diary_index_entry', :collection => @entries %>
+    <%= render :partial => "diary_index_entry", :collection => @entries %>

   <% end %>
 
   <div class="pagination">
     <% if @entries.size < @page_size -%>
   <% end %>
 
   <div class="pagination">
     <% if @entries.size < @page_size -%>

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

     <% else -%>
     <% else -%>

-      <%= link_to t('.older_entries'), @params.merge(:page => @page + 1) %>
+      <%= link_to t(".older_entries"), @params.merge(:page => @page + 1) %>

     <% end -%>
 
     |
 
     <% if @page > 1 -%>
     <% end -%>
 
     |
 
     <% if @page > 1 -%>

-      <%= link_to t('.newer_entries'), @params.merge(:page => @page - 1) %>
+      <%= link_to t(".newer_entries"), @params.merge(:page => @page - 1) %>

     <% else -%>
     <% else -%>

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

     <% end -%>
   </div>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
   <% content_for :auto_discovery_link_tag do -%>
     <% end -%>
   </div>
 <% end %>
 
 <% unless params[:friends] or params[:nearby] -%>
   <% content_for :auto_discovery_link_tag do -%>

-  <%= auto_discovery_link_tag :rss, :action => 'rss', :language => params[:language] %>
+  <%= auto_discovery_link_tag :rss, :action => "rss", :language => params[:language] %>

   <% end -%>
 <% end -%>
   <% end -%>
 <% end -%>

diff --git a/app/views/diary_entries/no_such_entry.html.erb b/app/views/diary_entries/no_such_entry.html.erb
index 4fb5ca49d4739f768306414163b618cb34d8bc0e..db8bc6f0940e56d96646f895e7f2ca00454267ec 100644 (file)
--- a/app/views/diary_entries/no_such_entry.html.erb
+++ b/app/views/diary_entries/no_such_entry.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= t '.heading', :id => h(params[:id]) %></h2>
+  <h2><%= t ".heading", :id => h(params[:id]) %></h2>

 <% end %>
 
 <% end %>
 

-<p><%= t '.body', :id => h(params[:id]) %></p>
+<p><%= t ".body", :id => h(params[:id]) %></p>

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index 91a4c61f5d524f6f6ed4e7cbbdcae4feed25ad5f..57bd967b4bc56dd11d17784668e77ad15fb20ef8 100644 (file)
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -1,35 +1,35 @@
 <% content_for :heading do %>
   <div id="userinformation" >
     <%= user_image @entry.user %>
 <% content_for :heading do %>
   <div id="userinformation" >
     <%= user_image @entry.user %>

-    <h2><%= link_to t('.user_title', :user => h(@entry.user.display_name)), :action => :index %></h2>
+    <h2><%= link_to t(".user_title", :user => h(@entry.user.display_name)), :action => :index %></h2>

     <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
   </div>
 <% end %>
 
     <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
   </div>
 <% end %>
 

-<%= render :partial => 'diary_entry', :object => @entry %>
+<%= render :partial => "diary_entry", :object => @entry %>

 
 <a id="comments"></a>
 <div class='comments'>
 
 <a id="comments"></a>
 <div class='comments'>

-<%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
+<%= render :partial => "diary_comment", :collection => @entry.visible_comments %>

 </div>
 
 <div>
   <% if current_user %>
 </div>
 
 <div>
   <% if current_user %>

-    <h3 id="newcomment"><%= t '.leave_a_comment' %></h3>
+    <h3 id="newcomment"><%= t ".leave_a_comment" %></h3>

 
 

-    <%= error_messages_for 'diary_comment' %>
+    <%= error_messages_for "diary_comment" %>

 
 

-    <%= form_for :diary_comment, :url => { :action => 'comment' } do |f| %>
+    <%= form_for :diary_comment, :url => { :action => "comment" } do |f| %>

       <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>
       <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>

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

     <% end %>
     <% if @entry.subscribers.exists?(current_user.id) %>
     <% end %>
     <% if @entry.subscribers.exists?(current_user.id) %>

-      <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.unsubscribe'), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
+      <div class="diary-subscribe-buttons"><%= link_to t("javascripts.changesets.show.unsubscribe"), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>

     <% else %>
     <% else %>

-      <div class="diary-subscribe-buttons"><%= link_to t('javascripts.changesets.show.subscribe'), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
+      <div class="diary-subscribe-buttons"><%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>

     <% end %>
   <% else %>
     <% end %>
   <% else %>

-    <h3 id="newcomment"><%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => 'users', :action => 'login', :referer => request.fullpath)) %></h3>
+    <h3 id="newcomment"><%= raw t(".login_to_leave_a_comment", :login_link => link_to(t(".login"), :controller => "users", :action => "login", :referer => request.fullpath)) %></h3>

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

diff --git a/app/views/geocoder/results.html.erb b/app/views/geocoder/results.html.erb
index 5ee241375c7826f0ae2dea72861027655e5728a4..deec4ed3939665f725c89133a3a73d75fbcd6f7c 100644 (file)
--- a/app/views/geocoder/results.html.erb
+++ b/app/views/geocoder/results.html.erb
@@ -1,5 +1,5 @@
 <% if @results.empty? %>
 <% if @results.empty? %>

-  <p class="search_results_entry inner12"><%= t '.no_results' %></p>
+  <p class="search_results_entry inner12"><%= t ".no_results" %></p>

 <% else %>
   <ul class='results-list'>
     <% @results.each do |result| %>
 <% else %>
   <ul class='results-list'>
     <% @results.each do |result| %>


@@ -8,7 +8,7 @@
   </ul>
   <% if @more_params %>
     <div class="search_more">
   </ul>
   <% if @more_params %>
     <div class="search_more">

-      <%= link_to t('.more_results'), url_for(@more_params), :class => "button load_more" %>
+      <%= link_to t(".more_results"), url_for(@more_params), :class => "button load_more" %>

       <div class="loader"><%= image_tag "searching.gif" %></div>
     </div>
   <% end %>
       <div class="loader"><%= image_tag "searching.gif" %></div>
     </div>
   <% end %>

diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb
index 8d5b762c6464bc13af89849f1cfcb4f0fcd98934..ec349c7bff60419b6789dabebd90a8b8c5973fa1 100644 (file)
--- a/app/views/geocoder/search.html.erb
+++ b/app/views/geocoder/search.html.erb
@@ -1,6 +1,6 @@
 <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('site.sidebar.search_results') %>
+    <%= t("site.sidebar.search_results") %>

 </h2>
 <% @sources.each do |source| %>
   <h4 class="inner12"><%= raw(t ".title.#{source}") %></h4>
 </h2>
 <% @sources.each do |source| %>
   <h4 class="inner12"><%= raw(t ".title.#{source}") %></h4>

diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index 08adfde53d5e143b9b2d4e3e3d599712a7967a73..89f3098a84641f81cb03bcc78f23a7f1c7aae082 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -17,9 +17,9 @@
 <div class="comment">
   <%= form_for @new_comment, :url => issue_comments_path(@issue) do |f| %>
   <%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8, :required => true %>
 <div class="comment">
   <%= form_for @new_comment, :url => issue_comments_path(@issue) do |f| %>
   <%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8, :required => true %>

-  <%= label_tag :reassign, t('.reassign_param') %> <%= check_box_tag :reassign, true %>
+  <%= label_tag :reassign, t(".reassign_param") %> <%= check_box_tag :reassign, true %>

   <br/>
   <br/>
   <br/>
   <br/>

-  <%= submit_tag 'Submit' %>
+  <%= submit_tag "Submit" %>

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

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 26833553fce17f7deb29b0c2e41aba8e99dc098b..135f2ae9e272773a1b3e53b0cdd0eab1b2c8133b 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -4,10 +4,10 @@
 
 <%= form_tag(issues_path, :method => :get) do %>
 <p><%= t ".search_guidance" %></p>
 
 <%= form_tag(issues_path, :method => :get) do %>
 <p><%= t ".search_guidance" %></p>

-<%= select_tag :status, options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]), :include_blank => t(".select_status"), :data => { :behavior => 'category_dropdown' } %>
-<%= select_tag :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => 'category_dropdown' } %>
+<%= select_tag :status, options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]), :include_blank => t(".select_status"), :data => { :behavior => "category_dropdown" } %>
+<%= select_tag :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => "category_dropdown" } %>

 <%= text_field_tag :search_by_user, params[:search_by_user], :placeholder => t(".reported_user") %>
 <%= text_field_tag :search_by_user, params[:search_by_user], :placeholder => t(".reported_user") %>

-<%= select_tag :last_updated_by, options_for_select(@users.all.collect { |f| [f.display_name, f.id] } << [t(".not_updated"), "nil"], params[:last_updated_by]), :include_blank => t(".select_last_updated_by"), :data => { :behavior => 'category_dropdown' } %>
+<%= select_tag :last_updated_by, options_for_select(@users.all.collect { |f| [f.display_name, f.id] } << [t(".not_updated"), "nil"], params[:last_updated_by]), :include_blank => t(".select_last_updated_by"), :data => { :behavior => "category_dropdown" } %>

 <%= submit_tag t(".search"), :name => nil %>
 <% end %>
 <br/>
 <%= submit_tag t(".search"), :name => nil %>
 <% end %>
 <br/>

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 3af1c402d6d139a71cbbe686c2ceb6f5a32ad459..add65c65a1560ed77cecec1ffed9afed43e7f183 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -11,12 +11,12 @@
   </small>
 </p>
 <p>
   </small>
 </p>
 <p>

-  <%= link_to t('.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>
+  <%= link_to t(".resolve"), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>

   <% if @issue.may_ignore? %>
   <% if @issue.may_ignore? %>

-  | <%= link_to t('.ignore'), ignore_issue_url(@issue), :method => :post %>
+  | <%= link_to t(".ignore"), ignore_issue_url(@issue), :method => :post %>

   <% end %>
 </p>
   <% end %>
 </p>

-<p><%= link_to t('.reopen'), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
+<p><%= link_to t(".reopen"), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>

 <% end %>
 
 <div class="report-related-block">
 <% end %>
 
 <div class="report-related-block">


@@ -27,14 +27,14 @@
     <% if @read_reports.present? %>
     <div class="read-reports">
       <h4><%= t ".read_reports" %></h4>
     <% if @read_reports.present? %>
     <div class="read-reports">
       <h4><%= t ".read_reports" %></h4>

-      <%= render 'reports', :reports => @read_reports %>
+      <%= render "reports", :reports => @read_reports %>

     </div>
     <% end %>
 
     <% if @unread_reports.any? %>
     <div class="unread-reports">
       <h4><%= t ".new_reports" %></h4>
     </div>
     <% end %>
 
     <% if @unread_reports.any? %>
     <div class="unread-reports">
       <h4><%= t ".new_reports" %></h4>

-      <%= render 'reports', :reports => @unread_reports %>
+      <%= render "reports", :reports => @unread_reports %>

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


@@ -59,4 +59,4 @@
 </div>
 
 <h3><%= t ".comments_on_this_issue" %></h3>
 </div>
 
 <h3><%= t ".comments_on_this_issue" %></h3>

-<%= render 'comments', :comments => @comments %>
+<%= render "comments", :comments => @comments %>

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index fc79addb80a6aa0c7223b566b3a6871c5a08dba3..96f8d42a382b60b30406d95043993e8cd19682ff 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -38,5 +38,5 @@
   <%= yield :auto_discovery_link_tag %>
   <%= csrf_meta_tag %>
   <%= csp_meta_tag %>
   <%= yield :auto_discovery_link_tag %>
   <%= csrf_meta_tag %>
   <%= csp_meta_tag %>

-  <title><%= @title + ' | ' if @title %><%= t 'layouts.project_name.title' %></title>
+  <title><%= @title + " | " if @title %><%= t "layouts.project_name.title" %></title>

 <% end %>
 <% end %>

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 65b1729f0464aeb6e9cf63d3f6e0ae6d7e10dc99..1f030862b6558e39717768f374249ff6900e8d4d 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -3,9 +3,9 @@
     <a href="<%= root_path %>" class="geolink">
       <picture>
         <source srcset="<%= image_path "osm_logo.svg" %>" type="image/svg+xml"></source>
     <a href="<%= root_path %>" class="geolink">
       <picture>
         <source srcset="<%= image_path "osm_logo.svg" %>" type="image/svg+xml"></source>

-        <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t('layouts.logo.alt_text'), :class => 'logo' %>
+        <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :class => "logo" %>

       </picture>
       </picture>

-      <%= t 'layouts.project_name.h1' %>
+      <%= t "layouts.project_name.h1" %>

     </a>
   </h1>
   <a href="#" id="menu-icon"></a>
     </a>
   </h1>
   <a href="#" id="menu-icon"></a>


@@ -13,16 +13,16 @@
     <%= content_for :header %>
     <ul>
       <li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">
     <%= content_for :header %>
     <ul>
       <li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">

-        <%= link_to t('layouts.edit'),
+        <%= link_to t("layouts.edit"),

                     edit_path,
                     :class => "tab geolink editlink",
                     edit_path,
                     :class => "tab geolink editlink",

-                    :id => 'editanchor',
+                    :id => "editanchor",

                     :data => { :editor => preferred_editor } %>
         <a class='dropdown-toggle' data-toggle='dropdown' href='#'><b class="caret"></b></a>
         <ul class='dropdown-menu'>
           <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
             <li>
                     :data => { :editor => preferred_editor } %>
         <a class='dropdown-toggle' data-toggle='dropdown' href='#'><b class="caret"></b></a>
         <ul class='dropdown-menu'>
           <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
             <li>

-              <%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
+              <%= link_to t("layouts.edit_with", :editor => t("editor.#{editor}.description")),

                           edit_path(:editor => editor),
                           :data => { :editor => editor },
                           :class => "geolink editlink" %>
                           edit_path(:editor => editor),
                           :data => { :editor => editor },
                           :class => "geolink editlink" %>


@@ -31,10 +31,10 @@
         </ul>
       </li>
       <li id="history_tab" class="<%= current_page_class(history_path) %>">
         </ul>
       </li>
       <li id="history_tab" class="<%= current_page_class(history_path) %>">

-        <%= link_to t('layouts.history'), history_path, :class => 'tab geolink' %>
+        <%= link_to t("layouts.history"), history_path, :class => "tab geolink" %>

       </li>
       <li id="export_tab" class="<%= current_page_class(export_path) %>">
       </li>
       <li id="export_tab" class="<%= current_page_class(export_path) %>">

-        <%= link_to t('layouts.export'), export_path, :class => 'tab geolink' %>
+        <%= link_to t("layouts.export"), export_path, :class => "tab geolink" %>

       </li>
     </ul>
   </nav>
       </li>
     </ul>
   </nav>


@@ -42,33 +42,33 @@
     <ul>
       <% if current_user and ( current_user.administrator? or current_user.moderator? ) %>
         <li class="compact-hide <%= current_page_class(issues_path) %>">
     <ul>
       <% if current_user and ( current_user.administrator? or current_user.moderator? ) %>
         <li class="compact-hide <%= current_page_class(issues_path) %>">

-          <%= link_to issues_path(:status => 'open') do %>
-            <%= t('layouts.issues') %>
+          <%= link_to issues_path(:status => "open") do %>
+            <%= t("layouts.issues") %>

             <%= open_issues_count %>
           <% end -%>
         </li>
       <% end %>
             <%= open_issues_count %>
           <% end -%>
         </li>
       <% end %>

-      <li class="compact-hide <%= current_page_class(traces_path) %>"><%= link_to t('layouts.gps_traces'), traces_path %></li>
-      <li class="compact-hide <%= current_page_class(diary_path) %>"><%= link_to t('layouts.user_diaries'), diary_path %></li>
-      <li class="compact-hide <%= current_page_class(copyright_path) %>"><%= link_to t('layouts.copyright'), copyright_path %></li>
-      <li class="compact-hide <%= current_page_class(help_path) %>"><%= link_to t('layouts.help'), help_path %></li>
-      <li class="compact-hide <%= current_page_class(about_path) %>"><%= link_to t('layouts.about'), about_path %></li>
+      <li class="compact-hide <%= current_page_class(traces_path) %>"><%= link_to t("layouts.gps_traces"), traces_path %></li>
+      <li class="compact-hide <%= current_page_class(diary_path) %>"><%= link_to t("layouts.user_diaries"), diary_path %></li>
+      <li class="compact-hide <%= current_page_class(copyright_path) %>"><%= link_to t("layouts.copyright"), copyright_path %></li>
+      <li class="compact-hide <%= current_page_class(help_path) %>"><%= link_to t("layouts.help"), help_path %></li>
+      <li class="compact-hide <%= current_page_class(about_path) %>"><%= link_to t("layouts.about"), about_path %></li>

       <li id="compact-secondary-nav" class="dropdown">
       <li id="compact-secondary-nav" class="dropdown">

-        <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= t 'layouts.more' %> <b class="caret"></b></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= t "layouts.more" %> <b class="caret"></b></a>

         <ul class="dropdown-menu">
           <% if Settings.status != "database_offline" && can?(:index, Issue) %>
             <li class="<%= current_page_class(issues_path) %>">
         <ul class="dropdown-menu">
           <% if Settings.status != "database_offline" && can?(:index, Issue) %>
             <li class="<%= current_page_class(issues_path) %>">

-              <%= link_to issues_path(:status => 'open') do %>
+              <%= link_to issues_path(:status => "open") do %>

                 <%= open_issues_count %>
                 <%= open_issues_count %>

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

               <% end -%>
             </li>
           <% end %>
               <% end -%>
             </li>
           <% end %>

-          <li class="<%= current_page_class(traces_path) %>"><%= link_to t('layouts.gps_traces'), traces_path %></li>
-          <li class="<%= current_page_class(diary_path) %>"><%= link_to t('layouts.user_diaries'), diary_path %></li>
-          <li class="<%= current_page_class(copyright_path) %>"><%= link_to t('layouts.copyright'), copyright_path %></li>
-          <li class="<%= current_page_class(help_path) %>"><%= link_to t('layouts.help'), help_path %></li>
-          <li class="<%= current_page_class(about_path) %>"><%= link_to t('layouts.about'), about_path %></li>
+          <li class="<%= current_page_class(traces_path) %>"><%= link_to t("layouts.gps_traces"), traces_path %></li>
+          <li class="<%= current_page_class(diary_path) %>"><%= link_to t("layouts.user_diaries"), diary_path %></li>
+          <li class="<%= current_page_class(copyright_path) %>"><%= link_to t("layouts.copyright"), copyright_path %></li>
+          <li class="<%= current_page_class(help_path) %>"><%= link_to t("layouts.help"), help_path %></li>
+          <li class="<%= current_page_class(about_path) %>"><%= link_to t("layouts.about"), about_path %></li>

         </ul>
       </li>
     </ul>
         </ul>
       </li>
     </ul>


@@ -76,7 +76,7 @@
       <div class='dropdown user-menu logged-in'>
         <a class='dropdown-toggle' data-toggle='dropdown' href="#">
           <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25) %>
       <div class='dropdown user-menu logged-in'>
         <a class='dropdown-toggle' data-toggle='dropdown' href="#">
           <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25) %>

-          <%= render :partial => 'layouts/inbox' %>
+          <%= render :partial => "layouts/inbox" %>

           <span class="user-button">
             <span class='username'>
               <%= current_user.display_name %>
           <span class="user-button">
             <span class='username'>
               <%= current_user.display_name %>


@@ -88,28 +88,28 @@
           <li>
             <%= link_to inbox_messages_path do %>
               <span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
           <li>
             <%= link_to inbox_messages_path do %>
               <span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>

-              <%= t('users.show.my messages') %>
+              <%= t("users.show.my messages") %>

             <% end %>
           </li>
           <li>
             <% end %>
           </li>
           <li>

-            <%= link_to t('users.show.my profile'), user_path(current_user) %>
+            <%= link_to t("users.show.my profile"), user_path(current_user) %>

           </li>
           <li>
           </li>
           <li>

-            <%= link_to t('users.show.my settings'), :controller => 'users', :action => 'account', :display_name => current_user.display_name %>
+            <%= link_to t("users.show.my settings"), :controller => "users", :action => "account", :display_name => current_user.display_name %>

           </li>
           <li class="divider"></li>
           <li>
             <%= yield :greeting %>
           </li>
           <li>
           </li>
           <li class="divider"></li>
           <li>
             <%= yield :greeting %>
           </li>
           <li>

-            <%= link_to t('layouts.logout'), logout_path(:session => session.id, :referer => request.fullpath) %>
+            <%= link_to t("layouts.logout"), logout_path(:session => session.id, :referer => request.fullpath) %>

           </li>
         </ul>
       </div>
     <% else %>
       <ul class="user-menu clearfix">
           </li>
         </ul>
       </div>
     <% else %>
       <ul class="user-menu clearfix">

-        <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath) %></li>
-        <li><%= link_to t('layouts.sign_up'), user_new_path %></li>
+        <li><%= link_to t("layouts.log_in"), login_path(:referer => request.fullpath) %></li>
+        <li><%= link_to t("layouts.sign_up"), user_new_path %></li>

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

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 924236c111a57a26da820c3c437aa2e1173f7f5d..bb9aa05b9cfaeae1930001036d21082416a19e14 100644 (file)
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,10 +1,10 @@
 <div class="search_forms">
   <form method="GET" action="<%= search_path %>" class="search_form">
 <div class="search_forms">
   <form method="GET" action="<%= search_path %>" class="search_form">

-    <%= link_to image_tag('directions.png', :class => 'button'), directions_path, :class => "button switch_link", :title => t('site.search.get_directions_title') %>
-    <%= submit_tag t('site.search.submit_text'), :class => 'float', :data => { :disable_with => false } %>
+    <%= link_to image_tag("directions.png", :class => "button"), directions_path, :class => "button switch_link", :title => t("site.search.get_directions_title") %>
+    <%= submit_tag t("site.search.submit_text"), :class => "float", :data => { :disable_with => false } %>

     <div class='query_wrapper'>
     <div class='query_wrapper'>

-      <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :class => 'overflow' %>
-      <%= link_to t('site.search.where_am_i'), '#', :class => "describe_location", :title => t('site.search.where_am_i_title') %>
+      <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus, :class => "overflow" %>
+      <%= link_to t("site.search.where_am_i"), "#", :class => "describe_location", :title => t("site.search.where_am_i_title") %>

     </div>
   </form>
 
     </div>
   </form>
 


@@ -13,18 +13,18 @@
 
     <div class="line">
       <%= image_tag "marker-green.png", :class => "routing_marker", :data => { :type => "from" }, :draggable => "true" %>
 
     <div class="line">
       <%= image_tag "marker-green.png", :class => "routing_marker", :data => { :type => "from" }, :draggable => "true" %>

-      <span class="force_width"><%= text_field_tag "route_from", params[:from], :placeholder => t('site.search.from') %></span>
+      <span class="force_width"><%= text_field_tag "route_from", params[:from], :placeholder => t("site.search.from") %></span>

     </div>
     <div class="line">
       <%= image_tag "marker-red.png", :class => "routing_marker", :data => { :type => "to" }, :draggable => "true" %>
     </div>
     <div class="line">
       <%= image_tag "marker-red.png", :class => "routing_marker", :data => { :type => "to" }, :draggable => "true" %>

-      <span class="force_width"><%= text_field_tag "route_to", params[:to], :placeholder => t('site.search.to') %></span>
+      <span class="force_width"><%= text_field_tag "route_to", params[:to], :placeholder => t("site.search.to") %></span>

     </div>
     <div class="line">
       <select class="routing_engines" name="routing_engines"></select>
     </div>
     <div class="line">
       <select class="routing_engines" name="routing_engines"></select>

-      <%= submit_tag t('site.search.submit_text'), :class => "routing_go", :data => { :disable_with => false } %>
+      <%= submit_tag t("site.search.submit_text"), :class => "routing_go", :data => { :disable_with => false } %>

     </div>
     <div class="line">
     </div>
     <div class="line">

-      <a class="reverse_directions"><%= t('site.search.reverse_directions_text') %></a>
+      <a class="reverse_directions"><%= t("site.search.reverse_directions_text") %></a>

     </div>
 
     <div class="loader_copy"><div class="loader"><%= image_tag "searching.gif" %></div></div>
     </div>
 
     <div class="loader_copy"><div class="loader"><%= image_tag "searching.gif" %></div></div>

diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 7e2196a3b5f443dda2fa9a1616a9f81bf576e269..4d37cdfb8f4200a07185f99292395d5373ceffa2 100644 (file)
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -31,7 +31,7 @@
     <div id="browse_status"></div>
 
     <div id="sidebar_loader">
     <div id="browse_status"></div>
 
     <div id="sidebar_loader">

-      <img alt="<%= t('browse.start_rjs.loading') %>" class="loader" src="<%= image_path("searching.gif") %>">
+      <img alt="<%= t("browse.start_rjs.loading") %>" class="loader" src="<%= image_path("searching.gif") %>">

     </div>
 
     <div id="sidebar_content">
     </div>
 
     <div id="sidebar_content">


@@ -40,16 +40,16 @@
 
     <% unless current_user %>
       <div class="welcome">
 
     <% unless current_user %>
       <div class="welcome">

-        <h2><%= t 'layouts.intro_header' %></h2>
+        <h2><%= t "layouts.intro_header" %></h2>

         <div class="close-wrap"><span class="icon close"></span></div>
         <div class="close-wrap"><span class="icon close"></span></div>

-        <p><%= t 'layouts.intro_text' %></p>
-        <p><%= t 'layouts.hosting_partners_html',
-                 :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"),
-                 :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"),
-                 :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>
+        <p><%= t "layouts.intro_text" %></p>
+        <p><%= t "layouts.hosting_partners_html",
+                 :ucl => link_to(t("layouts.partners_ucl"), "https://www.ucl.ac.uk"),
+                 :bytemark => link_to(t("layouts.partners_bytemark"), "https://www.bytemark.co.uk"),
+                 :partners => link_to(t("layouts.partners_partners"), "https://hardware.openstreetmap.org/thanks/") %>

         </p>
         </p>

-        <a class="button learn-more" href="<%= about_path %>"><%= t('layouts.learn_more') %></a>
-        <a class="button sign-up" href="<%= user_new_path %>"><%= t('layouts.start_mapping') %></a>
+        <a class="button learn-more" href="<%= about_path %>"><%= t("layouts.learn_more") %></a>
+        <a class="button sign-up" href="<%= user_new_path %>"><%= t("layouts.start_mapping") %></a>

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


@@ -60,8 +60,8 @@
 
   <noscript>
     <div id="noscript">
 
   <noscript>
     <div id="noscript">

-      <p><%= t 'site.index.js_1' %></p>
-      <p><%= t 'site.index.js_2' %></p>
+      <p><%= t "site.index.js_1" %></p>
+      <p><%= t "site.index.js_2" %></p>

     </div>
   </noscript>
 
     </div>
   </noscript>
 


@@ -74,14 +74,14 @@
   <div id="attribution">
     <table>
       <tr>
   <div id="attribution">
     <table>
       <tr>

-        <td class="attribution_license"><%= t 'site.index.license.license_url' %></td>
-        <td class="attribution_project"><%= t 'site.index.license.project_url' %></td>
+        <td class="attribution_license"><%= t "site.index.license.license_url" %></td>
+        <td class="attribution_project"><%= t "site.index.license.project_url" %></td>

       </tr>
       <tr>
       </tr>
       <tr>

-        <td colspan="2" class="attribution_notice"><%= t 'site.index.license.copyright' %></td>
+        <td colspan="2" class="attribution_notice"><%= t "site.index.license.copyright" %></td>

       </tr>
     </table>
   </div>
 <% end %>
 
       </tr>
     </table>
   </div>
 <% end %>
 

-<%= render :template => 'layouts/site' %>
+<%= render :template => "layouts/site" %>

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 1e1e23ebb6fe37d0f4540e195bd272ab84a08191..ca59f5763ee4bca50ce7eeb049d899c255e0d3b4 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -5,7 +5,7 @@
     <%= render :partial => "layouts/header" %>
     <%= render :partial => "layouts/content" %>
     <% if defined?(PIWIK) -%>
     <%= render :partial => "layouts/header" %>
     <%= render :partial => "layouts/content" %>
     <% if defined?(PIWIK) -%>

-    <noscript><p><img src="<%= request.protocol %><%= PIWIK['location'] %>/piwik.php?idsite=<%= PIWIK['site'] %>" class="piwik" alt="" /></p></noscript>
+    <noscript><p><img src="<%= request.protocol %><%= PIWIK["location"] %>/piwik.php?idsite=<%= PIWIK["site"] %>" class="piwik" alt="" /></p></noscript>

     <% end -%>
   </body>
 </html>
     <% end -%>
   </body>
 </html>

diff --git a/app/views/messages/_message_summary.html.erb b/app/views/messages/_message_summary.html.erb
index dfccb31652da68131c9f7d97680e699415e6dadd..565a52ddfd466c47331ce151a8ca0abdbee60344 100644 (file)
--- a/app/views/messages/_message_summary.html.erb
+++ b/app/views/messages/_message_summary.html.erb
@@ -2,7 +2,7 @@
   <td class="inbox-sender"><%= link_to h(message_summary.sender.display_name), user_path(message_summary.sender) %></td>
   <td class="inbox-subject"><%= link_to h(message_summary.title), message_path(message_summary) %></td>
   <td class="inbox-sent"><%= l message_summary.sent_on, :format => :friendly %></td>
   <td class="inbox-sender"><%= link_to h(message_summary.sender.display_name), user_path(message_summary.sender) %></td>
   <td class="inbox-subject"><%= link_to h(message_summary.title), message_path(message_summary) %></td>
   <td class="inbox-sent"><%= l message_summary.sent_on, :format => :friendly %></td>

-  <td class="inbox-mark-unread"><%= button_to t('.unread_button'), message_mark_path(message_summary, :mark => 'unread'), :remote => true %></td>
-  <td class="inbox-mark-read"><%= button_to t('.read_button'), message_mark_path(message_summary, :mark => 'read'), :remote => true %></td>
-  <td class="inbox-destroy"><%= button_to t('.destroy_button'), message_path(message_summary, :referer => request.fullpath), :method => :delete, :remote => true %></td>
+  <td class="inbox-mark-unread"><%= button_to t(".unread_button"), message_mark_path(message_summary, :mark => "unread"), :remote => true %></td>
+  <td class="inbox-mark-read"><%= button_to t(".read_button"), message_mark_path(message_summary, :mark => "read"), :remote => true %></td>
+  <td class="inbox-destroy"><%= button_to t(".destroy_button"), message_path(message_summary, :referer => request.fullpath), :method => :delete, :remote => true %></td>

 </tr>
 </tr>

diff --git a/app/views/messages/_sent_message_summary.html.erb b/app/views/messages/_sent_message_summary.html.erb
index 42db8084dad83fe94d2e426883367f440372384f..d3f3227e5c19f26ede099826618daa461540b3b2 100644 (file)
--- a/app/views/messages/_sent_message_summary.html.erb
+++ b/app/views/messages/_sent_message_summary.html.erb
@@ -2,5 +2,5 @@
   <td class="inbox-sender"><%= link_to h(sent_message_summary.recipient.display_name), user_path(sent_message_summary.recipient) %></td>
   <td class="inbox-subject"><%= link_to h(sent_message_summary.title), message_path(sent_message_summary) %></td>
   <td class="inbox-sent"><%= l sent_message_summary.sent_on, :format => :friendly %></td>
   <td class="inbox-sender"><%= link_to h(sent_message_summary.recipient.display_name), user_path(sent_message_summary.recipient) %></td>
   <td class="inbox-subject"><%= link_to h(sent_message_summary.title), message_path(sent_message_summary) %></td>
   <td class="inbox-sent"><%= l sent_message_summary.sent_on, :format => :friendly %></td>

-  <td class="inbox-destroy"><%= button_to t('.destroy_button'), message_path(sent_message_summary, :referer => request.fullpath), :method => :delete, :remote => true %></td>
+  <td class="inbox-destroy"><%= button_to t(".destroy_button"), message_path(sent_message_summary, :referer => request.fullpath), :method => :delete, :remote => true %></td>

 </tr>
 </tr>

diff --git a/app/views/messages/inbox.html.erb b/app/views/messages/inbox.html.erb
index 9cb5411075ab9182ced986bb0967dd874057d610..ba4425c80d578973e93652cdd90698c6b580724c 100644 (file)
--- a/app/views/messages/inbox.html.erb
+++ b/app/views/messages/inbox.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :heading do %>
 <% end %>
 
 <% content_for :heading do %>

-  <h2><%= t '.my_inbox' %>/<%= link_to t('.outbox'), outbox_messages_path %></h2>
+  <h2><%= t ".my_inbox" %>/<%= link_to t(".outbox"), outbox_messages_path %></h2>

 <% end %>
 
   <h4><%= render :partial => "message_count" %></h4>
 <% end %>
 
   <h4><%= render :partial => "message_count" %></h4>


@@ -12,9 +12,9 @@
   <table class="messages">
     <thead>
       <tr>
   <table class="messages">
     <thead>
       <tr>

-        <th><%= t '.from' %></th>
-        <th><%= t '.subject' %></th>
-        <th><%= t '.date' %></th>
+        <th><%= t ".from" %></th>
+        <th><%= t ".subject" %></th>
+        <th><%= t ".date" %></th>

         <th></th>
         <th></th>
       </tr>
         <th></th>
         <th></th>
       </tr>


@@ -24,5 +24,5 @@
     </tbody>
   </table>
 <% else %>
     </tbody>
   </table>
 <% else %>

-  <div><%= raw(t '.no_messages_yet', :people_mapping_nearby_link => link_to(t('.people_mapping_nearby'), user_path(current_user))) %></div>
+  <div><%= raw(t ".no_messages_yet", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), user_path(current_user))) %></div>

 <% end %>
 <% end %>

diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index 2c008732c1eb389b411c6df0c3e8e7f3b00631d1..dedace3d7657956b49802c45599be8c2ef703316 100644 (file)
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -1,23 +1,23 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= raw(t '.send_message_to', :name => link_to(h(@message.recipient.display_name), user_path(@message.recipient))) %></h2>
+  <h2><%= raw(t ".send_message_to", :name => link_to(h(@message.recipient.display_name), user_path(@message.recipient))) %></h2>

 <% end %>
 
 <% end %>
 

-<%= error_messages_for 'message' %>
+<%= error_messages_for "message" %>

 
 

-<%= form_for @message, :html => { :class => 'standard-form' } do |f| %>
+<%= form_for @message, :html => { :class => "standard-form" } do |f| %>

   <%= hidden_field_tag :display_name, @message.recipient.display_name %>
   <fieldset>
     <div class='form-row'>
   <%= hidden_field_tag :display_name, @message.recipient.display_name %>
   <fieldset>
     <div class='form-row'>

-      <label class="standard-label" for="message_title"><%= t '.subject' %></label>
+      <label class="standard-label" for="message_title"><%= t ".subject" %></label>

       <%= f.text_field :title, :size => 60, :class => "richtext_title" %>
     </div>
     <div class='form-row'>
       <%= f.text_field :title, :size => 60, :class => "richtext_title" %>
     </div>
     <div class='form-row'>

-      <label class="standard-label" for="message_body"><%= t '.body' %></label>
+      <label class="standard-label" for="message_body"><%= t ".body" %></label>

       <%= richtext_area :message, :body, :cols => 80, :rows => 20 %>
     </div>
     <div class='buttons'>
       <%= richtext_area :message, :body, :cols => 80, :rows => 20 %>
     </div>
     <div class='buttons'>

-      <%= submit_tag t('.send_button') %>
-      <%= link_to t('.back_to_inbox'), inbox_messages_path, :class => 'deemphasize button' %>
+      <%= submit_tag t(".send_button") %>
+      <%= link_to t(".back_to_inbox"), inbox_messages_path, :class => "deemphasize button" %>

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

diff --git a/app/views/messages/no_such_message.html.erb b/app/views/messages/no_such_message.html.erb
index fd3b9075b8fc0132a815380e2e1be61a56fca9f4..2f5c4bd190ca5d9ab8d053dc42d4d0e6300cf260 100644 (file)
--- a/app/views/messages/no_such_message.html.erb
+++ b/app/views/messages/no_such_message.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t '.heading' %></h1>
+  <h1><%= t ".heading" %></h1>

 <% end %>
 
 <% end %>
 

-<p><%= t '.body' %></p>
+<p><%= t ".body" %></p>

diff --git a/app/views/messages/outbox.html.erb b/app/views/messages/outbox.html.erb
index 36e0f22e9e32905b720e5be0c0997419a217b6bf..f30434a9c0ae1b8ce89f19ad695de8eca104af7a 100644 (file)
--- a/app/views/messages/outbox.html.erb
+++ b/app/views/messages/outbox.html.erb
@@ -3,18 +3,18 @@
 <% end %>
 
 <% content_for :heading do %>
 <% end %>
 
 <% content_for :heading do %>

-  <h2><%= raw(t '.my_inbox', :inbox_link => link_to(t('.inbox'), inbox_messages_path)) %>/<%= t '.outbox' %></h2>
+  <h2><%= raw(t ".my_inbox", :inbox_link => link_to(t(".inbox"), inbox_messages_path)) %>/<%= t ".outbox" %></h2>

 <% end %>
 
 <% end %>
 

-<h4><%= t '.messages', :count => current_user.sent_messages.size %></h4>
+<h4><%= t ".messages", :count => current_user.sent_messages.size %></h4>

 
 <% if current_user.sent_messages.size > 0 %>
   <table class="messages">
     <thead>
       <tr>
 
 <% if current_user.sent_messages.size > 0 %>
   <table class="messages">
     <thead>
       <tr>

-        <th><%= t '.to' %></th>
-        <th><%= t '.subject' %></th>
-        <th><%= t '.date' %></th>
+        <th><%= t ".to" %></th>
+        <th><%= t ".subject" %></th>
+        <th><%= t ".date" %></th>

         <th></th>
       </tr>
     </thead>
         <th></th>
       </tr>
     </thead>


@@ -23,5 +23,5 @@
     </tbody>
   </table>
 <% else %>
     </tbody>
   </table>
 <% else %>

-  <div class="messages"><%= raw(t '.no_sent_messages', :people_mapping_nearby_link => link_to(t('.people_mapping_nearby'), user_path(current_user))) %></div>
+  <div class="messages"><%= raw(t ".no_sent_messages", :people_mapping_nearby_link => link_to(t(".people_mapping_nearby"), user_path(current_user))) %></div>

 <% end %>
 <% end %>

diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index e3634e232807a9600e6157d41a017e5ffed93784..8ad5af9ddac518207104718425245d4c622d00d0 100644 (file)
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -14,9 +14,9 @@
   <div class="richtext"><%= @message.body.to_html %></div>
 
   <div class='message-buttons buttons'>
   <div class="richtext"><%= @message.body.to_html %></div>
 
   <div class='message-buttons buttons'>

-    <%= button_to t('.reply_button'), message_reply_path(@message), :class => 'reply-button' %>
-    <%= button_to t('.unread_button'), message_mark_path(@message, :mark => 'unread'), :class => 'mark-unread-button' %>
-    <%= button_to t('.destroy_button'), message_path(@message), :method => 'delete', :class => 'destroy-button' %>
+    <%= button_to t(".reply_button"), message_reply_path(@message), :class => "reply-button" %>
+    <%= button_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :class => "mark-unread-button" %>
+    <%= button_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "destroy-button" %>

 
 <% else %>
 
 
 <% else %>
 


@@ -36,5 +36,5 @@
 
 <% end %>
 
 
 <% end %>
 

-  <%= link_to t('.back'), outbox_messages_path, :class => "button deemphasize" %>
+  <%= link_to t(".back"), outbox_messages_path, :class => "button deemphasize" %>

   </div>
   </div>

diff --git a/app/views/notes/_notes_paging_nav.html.erb b/app/views/notes/_notes_paging_nav.html.erb
index 224e227c340227bb71241e71850d2beeb15a9f04..207f8877918bbaedf6af21f503f8b26c72efff8e 100644 (file)
--- a/app/views/notes/_notes_paging_nav.html.erb
+++ b/app/views/notes/_notes_paging_nav.html.erb
@@ -1,17 +1,17 @@
 <p>
 
 <% if @page > 1 %>
 <p>
 
 <% if @page > 1 %>

-<%= link_to t('changesets.changeset_paging_nav.previous'), @params.merge(:page => @page - 1) %>
+<%= link_to t("changesets.changeset_paging_nav.previous"), @params.merge(:page => @page - 1) %>

 <% else %>
 <% else %>

-<%= t('changesets.changeset_paging_nav.previous') %>
+<%= t("changesets.changeset_paging_nav.previous") %>

 <% end %>
 
 <% end %>
 

-| <%= t('changesets.changeset_paging_nav.showing_page', :page => @page) %> |
+| <%= t("changesets.changeset_paging_nav.showing_page", :page => @page) %> |

 
 <% if @notes.size < @page_size %>
 
 <% if @notes.size < @page_size %>

-<%= t('changesets.changeset_paging_nav.next') %>
+<%= t("changesets.changeset_paging_nav.next") %>

 <% else %>
 <% else %>

-<%= link_to t('changesets.changeset_paging_nav.next'), @params.merge(:page => @page + 1) %>
+<%= link_to t("changesets.changeset_paging_nav.next"), @params.merge(:page => @page + 1) %>

 <% end %>
 
 </p>
 <% end %>
 
 </p>

diff --git a/app/views/notes/mine.html.erb b/app/views/notes/mine.html.erb
index 13824419e8a02e1d9e638f3f013ec3608c44aa2e..e019c1bfee125b4d3c196f9da257bc7f4677801c 100644 (file)
--- a/app/views/notes/mine.html.erb
+++ b/app/views/notes/mine.html.erb
@@ -3,33 +3,33 @@
   <p><%= raw @description %></p>
 <% end %>
 
   <p><%= raw @description %></p>
 <% end %>
 

-<%= render :partial => 'notes_paging_nav' %>
+<%= render :partial => "notes_paging_nav" %>

 
 <table class="note_list">
   <tr>
     <th></th>
 
 <table class="note_list">
   <tr>
     <th></th>

-    <th><%= t '.id' %></th>
-    <th><%= t '.creator' %></th>
-    <th><%= t '.description' %></th>
-    <th><%= t '.created_at' %></th>
-    <th><%= t '.last_changed' %></th>
+    <th><%= t ".id" %></th>
+    <th><%= t ".creator" %></th>
+    <th><%= t ".description" %></th>
+    <th><%= t ".created_at" %></th>
+    <th><%= t ".last_changed" %></th>

   </tr>
 <% @notes.each do |note| -%>
   <tr<% if note.author != @user2 %> class="creator"<% end %>>
     <td>
       <% if note.closed? %>
   </tr>
 <% @notes.each do |note| -%>
   <tr<% if note.author != @user2 %> class="creator"<% end %>>
     <td>
       <% if note.closed? %>

-        <%= image_tag("closed_note_marker.png", :alt => 'closed') %>
+        <%= image_tag("closed_note_marker.png", :alt => "closed") %>

       <% else %>
       <% else %>

-        <%= image_tag("open_note_marker.png", :alt => 'open') %>
+        <%= image_tag("open_note_marker.png", :alt => "open") %>

       <% end %>
     </td>
     <td><%= link_to note.id.to_s, :controller => "browse", :action => "note", :id => note.id %></td>
     <td><%= note_author(note.author) %></td>
     <td><%= note.comments.first.body.to_html %></td>
       <% end %>
     </td>
     <td><%= link_to note.id.to_s, :controller => "browse", :action => "note", :id => note.id %></td>
     <td><%= note_author(note.author) %></td>
     <td><%= note.comments.first.body.to_html %></td>

-    <td><%= t '.ago_html', :when => friendly_date(note.created_at) %></td>
-    <td><%= t '.ago_html', :when => friendly_date(note.updated_at) %></td>
+    <td><%= t ".ago_html", :when => friendly_date(note.created_at) %></td>
+    <td><%= t ".ago_html", :when => friendly_date(note.updated_at) %></td>

   </tr>
 <% end -%>
 </table>
 
   </tr>
 <% end -%>
 </table>
 

-<%= render :partial => 'notes_paging_nav' %>
+<%= render :partial => "notes_paging_nav" %>

diff --git a/app/views/notifier/_gpx_description.html.erb b/app/views/notifier/_gpx_description.html.erb
index d83f72d9091045bb6fbefa5fbc581d11738c77a6..de67f6005bb83cb6d5717b33724c5a780ae887cf 100644 (file)
--- a/app/views/notifier/_gpx_description.html.erb
+++ b/app/views/notifier/_gpx_description.html.erb
@@ -1,12 +1,12 @@
-<%= t 'notifier.gpx_notification.your_gpx_file' %>
+<%= t "notifier.gpx_notification.your_gpx_file" %>

 <strong><%= @trace_name %></strong>
 <strong><%= @trace_name %></strong>

-<%= t 'notifier.gpx_notification.with_description' %>
+<%= t "notifier.gpx_notification.with_description" %>

 <em><%= @trace_description %></em>
 <% if @trace_tags.length>0 %>
 <em><%= @trace_description %></em>
 <% if @trace_tags.length>0 %>

-  <%= t 'notifier.gpx_notification.and_the_tags' %>
+  <%= t "notifier.gpx_notification.and_the_tags" %>

   <em><% @trace_tags.each do |tag| %>
     <%= tag.tag.rstrip %>
   <% end %></em>
 <% else %>
   <em><% @trace_tags.each do |tag| %>
     <%= tag.tag.rstrip %>
   <% end %></em>
 <% else %>

-  <%= t 'notifier.gpx_notification.and_no_tags' %>
+  <%= t "notifier.gpx_notification.and_no_tags" %>

 <% end %>
 <% end %>

diff --git a/app/views/notifier/changeset_comment_notification.html.erb b/app/views/notifier/changeset_comment_notification.html.erb
index 04bafb0d4e587baeb6a7fa82a5eb14bb2b67ae04..3ecf3fdead9e097a7a1714329e5ccc914d411287 100644 (file)
--- a/app/views/notifier/changeset_comment_notification.html.erb
+++ b/app/views/notifier/changeset_comment_notification.html.erb
@@ -1,5 +1,5 @@
 <p>
 <p>

-  <%= t '.hi', :to_user => @to_user %>
+  <%= t ".hi", :to_user => @to_user %>

 </p>
 <p>
   <% if @owner %>
 </p>
 <p>
   <% if @owner %>


@@ -19,11 +19,11 @@
 <% end %>
 
 <p>
 <% end %>
 
 <p>

-  <%= raw t '.details', :url => link_to(@changeset_url, @changeset_url) %>
+  <%= raw t ".details", :url => link_to(@changeset_url, @changeset_url) %>

 </p>
 
 <% content_for :footer do %>
   <p>
 </p>
 
 <% content_for :footer do %>
   <p>

-    <%= raw t '.unsubscribe', :url => link_to(@changeset_url, @changeset_url, :style => "color: #222") %>
+    <%= raw t ".unsubscribe", :url => link_to(@changeset_url, @changeset_url, :style => "color: #222") %>

   </p>
 <% end %>
   </p>
 <% end %>

diff --git a/app/views/notifier/diary_comment_notification.html.erb b/app/views/notifier/diary_comment_notification.html.erb
index 1191286f1953a1b193931430ce5115068acf79b0..201c14cb0b5ff59c69d8a963696f197be822cd18 100644 (file)
--- a/app/views/notifier/diary_comment_notification.html.erb
+++ b/app/views/notifier/diary_comment_notification.html.erb
@@ -1,8 +1,8 @@
 <p>
 <p>

-  <%= t '.hi', :to_user => @to_user %>
+  <%= t ".hi", :to_user => @to_user %>

 </p>
 <p>
 </p>
 <p>

-  <%= raw t '.header', :from_user => link_to_user(@from_user), :subject => content_tag("em", @title) %>
+  <%= raw t ".header", :from_user => link_to_user(@from_user), :subject => content_tag("em", @title) %>

 </p>
 
 <%= message_body do %>
 </p>
 
 <%= message_body do %>


@@ -10,7 +10,7 @@
 <% end %>
 
 <% content_for :footer do %>
 <% end %>
 
 <% content_for :footer do %>

-  <p><%= raw t '.footer',
+  <p><%= raw t ".footer",

                :readurl => link_to(@readurl, @readurl) + tag(:br),
                :commenturl => link_to(@commenturl, @commenturl) + tag(:br),
                :replyurl => link_to(@replyurl, @replyurl) %>
                :readurl => link_to(@readurl, @readurl) + tag(:br),
                :commenturl => link_to(@commenturl, @commenturl) + tag(:br),
                :replyurl => link_to(@replyurl, @replyurl) %>

diff --git a/app/views/notifier/email_confirm.html.erb b/app/views/notifier/email_confirm.html.erb
index 369c81ae66531d8b70b10d4d4f9089fd1623c580..57359ef599bb506fe0b0041b99a31a90bd81bd5c 100644 (file)
--- a/app/views/notifier/email_confirm.html.erb
+++ b/app/views/notifier/email_confirm.html.erb
@@ -1,7 +1,7 @@
-<p><%= t 'notifier.email_confirm_html.greeting' %></p>
+<p><%= t "notifier.email_confirm_html.greeting" %></p>

 
 

-<p><%= t 'notifier.email_confirm_html.hopefully_you', :server_url => Settings.server_url, :new_address => @address %></p>
+<p><%= t "notifier.email_confirm_html.hopefully_you", :server_url => Settings.server_url, :new_address => @address %></p>

 
 

-<p><%= t 'notifier.email_confirm_html.click_the_link' %></p>
+<p><%= t "notifier.email_confirm_html.click_the_link" %></p>

 
 <p><a href="<%= @url %>"><%= @url %></a></p>
 
 <p><a href="<%= @url %>"><%= @url %></a></p>

diff --git a/app/views/notifier/friend_notification.html.erb b/app/views/notifier/friend_notification.html.erb
index f6774f2dc93efa042a7cd845b639d8f4de32d7b5..083f8d3fc8c2ff0a4b140cb490eae4f457adfa36 100644 (file)
--- a/app/views/notifier/friend_notification.html.erb
+++ b/app/views/notifier/friend_notification.html.erb
@@ -1,9 +1,9 @@
-<p><%= t '.had_added_you', :user => @friend.befriender.display_name %></p>
+<p><%= t ".had_added_you", :user => @friend.befriender.display_name %></p>

 
 <%= message_body do %>
 
 <%= message_body do %>

-  <p><%= raw t '.see_their_profile', :userurl => link_to(@viewurl, @viewurl) %></p>
+  <p><%= raw t ".see_their_profile", :userurl => link_to(@viewurl, @viewurl) %></p>

 
   <% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>
 
   <% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>

-  <p><%= raw t '.befriend_them', :befriendurl => link_to(@friendurl, @friendurl) %></p>
+  <p><%= raw t ".befriend_them", :befriendurl => link_to(@friendurl, @friendurl) %></p>

   <% end -%>
 <% end %>
   <% end -%>
 <% end %>

diff --git a/app/views/notifier/gpx_failure.html.erb b/app/views/notifier/gpx_failure.html.erb
index fee70eed0859e279f44dceeaca94ed9fc95c3e69..3ce26de8c7ae0a541efc55c7bbf63af1f890f41f 100644 (file)
--- a/app/views/notifier/gpx_failure.html.erb
+++ b/app/views/notifier/gpx_failure.html.erb
@@ -1,8 +1,8 @@
-<p><%= t 'notifier.gpx_notification.greeting' %></p>
+<p><%= t "notifier.gpx_notification.greeting" %></p>

 
 <p>
   <%= render :partial => "gpx_description" %>
 
 <p>
   <%= render :partial => "gpx_description" %>

-  <%= t 'notifier.gpx_notification.failure.failed_to_import' %>
+  <%= t "notifier.gpx_notification.failure.failed_to_import" %>

 </p>
 
 <blockquote>
 </p>
 
 <blockquote>


@@ -10,7 +10,7 @@
 </blockquote>
 
 <p>
 </blockquote>
 
 <p>

-  <%= t 'notifier.gpx_notification.failure.more_info_1' %>
-  <%= t 'notifier.gpx_notification.failure.more_info_2' %>
-  <%= t 'notifier.gpx_notification.failure.import_failures_url' %>
+  <%= t "notifier.gpx_notification.failure.more_info_1" %>
+  <%= t "notifier.gpx_notification.failure.more_info_2" %>
+  <%= t "notifier.gpx_notification.failure.import_failures_url" %>

 </p>
 </p>

diff --git a/app/views/notifier/gpx_success.html.erb b/app/views/notifier/gpx_success.html.erb
index 71611a0887b7783252391e87a87c3d8ee11dc482..7601a621dc752c8d427628ce601e9b873721955f 100644 (file)
--- a/app/views/notifier/gpx_success.html.erb
+++ b/app/views/notifier/gpx_success.html.erb
@@ -1,6 +1,6 @@
-<p><%= t 'notifier.gpx_notification.greeting' %></p>
+<p><%= t "notifier.gpx_notification.greeting" %></p>

 
 <p>
   <%= render :partial => "gpx_description" %>
 
 <p>
   <%= render :partial => "gpx_description" %>

-  <%= t 'notifier.gpx_notification.success.loaded_successfully', :trace_points => @trace_points, :possible_points => @possible_points %>
+  <%= t "notifier.gpx_notification.success.loaded_successfully", :trace_points => @trace_points, :possible_points => @possible_points %>

 </p>
 </p>

diff --git a/app/views/notifier/lost_password.html.erb b/app/views/notifier/lost_password.html.erb
index 5f1012ac6dcd3ac0d2524a9ac2868fb774e94339..3f371c80c1616189f61c39de93da60e8e898b088 100644 (file)
--- a/app/views/notifier/lost_password.html.erb
+++ b/app/views/notifier/lost_password.html.erb
@@ -1,7 +1,7 @@
-<p><%= t 'notifier.lost_password_html.greeting' %></p>
+<p><%= t "notifier.lost_password_html.greeting" %></p>

 
 

-<p><%= t 'notifier.lost_password_html.hopefully_you' %></p>
+<p><%= t "notifier.lost_password_html.hopefully_you" %></p>

 
 

-<p><%= t 'notifier.lost_password_html.click_the_link' %></p>
+<p><%= t "notifier.lost_password_html.click_the_link" %></p>

 
 <p><a href="<%= @url %>"><%= @url %></a></p>
 
 <p><a href="<%= @url %>"><%= @url %></a></p>

diff --git a/app/views/notifier/message_notification.html.erb b/app/views/notifier/message_notification.html.erb
index 080146fef1925fb921cf7f5898199c1f5196db6b..d39ea40396be5b80a3f764f26890eaaef4e5c220 100644 (file)
--- a/app/views/notifier/message_notification.html.erb
+++ b/app/views/notifier/message_notification.html.erb
@@ -1,8 +1,8 @@
 <p>
 <p>

-  <%= t '.hi', :to_user => @to_user %>
+  <%= t ".hi", :to_user => @to_user %>

 </p>
 <p>
 </p>
 <p>

-  <%= raw t '.header',
+  <%= raw t ".header",

             :from_user => link_to_user(@from_user),
             :subject => content_tag("em", @title) %>
 </p>
             :from_user => link_to_user(@from_user),
             :subject => content_tag("em", @title) %>
 </p>


@@ -13,7 +13,7 @@
 
 <% content_for :footer do %>
   <p>
 
 <% content_for :footer do %>
   <p>

-    <%= t '.footer_html',
+    <%= t ".footer_html",

           :readurl => link_to(@readurl, @readurl) + tag(:br),
           :replyurl => link_to(@replyurl, @replyurl) %>
   </p>
           :readurl => link_to(@readurl, @readurl) + tag(:br),
           :replyurl => link_to(@replyurl, @replyurl) %>
   </p>

diff --git a/app/views/notifier/note_comment_notification.html.erb b/app/views/notifier/note_comment_notification.html.erb
index 835168583df16fa66e42a78be6559c5355cedef2..3a828602865d17ad0bb8ce3aab0c4e085e3d3df1 100644 (file)
--- a/app/views/notifier/note_comment_notification.html.erb
+++ b/app/views/notifier/note_comment_notification.html.erb
@@ -1,4 +1,4 @@
-<p><%= t '.greeting' %></p>
+<p><%= t ".greeting" %></p>

 
 <% if @owner %>
   <p><%= raw t ".#{@event}.your_note", :commenter => link_to_user(@commenter), :place => @place %></p>
 
 <% if @owner %>
   <p><%= raw t ".#{@event}.your_note", :commenter => link_to_user(@commenter), :place => @place %></p>


@@ -12,4 +12,4 @@
   <% end %>
 <% end %>
 
   <% end %>
 <% end %>
 

-<p><%= raw t '.details', :url => link_to(@noteurl, @noteurl) %></p>
+<p><%= raw t ".details", :url => link_to(@noteurl, @noteurl) %></p>

diff --git a/app/views/oauth/authorize.html.erb b/app/views/oauth/authorize.html.erb
index d53181c172ef2776e269e5a53ddc1a3d58ce8e8e..c480b4c99d7cd27fe6896b3f97e63b757b116192 100644 (file)
--- a/app/views/oauth/authorize.html.erb
+++ b/app/views/oauth/authorize.html.erb
@@ -9,7 +9,7 @@
   <%- if params[:oauth_callback] -%>
     <%= hidden_field_tag "oauth_callback", params[:oauth_callback] %>
   <%- end -%>
   <%- if params[:oauth_callback] -%>
     <%= hidden_field_tag "oauth_callback", params[:oauth_callback] %>
   <%- end -%>

-  <p><%= t '.allow_to' %></p>
+  <p><%= t ".allow_to" %></p>

   <ul>
   <% @token.client_application.permissions.each do |perm| %>
     <li><%= check_box_tag perm.to_s, "yes", @token.read_attribute(perm) %><%= label_tag perm.to_s, t(".#{perm}") %></li>
   <ul>
   <% @token.client_application.permissions.each do |perm| %>
     <li><%= check_box_tag perm.to_s, "yes", @token.read_attribute(perm) %><%= label_tag perm.to_s, t(".#{perm}") %></li>

diff --git a/app/views/oauth_clients/_form.html.erb b/app/views/oauth_clients/_form.html.erb
index bb0506671cbdf917d109215e5dce64fc7cc6297a..a3fe7b3fbf5fffb429ed847221e3475c5e938550 100644 (file)
--- a/app/views/oauth_clients/_form.html.erb
+++ b/app/views/oauth_clients/_form.html.erb
@@ -1,28 +1,28 @@
 <div class='standard-form'>
   <fieldset>
     <div class="form-row">
 <div class='standard-form'>
   <fieldset>
     <div class="form-row">

-      <label class='standard-label' for="client_application_name"><%= t '.name' %> (<%= t '.required' %>)</label>
+      <label class='standard-label' for="client_application_name"><%= t ".name" %> (<%= t ".required" %>)</label>

       <%= f.text_field :name %>
     </div>
     <div class="form-row">
       <%= f.text_field :name %>
     </div>
     <div class="form-row">

-      <label class='standard-label' for="client_application_url"><%= t '.url' %> (<%= t '.required' %>)</label>
+      <label class='standard-label' for="client_application_url"><%= t ".url" %> (<%= t ".required" %>)</label>

       <%= f.text_field :url %>
     </div>
     <div class="form-row">
       <%= f.text_field :url %>
     </div>
     <div class="form-row">

-      <label class='standard-label' for="client_application_callback_url"><%= t '.callback_url' %></label>
+      <label class='standard-label' for="client_application_callback_url"><%= t ".callback_url" %></label>

       <%= f.text_field :callback_url %>
     </div>
     <div class="form-row">
       <%= f.text_field :callback_url %>
     </div>
     <div class="form-row">

-      <label class='standard-label' for="client_application_support_url"><%= t '.support_url' %></label>
+      <label class='standard-label' for="client_application_support_url"><%= t ".support_url" %></label>

       <%= f.text_field :support_url %>
     </div>
   </fieldset>
   <fieldset class='form-divider'>
       <%= f.text_field :support_url %>
     </div>
   </fieldset>
   <fieldset class='form-divider'>

-      <p><%= t '.requests' %></p>
+      <p><%= t ".requests" %></p>

       <% ClientApplication.all_permissions.each do |perm| %>
         <div class="form-row">
           <%= f.check_box perm %>
       <% ClientApplication.all_permissions.each do |perm| %>
         <div class="form-row">
           <%= f.check_box perm %>

-          <label class='standard-label' for="client_application_<%= perm.to_s %>"><%= t('.' + perm.to_s) %></label>
+          <label class='standard-label' for="client_application_<%= perm.to_s %>"><%= t("." + perm.to_s) %></label>

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

diff --git a/app/views/oauth_clients/edit.html.erb b/app/views/oauth_clients/edit.html.erb
index 2a5f9938193af3311e2e95e32799949fcfe0d99d..d6211778babec739bca6d21d0a76beb90cdc3c7f 100644 (file)
--- a/app/views/oauth_clients/edit.html.erb
+++ b/app/views/oauth_clients/edit.html.erb
@@ -1,8 +1,8 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t '.title' %></h1>
+  <h1><%= t ".title" %></h1>

 <% end %>
 
 <%= form_for @client_application, :url => oauth_client_path(@client_application.user.display_name, @client_application), :html => { :method => :put } do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
 <% end %>
 
 <%= form_for @client_application, :url => oauth_client_path(@client_application.user.display_name, @client_application), :html => { :method => :put } do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>

-  <%= submit_tag t '.submit' %>
+  <%= submit_tag t ".submit" %>

 <% end %>
 <% end %>

diff --git a/app/views/oauth_clients/index.html.erb b/app/views/oauth_clients/index.html.erb
index f61048f7253a56bec2766d47ab96c1876c1d6a66..80cae9a6d3439135d9701ec4c2dd3d245e53eff3 100644 (file)
--- a/app/views/oauth_clients/index.html.erb
+++ b/app/views/oauth_clients/index.html.erb
@@ -1,36 +1,36 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t '.title' %></h1>
+  <h1><%= t ".title" %></h1>

 <% end %>
 
 <% unless @tokens.empty? %>
 <% end %>
 
 <% unless @tokens.empty? %>

-<h3><%= t '.my_tokens' %></h3>
-<p><%= t '.list_tokens' %></p>
+<h3><%= t ".my_tokens" %></h3>
+<p><%= t ".list_tokens" %></p>

 <table>
 <table>

-  <tr><th><%= t '.application' %></th>
-    <th><%= t '.issued_at' %></th><th>&nbsp;</th></tr>
+  <tr><th><%= t ".application" %></th>
+    <th><%= t ".issued_at" %></th><th>&nbsp;</th></tr>

   <% @tokens.each do |token| %>
     <%= content_tag_for :tr, token do %>
       <td><%= link_to token.client_application.name, token.client_application.url %></td>
       <td><%= token.authorized_at %></td>
       <td>
   <% @tokens.each do |token| %>
     <%= content_tag_for :tr, token do %>
       <td><%= link_to token.client_application.name, token.client_application.url %></td>
       <td><%= token.authorized_at %></td>
       <td>

-  <%= form_tag :controller => 'oauth', :action => 'revoke' do %>
-  <%= hidden_field_tag 'token', token.token %>
-  <%= submit_tag t('.revoke') %>
+  <%= form_tag :controller => "oauth", :action => "revoke" do %>
+  <%= hidden_field_tag "token", token.token %>
+  <%= submit_tag t(".revoke") %>

   <% end %>
       </td>
     <% end %>
   <% end %>
 </table>
 <% end %>
   <% end %>
       </td>
     <% end %>
   <% end %>
 </table>
 <% end %>

-<h3><%= t '.my_apps' %></h3>
+<h3><%= t ".my_apps" %></h3>

 <% if @client_applications.empty? %>
 <% if @client_applications.empty? %>

-<p><%= raw(t('.no_apps', :oauth => "<a href=\"https://oauth.net\">OAuth</a>")) %></p>
+<p><%= raw(t(".no_apps", :oauth => "<a href=\"https://oauth.net\">OAuth</a>")) %></p>

 <% else %>
 <% else %>

-<p><%= t '.registered_apps' %></p>
+<p><%= t ".registered_apps" %></p>

 <% @client_applications.each do |client| %>
   <%= div_for client do %>
     <%= link_to client.name, :action => :show, :id => client.id %>
   <% end %>
 <% end %>
 <% end %>
 <% @client_applications.each do |client| %>
   <%= div_for client do %>
     <%= link_to client.name, :action => :show, :id => client.id %>
   <% end %>
 <% end %>
 <% end %>

-<h3><%= link_to t('.register_new'), :action => :new %></h3>
+<h3><%= link_to t(".register_new"), :action => :new %></h3>

diff --git a/app/views/oauth_clients/new.html.erb b/app/views/oauth_clients/new.html.erb
index b5767e6ca7ccf391f5a9b96685a402e51dbb9d4f..0a49f48f88150946550cd7c8142181457a5aa08e 100644 (file)
--- a/app/views/oauth_clients/new.html.erb
+++ b/app/views/oauth_clients/new.html.erb
@@ -1,10 +1,10 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t '.title' %></h1>
+  <h1><%= t ".title" %></h1>

 <% end %>
 
 <div class='standard-form'>
   <%= form_for :client_application, :url => { :action => :create } do |f| %>
     <%= render :partial => "form", :locals => { :f => f } %>
 <% end %>
 
 <div class='standard-form'>
   <%= form_for :client_application, :url => { :action => :create } do |f| %>
     <%= render :partial => "form", :locals => { :f => f } %>

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

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

diff --git a/app/views/oauth_clients/show.html.erb b/app/views/oauth_clients/show.html.erb
index 55fffd4823eba1e288723386b822d6be55bb5442..623b30e1601a5b5b3a3b5e8664d2254d4ff45940 100644 (file)
--- a/app/views/oauth_clients/show.html.erb
+++ b/app/views/oauth_clients/show.html.erb
@@ -1,33 +1,33 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t('.title', :app_name => @client_application.name) %></h1>
+  <h1><%= t(".title", :app_name => @client_application.name) %></h1>

 <% end %>
 <div class='prose'>
   <p>
 <% end %>
 <div class='prose'>
   <p>

-    <strong><%= t '.key' %></strong> <%= @client_application.key %>
+    <strong><%= t ".key" %></strong> <%= @client_application.key %>

   </p>
   <p>
   </p>
   <p>

-    <strong><%= t '.secret' %></strong> <%= @client_application.secret %>
+    <strong><%= t ".secret" %></strong> <%= @client_application.secret %>

   </p>
   <p>
   </p>
   <p>

-    <strong><%= t '.url' %></strong> http<%= 's' if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.request_token_path %>
+    <strong><%= t ".url" %></strong> http<%= "s" if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.request_token_path %>

   </p>
   <p>
   </p>
   <p>

-    <strong><%= t '.access_url' %></strong> http<%= 's' if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.access_token_path %>
+    <strong><%= t ".access_url" %></strong> http<%= "s" if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.access_token_path %>

   </p>
   <p>
   </p>
   <p>

-    <strong><%= t '.authorize_url' %></strong> http<%= 's' if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.authorize_path %>
+    <strong><%= t ".authorize_url" %></strong> http<%= "s" if request.ssl? %>://<%= request.host_with_port %><%= @client_application.oauth_server.authorize_path %>

   </p>
 
   </p>
 

-  <p><%= t '.requests' %></p>
+  <p><%= t ".requests" %></p>

   <ul><% @client_application.permissions.each do |perm| %>
   <div class="field">
   <ul><% @client_application.permissions.each do |perm| %>
   <div class="field">

-    <li><%= t('oauth_clients.form.' + perm.to_s) %></li>
+    <li><%= t("oauth_clients.form." + perm.to_s) %></li>

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

-  <p><%= t '.support_notice' %></p>
+  <p><%= t ".support_notice" %></p>

 </div>
 <div class="buttons">
 </div>
 <div class="buttons">

-  <%= button_to t('.edit'), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get, :class => "oauth-edit" %>
-  <%= button_to t('.delete'), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t('.confirm') }, :class => "oauth-delete deemphasize" %>
+  <%= button_to t(".edit"), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get, :class => "oauth-edit" %>
+  <%= button_to t(".delete"), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t(".confirm") }, :class => "oauth-delete deemphasize" %>

 </div>
 </div>

diff --git a/app/views/redactions/_redactions.html.erb b/app/views/redactions/_redactions.html.erb
index a6b6820ed7051b2f0bf100bf8e1aa7a66a8bdf8f..225e2561c5c7297a4ef338db8b301013f72b4690 100644 (file)
--- a/app/views/redactions/_redactions.html.erb
+++ b/app/views/redactions/_redactions.html.erb
@@ -1,3 +1,3 @@
 <ul id="redaction_list">
 <ul id="redaction_list">

-  <%= render :partial => 'redaction', :collection => @redactions %>
+  <%= render :partial => "redaction", :collection => @redactions %>

 </ul>
 </ul>

diff --git a/app/views/redactions/edit.html.erb b/app/views/redactions/edit.html.erb
index fe85d0756246f8df0c6e1f18fb7fd9aa335592ba..72676013ed3044ae8f7723a17a04655a7543b3b0 100644 (file)
--- a/app/views/redactions/edit.html.erb
+++ b/app/views/redactions/edit.html.erb
@@ -1,21 +1,21 @@
-<% @title = t '.title' %>
+<% @title = t ".title" %>

 
 <% content_for :heading do %>
 
 <% content_for :heading do %>

-  <h1><%= t '.heading' %></h1>
+  <h1><%= t ".heading" %></h1>

 <% end %>
 
 <%= form_for(@redaction) do |f| %>
   <%= f.error_messages %>
 
   <p>
 <% end %>
 
 <%= form_for(@redaction) do |f| %>
   <%= f.error_messages %>
 
   <p>

-    <%= f.label :title, t('.title') %><br />
+    <%= f.label :title, t(".title") %><br />

     <%= f.text_field :title %>
   </p>
   <p>
     <%= f.text_field :title %>
   </p>
   <p>

-    <%= f.label :description, t('.description') %><br />
+    <%= f.label :description, t(".description") %><br />

     <%= richtext_area :redaction, :description, :cols => 80, :rows => 20, :format => @redaction.description_format %>
   </p>
   <p>
     <%= richtext_area :redaction, :description, :cols => 80, :rows => 20, :format => @redaction.description_format %>
   </p>
   <p>

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

   </p>
 <% end %>
   </p>
 <% end %>

diff --git a/app/views/redactions/index.html.erb b/app/views/redactions/index.html.erb
index b53e9b74780496119932f321eb31e4884bd6f340..e3388fafa006b97ce74e1916d37f877ef5b89531 100644 (file)
--- a/app/views/redactions/index.html.erb
+++ b/app/views/redactions/index.html.erb
@@ -1,10 +1,10 @@
-<% @title = t('.title') %>
+<% @title = t(".title") %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t('.heading') %></h1>
+  <h1><%= t(".heading") %></h1>

 <% end %>
 
 <% unless @redactions.empty? %>
 <% end %>
 
 <% unless @redactions.empty? %>

-  <%= render :partial => 'redactions' %>
+  <%= render :partial => "redactions" %>

 <% else %>
 <% else %>

-  <p><%= t '.empty' %></p>
+  <p><%= t ".empty" %></p>

 <% end %>
 <% end %>

diff --git a/app/views/redactions/new.html.erb b/app/views/redactions/new.html.erb
index e6838073d1065172ed55a41f6b6d8eb3532ddbb8..9f2adac19adc483003807bb646af6f8f92fdd889 100644 (file)
--- a/app/views/redactions/new.html.erb
+++ b/app/views/redactions/new.html.erb
@@ -1,20 +1,20 @@
-<% @title = t '.title' %>
+<% @title = t ".title" %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t '.heading' %></h1>
+  <h1><%= t ".heading" %></h1>

 <% end %>
 
 <%= form_for(@redaction) do |f| %>
   <%= f.error_messages %>
 
   <p>
 <% end %>
 
 <%= form_for(@redaction) do |f| %>
   <%= f.error_messages %>
 
   <p>

-    <%= f.label :title, t('.title') %><br />
+    <%= f.label :title, t(".title") %><br />

     <%= f.text_field :title %>
   </p>
   <p>
     <%= f.text_field :title %>
   </p>
   <p>

-    <%= f.label :description, t('.description') %><br />
+    <%= f.label :description, t(".description") %><br />

     <%= richtext_area :redaction, :description, :cols => 80, :rows => 20, :format => @redaction.description_format %>
   </p>
   <p>
     <%= richtext_area :redaction, :description, :cols => 80, :rows => 20, :format => @redaction.description_format %>
   </p>
   <p>

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

   </p>
 <% end %>
   </p>
 <% end %>

diff --git a/app/views/redactions/show.html.erb b/app/views/redactions/show.html.erb
index 36b454188f09a88b9626319e42e68887823e3d0c..a87cca604fd9c220a66fb07d22d24786e3c0fb99 100644 (file)
--- a/app/views/redactions/show.html.erb
+++ b/app/views/redactions/show.html.erb
@@ -1,20 +1,20 @@
-<% @title = t('.title') %>
+<% @title = t(".title") %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t('.heading', :title => @redaction.title) %></h1>
+  <h1><%= t(".heading", :title => @redaction.title) %></h1>

 <% end %>
 
 <p>
 <% end %>
 
 <p>

-  <b><%= t '.user' %></b>
+  <b><%= t ".user" %></b>

   <%= link_to(@redaction.user.display_name, user_path(@redaction.user)) %>
 </p>
 <div class="richtext">
   <%= link_to(@redaction.user.display_name, user_path(@redaction.user)) %>
 </p>
 <div class="richtext">

-  <b><%= t '.description' %></b>
+  <b><%= t ".description" %></b>

   <%= @redaction.description.to_html %>
 </div>
 
 <% if current_user and current_user.moderator? %>
 <div class="buttons">
   <%= @redaction.description.to_html %>
 </div>
 
 <% if current_user and current_user.moderator? %>
 <div class="buttons">

-  <%= button_to t('.edit'), edit_redaction_path(@redaction), :method => :get %></td>
-  <%= button_to t('.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('.confirm') } %>
+  <%= button_to t(".edit"), edit_redaction_path(@redaction), :method => :get %></td>
+  <%= button_to t(".destroy"), @redaction, :method => "delete", :remote => true, :data => { :confirm => t(".confirm") } %>

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

diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb
index 1d83a3a5932ce8ec399b80c4b7cb7e2b83fb38c8..c607d2ed4541e568d1ec1843740089b00f2653bf 100644 (file)
--- a/app/views/reports/new.html.erb
+++ b/app/views/reports/new.html.erb
@@ -3,11 +3,11 @@
 <% end %>
 
 <div class="report-disclaimer">
 <% end %>
 
 <div class="report-disclaimer">

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

   <ul>
   <ul>

-    <li> <%= t('.disclaimer.not_just_mistake') %> </li>
-    <li> <%= t('.disclaimer.unable_to_fix') %> </li>
-    <li> <%= t('.disclaimer.resolve_with_user') %> </li>
+    <li> <%= t(".disclaimer.not_just_mistake") %> </li>
+    <li> <%= t(".disclaimer.unable_to_fix") %> </li>
+    <li> <%= t(".disclaimer.resolve_with_user") %> </li>

   </ul>
 </div>
 
   </ul>
 </div>
 


@@ -20,7 +20,7 @@
     <% end %>
 
     <div class='form-row'>
     <% end %>
 
     <div class='form-row'>

-      <p><%= t('.select') %></p>
+      <p><%= t(".select") %></p>

       <ul>
       <% Report.categories_for(@report.issue.reportable).each do |c| %>
         <li>
       <ul>
       <% Report.categories_for(@report.issue.reportable).each do |c| %>
         <li>


@@ -32,7 +32,7 @@
     </div>
 
     <div class='form-row'>
     </div>
 
     <div class='form-row'>

-      <%= text_area :report, :details, :cols => 20, :rows => 5, :placeholder => t('.details') %>
+      <%= text_area :report, :details, :cols => 20, :rows => 5, :placeholder => t(".details") %>

     </div>
 
     <div class='buttons'>
     </div>
 
     <div class='buttons'>

diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index 180835c2841a4a360a0bb09938ce33bd99c9aaed..34f6615002eb454ddafce55e4a68c3fb6bfd91e1 100644 (file)
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -1,29 +1,29 @@
 <tr>
 <tr>

-  <% cl = cycle('table0', 'table1') %>
+  <% cl = cycle("table0", "table1") %>

   <td class="<%= cl %>">
     <% if Settings.status != "gpx_offline" %>
       <% if trace.inserted %>
   <td class="<%= cl %>">
     <% if Settings.status != "gpx_offline" %>
       <% if trace.inserted %>

-        <a href="<%= url_for :controller => 'traces', :action => 'show', :id => trace.id, :display_name => trace.user.display_name %>"><img src="<%= url_for :controller => 'traces', :action => 'icon', :id => trace.id, :display_name => trace.user.display_name %>" border="0" alt="" /></a>
+        <a href="<%= url_for :controller => "traces", :action => "show", :id => trace.id, :display_name => trace.user.display_name %>"><img src="<%= url_for :controller => "traces", :action => "icon", :id => trace.id, :display_name => trace.user.display_name %>" border="0" alt="" /></a>

       <% else %>
       <% else %>

-        <span class="trace_pending"><%= t '.pending' %></span>
+        <span class="trace_pending"><%= t ".pending" %></span>

       <% end %>
     <% end %>
   </td>
       <% end %>
     <% end %>
   </td>

-  <td class="<%= cl %>"><%= link_to trace.name, :controller => 'traces', :action => 'show', :display_name => trace.user.display_name, :id => trace.id %>
+  <td class="<%= cl %>"><%= link_to trace.name, :controller => "traces", :action => "show", :display_name => trace.user.display_name, :id => trace.id %>

     <span class="trace_summary" title="<%= trace.timestamp %>"> ...
       <% if trace.inserted %>
     <span class="trace_summary" title="<%= trace.timestamp %>"> ...
       <% if trace.inserted %>

-        (<%= t '.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %>)
+        (<%= t ".count_points", :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %>)

       <% end %>
       <% end %>

-      ... <%= t '.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span>
-      <%= link_to_if trace.inserted?, t('.map'), { :controller => 'site', :action => 'index', :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}" }, { :title => t('.view_map') } %> /
-      <%= link_to t('.edit'), { :controller => 'site', :action => 'edit', :gpx => trace.id }, { :title => t('.edit_map') } %>
-      <span class="trace_<%= trace.visibility %>"><%= t('.' + trace.visibility) %></span>
+      ... <%= t ".ago", :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span>
+      <%= link_to_if trace.inserted?, t(".map"), { :controller => "site", :action => "index", :mlat => trace.latitude, :mlon => trace.longitude, :anchor => "map=14/#{trace.latitude}/#{trace.longitude}" }, { :title => t(".view_map") } %> /
+      <%= link_to t(".edit"), { :controller => "site", :action => "edit", :gpx => trace.id }, { :title => t(".edit_map") } %>
+      <span class="trace_<%= trace.visibility %>"><%= t("." + trace.visibility) %></span>

       <br />
       <%= trace.description %>
     <br />
       <br />
       <%= trace.description %>
     <br />

-    <%= t '.by' %> <%= link_to h(trace.user.display_name), user_path(trace.user) %>
+    <%= t ".by" %> <%= link_to h(trace.user.display_name), user_path(trace.user) %>

     <% if !trace.tags.empty? %>
     <% if !trace.tags.empty? %>

-      <%= t '.in' %>
+      <%= t ".in" %>

       <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
     <% end %>
   </td>
       <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
     <% end %>
   </td>

diff --git a/app/views/traces/_trace_optionals.html.erb b/app/views/traces/_trace_optionals.html.erb
index 6f0c2130b442dcc86604701e2eec456c8944fa39..d9749653db64c228a1b4ff1f5c32c3261299badf 100644 (file)
--- a/app/views/traces/_trace_optionals.html.erb
+++ b/app/views/traces/_trace_optionals.html.erb
@@ -1,6 +1,6 @@
 <% content_for :optionals do %>
   <div class="optionalbox">
 <% content_for :optionals do %>
   <div class="optionalbox">

-    <h4><%= t '.tags' %></h4>
+    <h4><%= t ".tags" %></h4>

     <% if @all_tags %>
       <% @all_tags.each do |tag| %>
         <%= link_to_tag tag %><br />
     <% if @all_tags %>
       <% @all_tags.each do |tag| %>
         <%= link_to_tag tag %><br />

diff --git a/app/views/traces/_trace_paging_nav.html.erb b/app/views/traces/_trace_paging_nav.html.erb
index ebde16aa0ab4bf5199ba1867d4450c1225d43141..4fcc7b4d87c23a48093db2f0e1a84bac2af287cf 100644 (file)
--- a/app/views/traces/_trace_paging_nav.html.erb
+++ b/app/views/traces/_trace_paging_nav.html.erb
@@ -2,17 +2,17 @@
 
 <% if @traces.size > 1 %>
 <% if @page > 1 %>
 
 <% if @traces.size > 1 %>
 <% if @page > 1 %>

-<%= link_to t('.newer'), @params.merge(:page => @page - 1) %>
+<%= link_to t(".newer"), @params.merge(:page => @page - 1) %>

 <% else %>
 <% else %>

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

 <% end %>
 
 <% end %>
 

-| <%= t('.showing_page', :page => @page) %> |
+| <%= t(".showing_page", :page => @page) %> |

 
 <% if @traces.size < @page_size %>
 
 <% if @traces.size < @page_size %>

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

 <% else %>
 <% else %>

-<%= link_to t('.older'), @params.merge(:page => @page + 1) %>
+<%= link_to t(".older"), @params.merge(:page => @page + 1) %>

 <% end %>
 <% end %>
 </p>
 <% end %>
 <% end %>
 </p>

diff --git a/app/views/traces/edit.html.erb b/app/views/traces/edit.html.erb
index 0900a45dc7884cff714541c90e0bdef565232281..c17660db39757d40fbe11ab2dc3985bf843f9a87 100644 (file)
--- a/app/views/traces/edit.html.erb
+++ b/app/views/traces/edit.html.erb
@@ -1,55 +1,55 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= t '.heading', :name => h(@trace.name) %></h2>
+  <h2><%= t ".heading", :name => h(@trace.name) %></h2>

 <% end %>
 
 <% end %>
 

-<img src="<%= url_for :controller => 'traces', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
+<img src="<%= url_for :controller => "traces", :action => "picture", :id => @trace.id, :display_name => @trace.user.display_name %>">

 
 <%= form_for @trace do |f| %>
 
 <div id='edit-trace-form' class='standard-form'>
   <fieldset>
     <div class='form-row'>
 
 <%= form_for @trace do |f| %>
 
 <div id='edit-trace-form' class='standard-form'>
   <fieldset>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.filename' %></label>
-      <p class='deemphasize'><%= @trace.name %> (<%= link_to t('.download'), trace_data_path(@trace) %>)</p>
+      <label class='standard-label'><%= t ".filename" %></label>
+      <p class='deemphasize'><%= @trace.name %> (<%= link_to t(".download"), trace_data_path(@trace) %>)</p>

     </div>
     <div class='form-row'>
     </div>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.uploaded_at' %></label>
+      <label class='standard-label'><%= t ".uploaded_at" %></label>

       <p class='deemphasize'><%= l @trace.timestamp, :format => :friendly %></p>
     </div>
   <% if @trace.inserted? %>
     <div class='form-row'>
       <p class='deemphasize'><%= l @trace.timestamp, :format => :friendly %></p>
     </div>
   <% if @trace.inserted? %>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.points' %></label>
+      <label class='standard-label'><%= t ".points" %></label>

       <p class='deemphasize'><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %></p>
     </div>
     <div class='form-row'>
       <p class='deemphasize'><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %></p>
     </div>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.start_coord' %></label>
+      <label class='standard-label'><%= t ".start_coord" %></label>

     </div>
     <div class="geo">
       <span class="latitude"><%= @trace.latitude %></span>;
       <span class="longitude"><%= @trace.longitude %></span>
     </div>
     </div>
     <div class="geo">
       <span class="latitude"><%= @trace.latitude %></span>;
       <span class="longitude"><%= @trace.longitude %></span>
     </div>

-    (<%= link_to t('.map'), :controller => 'site', :action => 'index', :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t('.edit'), :controller => 'site', :action => 'edit', :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)
+    (<%= link_to t(".map"), :controller => "site", :action => "index", :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t(".edit"), :controller => "site", :action => "edit", :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)

   <% end %>
     <div class='form-row'>
   <% end %>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.owner' %></label>
+      <label class='standard-label'><%= t ".owner" %></label>

       <p class='deemphasize'><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></p>
     </div>
     <div class='form-row'>
       <p class='deemphasize'><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></p>
     </div>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.description' %></label>
+      <label class='standard-label'><%= t ".description" %></label>

       <%= f.text_field :description %>
     </div>
     <div class='form-row'>
       <%= f.text_field :description %>
     </div>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.tags' %></label>
-      <%= f.text_field :tagstring %> (<%= t '.tags_help' %>)
+      <label class='standard-label'><%= t ".tags" %></label>
+      <%= f.text_field :tagstring %> (<%= t ".tags_help" %>)

     </div>
     <div class='form-row'>
     </div>
     <div class='form-row'>

-      <label class='standard-label'><%= t '.visibility' %></label>
-      <%= f.select :visibility, [[t('traces.visibility.private'), "private"], [t('traces.visibility.public'), "public"], [t('traces.visibility.trackable'), "trackable"], [t('traces.visibility.identifiable'), "identifiable"]] %> (<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)
+      <label class='standard-label'><%= t ".visibility" %></label>
+      <%= f.select :visibility, [[t("traces.visibility.private"), "private"], [t("traces.visibility.public"), "public"], [t("traces.visibility.trackable"), "trackable"], [t("traces.visibility.identifiable"), "identifiable"]] %> (<a href="<%= t ".visibility_help_url" %>"><%= t ".visibility_help" %></a>)

     </div>
   </fieldset>
 
 </div>
 
     </div>
   </fieldset>
 
 </div>
 

-<%= submit_tag t '.save_button' %>
+<%= submit_tag t ".save_button" %>

 
 <% end %>
 
 <% end %>

diff --git a/app/views/traces/index.html.erb b/app/views/traces/index.html.erb
index 0fcaeb6f7e6e8c430bab3797fb9b7e4493ac5452..9db246bd45149cd67180ccfdcf4de801ca023a9a 100644 (file)
--- a/app/views/traces/index.html.erb
+++ b/app/views/traces/index.html.erb
@@ -1,29 +1,29 @@
 <% content_for :heading do %>
   <h1><%= h(@title) %></h1>
   <ul class='secondary-actions clearfix'>
 <% content_for :heading do %>
   <h1><%= h(@title) %></h1>
   <ul class='secondary-actions clearfix'>

-    <li><%= t('.description') %></li>
-    <li><%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %></li>
-    <li><%= link_to t('.upload_trace'), new_trace_path %></li>
+    <li><%= t(".description") %></li>
+    <li><%= rss_link_to :action => "georss", :display_name => @display_name, :tag => @tag %></li>
+    <li><%= link_to t(".upload_trace"), new_trace_path %></li>

     <% if @tag %>
     <% if @tag %>

-      <li><%= link_to t('.see_all_traces'), :controller => 'traces', :action => 'index', :display_name => nil, :tag => nil, :page => nil %></li>
-      <li><%= link_to t('.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %></li>
+      <li><%= link_to t(".see_all_traces"), :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil %></li>
+      <li><%= link_to t(".see_my_traces"), :action => "mine", :tag => nil, :page => nil %></li>

     <% else %>
       <% if @display_name %>
     <% else %>
       <% if @display_name %>

-        <li><%= link_to t('.see_all_traces'), :controller => 'traces', :action => 'index', :display_name => nil, :tag => nil, :page => nil %></li>
+        <li><%= link_to t(".see_all_traces"), :controller => "traces", :action => "index", :display_name => nil, :tag => nil, :page => nil %></li>

       <% end %>
       <% if current_user && current_user != @target_user %>
       <% end %>
       <% if current_user && current_user != @target_user %>

-        <li><%= link_to t('.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %></li>
+        <li><%= link_to t(".see_my_traces"), :action => "mine", :tag => nil, :page => nil %></li>

       <% end %>
     <% end %>
   </ul>
 <% end %>
 
 <% content_for :auto_discovery_link_tag do %>
       <% end %>
     <% end %>
   </ul>
 <% end %>
 
 <% content_for :auto_discovery_link_tag do %>

-<%= auto_discovery_link_tag :rss, :action => 'georss', :display_name => @display_name, :tag => @tag %>
+<%= auto_discovery_link_tag :rss, :action => "georss", :display_name => @display_name, :tag => @tag %>

 <% end %>
 
 <% if @traces.size > 0 %>
 <% end %>
 
 <% if @traces.size > 0 %>

-  <%= render :partial => 'trace_paging_nav' %>
+  <%= render :partial => "trace_paging_nav" %>

 
   <table id="trace_list" cellpadding="3">
     <thead>
 
   <table id="trace_list" cellpadding="3">
     <thead>


@@ -33,13 +33,13 @@
       </tr>
     </thead>
     <tbody>
       </tr>
     </thead>
     <tbody>

-      <%= render :partial => 'trace', :collection => @traces unless @traces.nil? %>
+      <%= render :partial => "trace", :collection => @traces unless @traces.nil? %>

     </tbody>
   </table>
 
     </tbody>
   </table>
 

-  <%= render :partial => 'trace_paging_nav' %>
+  <%= render :partial => "trace_paging_nav" %>

 <% else %>
 <% else %>

-  <h4><%= t '.empty_html', :upload_link => new_trace_path %></h4>
+  <h4><%= t ".empty_html", :upload_link => new_trace_path %></h4>

 <% end %>
 
 <% end %>
 

-<%= render :partial => 'trace_optionals' %>
+<%= render :partial => "trace_optionals" %>

diff --git a/app/views/traces/new.html.erb b/app/views/traces/new.html.erb
index d72899f169a20b6987cea731879d0426a632d656..51cd1630819b1d826e92c0e8d6763861ca7b203d 100644 (file)
--- a/app/views/traces/new.html.erb
+++ b/app/views/traces/new.html.erb
@@ -1,33 +1,33 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t '.upload_trace' %></h1>
+  <h1><%= t ".upload_trace" %></h1>

 <% end %>
 
 <% end %>
 

-<%= error_messages_for 'trace' %>
+<%= error_messages_for "trace" %>

 
 <%= form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
   <div class="standard-form">
     <fieldset>
       <div class='form-row'>
 
 <%= form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
   <div class="standard-form">
     <fieldset>
       <div class='form-row'>

-        <label for="trace_gpx_file" class="standard-label"><%= t '.upload_gpx' %></label>
+        <label for="trace_gpx_file" class="standard-label"><%= t ".upload_gpx" %></label>

         <%= f.file_field :gpx_file %>
       </div>
       <div class='form-row'>
         <%= f.file_field :gpx_file %>
       </div>
       <div class='form-row'>

-        <label class="standard-label"><%= t '.description' %></label>
+        <label class="standard-label"><%= t ".description" %></label>

         <%= f.text_field :description %>
       </div>
       <div class='form-row'>
         <%= f.text_field :description %>
       </div>
       <div class='form-row'>

-        <label class="standard-label"><%= t '.tags' %></label>
+        <label class="standard-label"><%= t ".tags" %></label>

         <%= f.text_field :tagstring %>
         <%= f.text_field :tagstring %>

-        <span class="form-help deemphasize">(<%= t '.tags_help' %>)</span>
+        <span class="form-help deemphasize">(<%= t ".tags_help" %>)</span>

       </div>
       <div class='form-row'>
       </div>
       <div class='form-row'>

-        <label class="standard-label"><%= t '.visibility' %></label>
-        <%= f.select :visibility, [[t('traces.visibility.private'), "private"], [t('traces.visibility.public'), "public"], [t('traces.visibility.trackable'), "trackable"], [t('traces.visibility.identifiable'), "identifiable"]] %>
-        <span class="form-help deemphasize">(<a href="<%= t '.visibility_help_url' %>"><%= t '.visibility_help' %></a>)</span>
+        <label class="standard-label"><%= t ".visibility" %></label>
+        <%= f.select :visibility, [[t("traces.visibility.private"), "private"], [t("traces.visibility.public"), "public"], [t("traces.visibility.trackable"), "trackable"], [t("traces.visibility.identifiable"), "identifiable"]] %>
+        <span class="form-help deemphasize">(<a href="<%= t ".visibility_help_url" %>"><%= t ".visibility_help" %></a>)</span>

       </div>
     </fieldset>
 
       </div>
     </fieldset>
 

-    <%= submit_tag t('.upload_button') %>
-    <span class="form-help deemphasize"><a href="<%= t '.help_url' %>"><%= t '.help' %></a></span>
+    <%= submit_tag t(".upload_button") %>
+    <span class="form-help deemphasize"><a href="<%= t ".help_url" %>"><%= t ".help" %></a></span>

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

diff --git a/app/views/traces/offline.html.erb b/app/views/traces/offline.html.erb
index 5959d0ec3358ff33d6231c5a9fdf2783ab6252c4..8a26744fd2ac166fc0fec8c4d0599b6cca46a194 100644 (file)
--- a/app/views/traces/offline.html.erb
+++ b/app/views/traces/offline.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-<h2><%= t '.heading' %></h2>
+<h2><%= t ".heading" %></h2>

 <% end %>
 
 <% end %>
 

-<p><%= t '.message' %></p>
+<p><%= t ".message" %></p>

diff --git a/app/views/traces/show.html.erb b/app/views/traces/show.html.erb
index 111c71f3621e0852a1c9626ad92968a71bccacd7..0ebbd827fc53c75166f64a107b612fdc3eaf8856 100644 (file)
--- a/app/views/traces/show.html.erb
+++ b/app/views/traces/show.html.erb
@@ -1,53 +1,53 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h2><%= t '.heading', :name => h(@trace.name) %></h2>
+  <h2><%= t ".heading", :name => h(@trace.name) %></h2>

 <% end %>
 
 <% if Settings.status != "gpx_offline" %>
   <% if @trace.inserted %>
 <% end %>
 
 <% if Settings.status != "gpx_offline" %>
   <% if @trace.inserted %>

-    <img src="<%= url_for :controller => 'traces', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
+    <img src="<%= url_for :controller => "traces", :action => "picture", :id => @trace.id, :display_name => @trace.user.display_name %>">

   <% else %>
   <% else %>

-    <span class="trace_pending"><%= t '.pending' %></span>
+    <span class="trace_pending"><%= t ".pending" %></span>

   <% end %>
 <% end %>
 
 <table border="0">
   <tr>
   <% end %>
 <% end %>
 
 <table border="0">
   <tr>

-    <td><%= t '.filename' %></td>
-    <td><%= @trace.name %> (<%= link_to t('.download'), trace_data_path(@trace) %>)</td>
+    <td><%= t ".filename" %></td>
+    <td><%= @trace.name %> (<%= link_to t(".download"), trace_data_path(@trace) %>)</td>

   </tr>
   <tr>
   </tr>
   <tr>

-    <td><%= t '.uploaded' %></td>
+    <td><%= t ".uploaded" %></td>

     <td><%= l @trace.timestamp, :format => :friendly %></td>
   </tr>
   <% if @trace.inserted? %>
   <tr>
     <td><%= l @trace.timestamp, :format => :friendly %></td>
   </tr>
   <% if @trace.inserted? %>
   <tr>

-    <td><%= t '.points' %></td>
+    <td><%= t ".points" %></td>

     <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %></td></tr>
   <tr>
     <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %></td></tr>
   <tr>

-    <td><%= t '.start_coordinates' %></td>
-    <td><div class="geo"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%= link_to t('.map'), :controller => 'site', :action => 'index', :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t('.edit'), :controller => 'site', :action => 'edit', :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>
+    <td><%= t ".start_coordinates" %></td>
+    <td><div class="geo"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%= link_to t(".map"), :controller => "site", :action => "index", :mlat => @trace.latitude, :mlon => @trace.longitude, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t(".edit"), :controller => "site", :action => "edit", :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)</td>

   </tr>
   <% end %>
   <tr>
   </tr>
   <% end %>
   <tr>

-    <td><%= t '.owner' %></td>
+    <td><%= t ".owner" %></td>

     <td><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></td>
   </tr>
   <tr>
     <td><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></td>
   </tr>
   <tr>

-    <td><%= t '.description' %></td>
+    <td><%= t ".description" %></td>

     <td><%= h(@trace.description) %></td>
   </tr>
   <tr>
     <td><%= h(@trace.description) %></td>
   </tr>
   <tr>

-    <td><%= t '.tags' %></td>
+    <td><%= t ".tags" %></td>

     <td>
     <% unless @trace.tags.empty? %>
     <td>
     <% unless @trace.tags.empty? %>

-      <%= raw(@trace.tags.collect { |tag| link_to tag.tag, :controller => 'traces', :action => 'index', :tag => tag.tag, :id => nil }.join(", ")) %>
+      <%= raw(@trace.tags.collect { |tag| link_to tag.tag, :controller => "traces", :action => "index", :tag => tag.tag, :id => nil }.join(", ")) %>

     <% else %>
     <% else %>

-      <i><%= t '.none' %></i>
+      <i><%= t ".none" %></i>

     <% end %>
     </td>
   </tr>
   <tr>
     <% end %>
     </td>
   </tr>
   <tr>

-    <td><%= t '.visibility' %></td>
+    <td><%= t ".visibility" %></td>

     <td><%= t "traces.visibility.#{@trace.visibility}" %></td>
   </tr>
 </table>
     <td><%= t "traces.visibility.#{@trace.visibility}" %></td>
   </tr>
 </table>


@@ -57,8 +57,8 @@
 <% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?) %>
   <div class="buttons">
     <% if current_user == @trace.user %>
 <% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?) %>
   <div class="buttons">
     <% if current_user == @trace.user %>

-      <%= link_to t('.edit_trace'), edit_trace_path(@trace), :class => "button" %>
+      <%= link_to t(".edit_trace"), edit_trace_path(@trace), :class => "button" %>

     <% end %>
     <% end %>

-    <%= button_to t('.delete_trace'), { :controller => 'traces', :action => 'delete', :id => @trace.id }, { :data => { :confirm => t('.confirm_delete') } } %>
+    <%= button_to t(".delete_trace"), { :controller => "traces", :action => "delete", :id => @trace.id }, { :data => { :confirm => t(".confirm_delete") } } %>

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

diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb
index 1614a4dc45fe617a81364d460c60a5f518d49858..ec04c79b7e897f04c337113070f0d8471d3e6259 100644 (file)
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -1,5 +1,5 @@
 <tr>
 <tr>

-  <% c1 = cycle('table0', 'table1') %>
+  <% c1 = cycle("table0", "table1") %>

 
   <% if show_user_name %>
   <td class="<%= c1 %>"><%= link_to h(block.user.display_name), user_path(block.user) %></td>
 
   <% if show_user_name %>
   <td class="<%= c1 %>"><%= link_to h(block.user.display_name), user_path(block.user) %></td>


@@ -11,14 +11,14 @@
   <td class="<%= c1 %>"><%= h block_status(block) %></td>
   <td class="<%= c1 %>">
     <% if block.revoker_id.nil? %>
   <td class="<%= c1 %>"><%= h block_status(block) %></td>
   <td class="<%= c1 %>">
     <% if block.revoker_id.nil? %>

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

     <% else %>
       <%= link_to h(block.revoker.display_name), user_path(block.revoker) %>
     <% end %>
   </td>
     <% else %>
       <%= link_to h(block.revoker.display_name), user_path(block.revoker) %>
     <% end %>
   </td>

-  <td class="<%= c1 %>"><%= link_to t('.show'), block %></td>
-  <td class="<%= c1 %>"><% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t('.edit'), edit_user_block_path(block) %><% end %></td>
+  <td class="<%= c1 %>"><%= link_to t(".show"), block %></td>
+  <td class="<%= c1 %>"><% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %></td>

   <% if show_revoke_link %>
   <% if show_revoke_link %>

-  <td class="<%= c1 %>"><% if block.active? %><%= link_to t('.revoke'), :controller => 'user_blocks', :action => 'revoke', :id => block.id %><% end %></td>
+  <td class="<%= c1 %>"><% if block.active? %><%= link_to t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => block.id %><% end %></td>

   <% end %>
 </tr>
   <% end %>
 </tr>

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index 0e29d9bc0d52c7c6eb7ff7a0b8242987d029dffe..2f7f54a19a2638eb4c017f55f3a1b62c060559de 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -1,35 +1,35 @@
 <table id="block_list" cellpadding="3">
   <tr>
     <% if show_user_name %>
 <table id="block_list" cellpadding="3">
   <tr>
     <% if show_user_name %>

-    <th><%= t '.display_name' %></th>
+    <th><%= t ".display_name" %></th>

     <% end %>
     <% if show_creator_name %>
     <% end %>
     <% if show_creator_name %>

-    <th><%= t '.creator_name' %></th>
+    <th><%= t ".creator_name" %></th>

     <% end %>
     <% end %>

-    <th><%= t '.reason' %></th>
-    <th><%= t '.status' %></th>
-    <th><%= t '.revoker_name' %></th>
+    <th><%= t ".reason" %></th>
+    <th><%= t ".status" %></th>
+    <th><%= t ".revoker_name" %></th>

     <th></th>
     <th></th>
     <% if show_revoke_link %>
     <th></th>
     <% end %>
   </tr>
     <th></th>
     <th></th>
     <% if show_revoke_link %>
     <th></th>
     <% end %>
   </tr>

-  <%= render :partial => 'block', :locals => { :show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %>
+  <%= render :partial => "block", :locals => { :show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %>

 </table>
 
 <ul class='secondary-actions'>
   <% if @user_blocks_pages.current_page.number > 1 -%>
 </table>
 
 <ul class='secondary-actions'>
   <% if @user_blocks_pages.current_page.number > 1 -%>

-    <li><%= link_to t('.previous'), @params.merge(:page => @user_blocks_pages.current_page.number - 1) %></li>
+    <li><%= link_to t(".previous"), @params.merge(:page => @user_blocks_pages.current_page.number - 1) %></li>

   <% else -%>
   <% else -%>

-    <li><%= t('.previous') %></li>
+    <li><%= t(".previous") %></li>

   <% end -%>
 
   <% end -%>
 

-  <li><%= t('.showing_page', :page => @user_blocks_pages.current_page.number) %></li>
+  <li><%= t(".showing_page", :page => @user_blocks_pages.current_page.number) %></li>

 
   <% if @user_blocks_pages.current_page.number < @user_blocks_pages.page_count -%>
 
   <% if @user_blocks_pages.current_page.number < @user_blocks_pages.page_count -%>

-    <li><%= link_to t('.next'), @params.merge(:page => @user_blocks_pages.current_page.number + 1) %></li>
+    <li><%= link_to t(".next"), @params.merge(:page => @user_blocks_pages.current_page.number + 1) %></li>

   <% else -%>
   <% else -%>

-    <li><%= t('.next') %></li>
+    <li><%= t(".next") %></li>

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

diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb
index 69af9374afd009d0a4b67084d5c58c677d6e51a1..8687bc29ebff1b798a6412409e18ab061369eb7c 100644 (file)
--- a/app/views/user_blocks/blocks_by.html.erb
+++ b/app/views/user_blocks/blocks_by.html.erb
@@ -1,10 +1,10 @@
-<% @title = t('.title', :name => h(@user.display_name)) %>
+<% @title = t(".title", :name => h(@user.display_name)) %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= raw(t('.heading', :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>
+  <h1><%= raw(t(".heading", :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>

 <% end %>
 
 <% unless @user_blocks.empty? %>
 <% end %>
 
 <% unless @user_blocks.empty? %>

-<%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => false } %>
+<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => false } %>

 <% else %>
 <p><%= t ".empty", :name => h(@user.display_name) %></p>
 <% end %>
 <% else %>
 <p><%= t ".empty", :name => h(@user.display_name) %></p>
 <% end %>

diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb
index 6e4fd3ca6a190aadfa4beea96417d0a428ece924..1a74ba560f47884c7754e3d0c2f410e3f7cc7dde 100644 (file)
--- a/app/views/user_blocks/blocks_on.html.erb
+++ b/app/views/user_blocks/blocks_on.html.erb
@@ -1,9 +1,9 @@
-<% @title = t('.title', :name => h(@user.display_name)) %>
+<% @title = t(".title", :name => h(@user.display_name)) %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= raw(t('.heading', :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>
+  <h1><%= raw(t(".heading", :name => link_to(h(@user.display_name), user_path(@user)))) %></h1>

 <% end %>
 <% unless @user_blocks.empty? %>
 <% end %>
 <% unless @user_blocks.empty? %>

-<%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => false, :show_creator_name => true } %>
+<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => false, :show_creator_name => true } %>

 <% else %>
 <p><%= t ".empty", :name => h(@user.display_name) %></p>
 <% end %>
 <% else %>
 <p><%= t ".empty", :name => h(@user.display_name) %></p>
 <% end %>

diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index a3bb9c682fb320954c0d0227ed74a2c7cd6f3923..82757af8346e6aa65268bc72375903760b39f0c0 100644 (file)
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -1,11 +1,11 @@
-<% @title = t '.title', :name => h(@user_block.user.display_name) %>
+<% @title = t ".title", :name => h(@user_block.user.display_name) %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= raw t('.title',
+  <h1><%= raw t(".title",

                 :name => link_to(h(@user_block.user.display_name),
                                  user_path(@user_block.user))) %></h1>
   <ul class='secondary-actions clearfix'>
                 :name => link_to(h(@user_block.user.display_name),
                                  user_path(@user_block.user))) %></h1>
   <ul class='secondary-actions clearfix'>

-    <li><%= link_to t('.show'), @user_block %></li>
-    <li><%= link_to t('.back'), user_blocks_path %></li>
+    <li><%= link_to t(".show"), @user_block %></li>
+    <li><%= link_to t(".back"), user_blocks_path %></li>

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


@@ -13,18 +13,18 @@
   <%= f.error_messages %>
 
   <p>
   <%= f.error_messages %>
 
   <p>

-    <%= f.label :reason, t('.reason', :name => h(@user_block.user.display_name)) %><br />
+    <%= f.label :reason, t(".reason", :name => h(@user_block.user.display_name)) %><br />

     <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
   </p>
   <p>
     <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
   </p>
   <p>

-    <%= label_tag 'user_block_period', t('.period') %><br />
-    <%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_blocks.period', :count => h), h.to_s] }, params[:user_block_period])) %>
+    <%= label_tag "user_block_period", t(".period") %><br />
+    <%= select_tag("user_block_period", options_for_select(UserBlock::PERIODS.collect { |h| [t("user_blocks.period", :count => h), h.to_s] }, params[:user_block_period])) %>

   </p>
   <p>
     <%= f.check_box :needs_view %>
   </p>
   <p>
     <%= f.check_box :needs_view %>

-    <%= f.label :needs_view, t('.needs_view') %>
+    <%= f.label :needs_view, t(".needs_view") %>

   </p>
   <p>
   </p>
   <p>

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

   </p>
 <% end %>
   </p>
 <% end %>

diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb
index adfc0dc28d491edf46b9e200207d412d44c3ddbc..ff019b293df4ac7996c1b136619e7cfbc081434e 100644 (file)
--- a/app/views/user_blocks/index.html.erb
+++ b/app/views/user_blocks/index.html.erb
@@ -1,10 +1,10 @@
-<% @title = t('.title') %>
+<% @title = t(".title") %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t('.heading') %></h1>
+  <h1><%= t(".heading") %></h1>

 <% end %>
 
 <% unless @user_blocks.empty? %>
 <% end %>
 
 <% unless @user_blocks.empty? %>

-<%= render :partial => 'blocks', :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => true } %>
+<%= render :partial => "blocks", :locals => { :show_revoke_link => (current_user and current_user.moderator?), :show_user_name => true, :show_creator_name => true } %>

 <% else %>
 <p><%= t ".empty" %></p>
 <% end %>
 <% else %>
 <p><%= t ".empty" %></p>
 <% end %>

diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb
index 2967ecaf0dd110370452326c65407dad143b1713..c92fe74ec5649b7564203f922e3fc9a7f6fd2ca3 100644 (file)
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -1,6 +1,6 @@
-<% @title = t '.title', :name => h(@user.display_name) %>
+<% @title = t ".title", :name => h(@user.display_name) %>

 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= raw t('.heading',
+  <h1><%= raw t(".heading",

                 :name => link_to(h(@user.display_name),
                                  user_path(@user))) %></h1>
 <% end %>
                 :name => link_to(h(@user.display_name),
                                  user_path(@user))) %></h1>
 <% end %>


@@ -8,21 +8,21 @@
   <%= f.error_messages %>
 
   <p>
   <%= f.error_messages %>
 
   <p>

-    <%= f.label :reason, t('.reason', :name => @user.display_name) %><br />
+    <%= f.label :reason, t(".reason", :name => @user.display_name) %><br />

     <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20 %>
   </p>
   <p>
     <%= richtext_area :user_block, :reason, :cols => 80, :rows => 20 %>
   </p>
   <p>

-    <%= label_tag 'user_block_period', t('.period') %><br />
-    <%= select_tag('user_block_period', options_for_select(UserBlock::PERIODS.collect { |h| [t('user_blocks.period', :count => h), h.to_s] }, params[:user_block_period])) %>
+    <%= label_tag "user_block_period", t(".period") %><br />
+    <%= select_tag("user_block_period", options_for_select(UserBlock::PERIODS.collect { |h| [t("user_blocks.period", :count => h), h.to_s] }, params[:user_block_period])) %>

   </p>
   <p>
     <%= f.check_box :needs_view %>
   </p>
   <p>
     <%= f.check_box :needs_view %>

-    <%= f.label :needs_view, t('.needs_view') %>
+    <%= f.label :needs_view, t(".needs_view") %>

   </p>
   <p>
   </p>
   <p>

-    <%= hidden_field_tag 'display_name', @user.display_name %>
-    <%= f.submit t('.submit') %>
+    <%= hidden_field_tag "display_name", @user.display_name %>
+    <%= f.submit t(".submit") %>

   </p>
 <% end %>
 
   </p>
 <% end %>
 

-<%= link_to t('.back'), user_blocks_path %>
+<%= link_to t(".back"), user_blocks_path %>

diff --git a/app/views/user_blocks/not_found.html.erb b/app/views/user_blocks/not_found.html.erb
index d5846cc11d8a27f976846eb6c4a3a245a47e0092..3fa3bfbc167632db1d351cc952ae7e932c3e7de7 100644 (file)
--- a/app/views/user_blocks/not_found.html.erb
+++ b/app/views/user_blocks/not_found.html.erb
@@ -1,3 +1,3 @@
-<p><%= t '.sorry', :id => params[:id] %></p>
+<p><%= t ".sorry", :id => params[:id] %></p>

 
 

-<%= link_to t('.back'), user_blocks_path %>
+<%= link_to t(".back"), user_blocks_path %>

diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb
index d4786b2e5d2c2c0a4373a1f3f5741fde09fbe229..44da21d85b303f8bf968712888f704440637afed 100644 (file)
--- a/app/views/user_blocks/revoke.html.erb
+++ b/app/views/user_blocks/revoke.html.erb
@@ -1,9 +1,9 @@
-<% @title = t('.title',
+<% @title = t(".title",

               :block_on => h(@user_block.user.display_name),
               :block_by => h(@user_block.creator.display_name)) %>
 
 <% content_for :heading do %>
               :block_on => h(@user_block.user.display_name),
               :block_by => h(@user_block.creator.display_name)) %>
 
 <% content_for :heading do %>

-  <h1><%= raw t('.heading',
+  <h1><%= raw t(".heading",

                 :block_on => link_to(h(@user_block.user.display_name),
                                      user_path(@user_block.user)),
                 :block_by => link_to(h(@user_block.creator.display_name),
                 :block_on => link_to(h(@user_block.user.display_name),
                                      user_path(@user_block.user)),
                 :block_by => link_to(h(@user_block.creator.display_name),


@@ -12,22 +12,22 @@
 
 <% if @user_block.ends_at > Time.now %>
 <p><b>
 
 <% if @user_block.ends_at > Time.now %>
 <p><b>

-  <%= t('.time_future', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
+  <%= t(".time_future", :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>

 </b></p>
 
 <%= form_for :revoke, :url => { :action => "revoke" } do |f| %>
   <%= f.error_messages %>
 <p>
 </b></p>
 
 <%= form_for :revoke, :url => { :action => "revoke" } do |f| %>
   <%= f.error_messages %>
 <p>

-  <%= check_box_tag 'confirm', 'yes' %>
-  <%= label_tag 'confirm', t('.confirm') %>
+  <%= check_box_tag "confirm", "yes" %>
+  <%= label_tag "confirm", t(".confirm") %>

 </p>
 <p>
 </p>
 <p>

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

 </p>
 <% end %>
 
 <% else %>
 <p>
 </p>
 <% end %>
 
 <% else %>
 <p>

-  <%= t('.past', :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
+  <%= t(".past", :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>

 </p>
 <% end %>
 </p>
 <% end %>

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 6f0104cfbdf9c4da01ea1a374979165e42eddf2b..28e467fb4ebc84b376b53da39f6f4e7332f77701 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -1,9 +1,9 @@
-<% @title = t('.title',
+<% @title = t(".title",

               :block_on => @user_block.user.display_name,
               :block_by => @user_block.creator.display_name) %>
 
 <% content_for :heading do %>
               :block_on => @user_block.user.display_name,
               :block_by => @user_block.creator.display_name) %>
 
 <% content_for :heading do %>

-  <h1><%= raw t('.heading',
+  <h1><%= raw t(".heading",

                 :block_on => link_to(h(@user_block.user.display_name),
                                      user_path(@user_block.user)),
                 :block_by => link_to(h(@user_block.creator.display_name),
                 :block_on => link_to(h(@user_block.user.display_name),
                                      user_path(@user_block.user)),
                 :block_by => link_to(h(@user_block.creator.display_name),


@@ -11,26 +11,26 @@
 <ul class='secondary-actions clearfix'>
   <% if @user_block.ends_at > Time.now.getutc %>
     <% if current_user and current_user.id == @user_block.creator_id %>
 <ul class='secondary-actions clearfix'>
   <% if @user_block.ends_at > Time.now.getutc %>
     <% if current_user and current_user.id == @user_block.creator_id %>

-      <li><%= link_to t('.edit'), edit_user_block_path(@user_block) %></li>
+      <li><%= link_to t(".edit"), edit_user_block_path(@user_block) %></li>

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

-      <li><%= link_to(t('.revoke'), :controller => 'user_blocks', :action => 'revoke', :id => @user_block.id) %></li>
+      <li><%= link_to(t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => @user_block.id) %></li>

     <% end %>
   <% end %>
     <% end %>
   <% end %>

-  <li><%= link_to t('.back'), user_blocks_path %></li>
+  <li><%= link_to t(".back"), user_blocks_path %></li>

 </ul>
 <% end %>
 
 <% if @user_block.revoker %>
 <p>
 </ul>
 <% end %>
 
 <% if @user_block.revoker %>
 <p>

-  <b><%= t '.revoker' %></b>
+  <b><%= t ".revoker" %></b>

   <%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>
 </p>
 <% end %>
 
   <%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>
 </p>
 <% end %>
 

-<p><b><%= t '.created' %></b>: <%= raw t '.ago', :time => friendly_date(@user_block.created_at) %></p>
+<p><b><%= t ".created" %></b>: <%= raw t ".ago", :time => friendly_date(@user_block.created_at) %></p>

 
 

-<p><b><%= t '.status' %></b>: <%= block_status(@user_block) %></p>
+<p><b><%= t ".status" %></b>: <%= block_status(@user_block) %></p>

 
 

-<p><b><%= t '.reason' %></b></p>
+<p><b><%= t ".reason" %></b></p>

 <div class="richtext"><%= @user_block.reason.to_html %></div>
 <div class="richtext"><%= @user_block.reason.to_html %></div>

diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index 1eef86b87ee1bf35bd5d6b82ffb6e32d6889b3a5..d75e717add7245350857ac63c9109f1fa3daafcb 100644 (file)
--- a/app/views/users/_contact.html.erb
+++ b/app/views/users/_contact.html.erb
@@ -14,32 +14,32 @@
       <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
         <% distance = @user.distance(contact) %>
         <% if distance < 1 %>
       <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %>
         <% distance = @user.distance(contact) %>
         <% if distance < 1 %>

-          (<%= t 'users.show.m away', :count => (distance * 1000).round %>)
+          (<%= t "users.show.m away", :count => (distance * 1000).round %>)

         <% else %>
         <% else %>

-          (<%= t 'users.show.km away', :count => distance.round %>)
+          (<%= t "users.show.km away", :count => distance.round %>)

         <% end %>
       <% end %>
     </p>
     <p>
       <% changeset = contact.changesets.first %>
       <% if changeset %>
         <% end %>
       <% end %>
     </p>
     <p>
       <% changeset = contact.changesets.first %>
       <% if changeset %>

-        <%= t('users.show.latest edit', :ago => t('users.show.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
-        <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %>
+        <%= t("users.show.latest edit", :ago => t("users.show.ago", :time_in_words_ago => time_ago_in_words(changeset.created_at))) %>
+        <% comment = changeset.tags["comment"].to_s != "" ? changeset.tags["comment"] : t("browse.no_comment") %>

         "<%= link_to(comment,
         "<%= link_to(comment,

-                     { :controller => 'browse', :action => 'changeset', :id => changeset.id },
-                     { :title => t('changesets.changeset.view_changeset_details') }) %>"
+                     { :controller => "browse", :action => "changeset", :id => changeset.id },
+                     { :title => t("changesets.changeset.view_changeset_details") }) %>"

       <% else %>
       <% else %>

-       <%= t 'changesets.changeset.no_edits' %>
+       <%= t "changesets.changeset.no_edits" %>

       <% end %>
     </p>
 
     <ul class='secondary-actions clearfix deemphasize'>
       <% end %>
     </p>
 
     <ul class='secondary-actions clearfix deemphasize'>

-      <li><%= link_to t('users.show.send message'), new_message_path(contact) %></li>
+      <li><%= link_to t("users.show.send message"), new_message_path(contact) %></li>

       <li>
         <% if current_user.is_friends_with?(contact) %>
       <li>
         <% if current_user.is_friends_with?(contact) %>

-          <%= link_to t('users.show.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
+          <%= link_to t("users.show.remove as friend"), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>

         <% else %>
         <% else %>

-          <%= link_to t('users.show.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>
+          <%= link_to t("users.show.add as friend"), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %>

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

diff --git a/app/views/users/_popup.html.erb b/app/views/users/_popup.html.erb
index 957664b3bb78c5db8f90d24215d292c8817c40e4..684cf3237b8f1621d260c9a11882979d66a5d40f 100644 (file)
--- a/app/views/users/_popup.html.erb
+++ b/app/views/users/_popup.html.erb
@@ -1,5 +1,5 @@
 <div class="user_popup">
   <%= user_thumbnail popup %>
 <div class="user_popup">
   <%= user_thumbnail popup %>

-  <p><%= t('.' + type) %></p>
+  <p><%= t("." + type) %></p>

   <p><%= link_to popup.display_name, user_path(popup) %></p>
 </div>
   <p><%= link_to popup.display_name, user_path(popup) %></p>
 </div>

diff --git a/app/views/users/_terms.html.erb b/app/views/users/_terms.html.erb
index ad0b74166980f14dd7005a67c2bfddf945fc967f..f01b3bfb74e0ca2aac55cbe6dd1b2fe1a42fbc19 100644 (file)
--- a/app/views/users/_terms.html.erb
+++ b/app/views/users/_terms.html.erb
@@ -1,45 +1,45 @@
 <p id="first">
 <p id="first">

-  <%= raw @text['intro'] %>
-  <%= raw @text['next_with_decline'] %>
+  <%= raw @text["intro"] %>
+  <%= raw @text["next_with_decline"] %>

 </p>
 </p>

-<h3><%= raw @text['introduction'] %></h3>
+<h3><%= raw @text["introduction"] %></h3>

 <ol>
   <li>
 <ol>
   <li>

-    <p><%= raw @text['section_1'] %></p>
+    <p><%= raw @text["section_1"] %></p>

     <% unless @text['section_1a'].nil? %>
     <ol>
     <% unless @text['section_1a'].nil? %>
     <ol>

-      <li><%= raw @text['section_1a'] %></li>
-      <li><%= raw @text['section_1b'] %></li>
+      <li><%= raw @text["section_1a"] %></li>
+      <li><%= raw @text["section_1b"] %></li>

     </ol>
     <% end %>
   </li>
 </ol>
     </ol>
     <% end %>
   </li>
 </ol>

-<h3><%= raw @text['rights_granted'] %></h3>
+<h3><%= raw @text["rights_granted"] %></h3>

 <ol start="2">
   <li>
 <ol start="2">
   <li>

-    <p><%= raw @text['section_2'] %></p>
+    <p><%= raw @text["section_2"] %></p>

   </li>
   <li>
   </li>
   <li>

-    <p><%= raw @text['section_3'] %></p>
-    <p><%= raw @text['active_defn_1'] %></p>
-    <p><%= raw @text['active_defn_2'] %></p>
+    <p><%= raw @text["section_3"] %></p>
+    <p><%= raw @text["active_defn_1"] %></p>
+    <p><%= raw @text["active_defn_2"] %></p>

     </ul>
   </li>
   <li>
     </ul>
   </li>
   <li>

-    <p><%= raw @text['section_4'] %></p>
+    <p><%= raw @text["section_4"] %></p>

   </li>
   <li>
   </li>
   <li>

-    <p><%= raw @text['section_5'] %></p>
+    <p><%= raw @text["section_5"] %></p>

   </li>
 </ol>
   </li>
 </ol>

-<h3><%= raw @text['limitation_of_liability'] %></h3>
+<h3><%= raw @text["limitation_of_liability"] %></h3>

 <ol start="6">
 <ol start="6">

-  <li><p><%= raw @text['section_6'] %></p></li>
-  <li><p><%= raw @text['section_7'] %></p></li>
+  <li><p><%= raw @text["section_6"] %></p></li>
+  <li><p><%= raw @text["section_7"] %></p></li>

 </ol>
 </ol>

-<h3><%= raw @text['miscellaneous'] %></h3>
+<h3><%= raw @text["miscellaneous"] %></h3>

 <ol start="8">
   <li>
 <ol start="8">
   <li>

-    <p id="last"><%= raw @text['section_8'] %></p>
+    <p id="last"><%= raw @text["section_8"] %></p>

   </li>
 </ol>
   </li>
 </ol>

diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index ae8b96383fd16f08f96adf6e38b1addd9790adbf..beff4b0ae3572c16824eb31c795d0825692ebb97 100644 (file)
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -1,4 +1,4 @@
-<% cl = cycle('table0', 'table1') %>
+<% cl = cycle("table0", "table1") %>

 
 <tr class="<%= cl %>">
   <td>
 
 <tr class="<%= cl %>">
   <td>


@@ -7,12 +7,12 @@
   <td>
     <p>
       <% if user.creation_ip %>
   <td>
     <p>
       <% if user.creation_ip %>

-        <%= raw t 'users.index.summary',
+        <%= raw t "users.index.summary",

                   :name => link_to(h(user.display_name), user_path(user)),
                   :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
                   :date => l(user.creation_time, :format => :friendly) %>
       <% else %>
                   :name => link_to(h(user.display_name), user_path(user)),
                   :ip_address => link_to(user.creation_ip, :ip => user.creation_ip),
                   :date => l(user.creation_time, :format => :friendly) %>
       <% else %>

-        <%= raw t 'users.index.summary_no_ip',
+        <%= raw t "users.index.summary_no_ip",

                   :name => link_to(h(user.display_name), user_path(user)),
                   :date => l(user.creation_time, :format => :friendly) %>
       <% end %>
                   :name => link_to(h(user.display_name), user_path(user)),
                   :date => l(user.creation_time, :format => :friendly) %>
       <% end %>

diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb
index 8a5ea5ec2430a92ef2d6bc5a019d8f3298b208cb..89643c48c1b88cbee4a09b14b892debaab98d13d 100644 (file)
--- a/app/views/users/account.html.erb
+++ b/app/views/users/account.html.erb
@@ -3,125 +3,125 @@
 <% end %>
 
 <% content_for :heading do %>
 <% end %>
 
 <% content_for :heading do %>

-  <h1><%= t '.my settings' %></h1>
+  <h1><%= t ".my settings" %></h1>

   <ul class='secondary-actions clearfix'>
   <ul class='secondary-actions clearfix'>

-    <li><%= link_to t('.return to profile'), user_path(current_user) %></li>
-    <li><%= link_to t('users.show.oauth settings'), :controller => 'oauth_clients', :action => 'index' %></li>
+    <li><%= link_to t(".return to profile"), user_path(current_user) %></li>
+    <li><%= link_to t("users.show.oauth settings"), :controller => "oauth_clients", :action => "index" %></li>

   </ul>
 <% end %>
 
 <%= error_messages_for current_user %>
   </ul>
 <% end %>
 
 <%= error_messages_for current_user %>

-<%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => 'accountForm', :class => 'standard-form', :autocomplete => :off } do |f| %>
+<%= form_for current_user, :url => { :action => :account }, :method => :post, :html => { :multipart => true, :id => "accountForm", :class => "standard-form", :autocomplete => :off } do |f| %>

   <fieldset>
     <div class="form-row">
   <fieldset>
     <div class="form-row">

-      <label class="standard-label"><%= t 'users.new.display name' %></label>
+      <label class="standard-label"><%= t "users.new.display name" %></label>

       <%= f.text_field :display_name %>
     </div>
   </fieldset>
 
   <fieldset>
     <div class="form-row">
       <%= f.text_field :display_name %>
     </div>
   </fieldset>
 
   <fieldset>
     <div class="form-row">

-      <label class="standard-label"><%= t '.current email address' %></label>
+      <label class="standard-label"><%= t ".current email address" %></label>

       <input type="email" disabled value="<%= current_user.email %>" />
       <input type="email" disabled value="<%= current_user.email %>" />

-      <span class="form-help deemphasize"><%= t '.email never displayed publicly' %></span>
+      <span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span>

     </div>
 
     <div class="form-row">
     </div>
 
     <div class="form-row">

-      <label class="standard-label"><%= t '.new email address' %></label>
+      <label class="standard-label"><%= t ".new email address" %></label>

       <%= f.email_field :new_email, :autocomplete => :off %>
       <%= f.email_field :new_email, :autocomplete => :off %>

-      <span class="form-help deemphasize"><%= t '.email never displayed publicly' %></span>
+      <span class="form-help deemphasize"><%= t ".email never displayed publicly" %></span>

     </div>
   </fieldset>
 
   <fieldset>
     <div class="form-row">
     </div>
   </fieldset>
 
   <fieldset>
     <div class="form-row">

-        <label class="standard-label"><%= t 'users.new.password' %></label>
-      <%= f.password_field :pass_crypt, :value => '', :autocomplete => :off %>
+        <label class="standard-label"><%= t "users.new.password" %></label>
+      <%= f.password_field :pass_crypt, :value => "", :autocomplete => :off %>

     </div>
 
     <div class="form-row">
     </div>
 
     <div class="form-row">

-      <label class="standard-label"><%= t 'users.new.confirm password' %></label>
-      <%= f.password_field :pass_crypt_confirmation, :value => '', :autocomplete => :off %>
+      <label class="standard-label"><%= t "users.new.confirm password" %></label>
+      <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => :off %>

     </div>
   </fieldset>
 
   <fieldset>
     <div class="form-row">
     </div>
   </fieldset>
 
   <fieldset>
     <div class="form-row">

-      <label class="standard-label"><%= t '.external auth' %></label>
+      <label class="standard-label"><%= t ".external auth" %></label>

       <%= f.select :auth_provider, Auth::PROVIDERS %>
       <%= f.text_field :auth_uid %>
       <%= f.select :auth_provider, Auth::PROVIDERS %>
       <%= f.text_field :auth_uid %>

-      <span class="form-help deemphasize">(<a href="<%= t '.openid.link' %>" target="_new"><%= t '.openid.link text' %></a>)</span>
+      <span class="form-help deemphasize">(<a href="<%= t ".openid.link" %>" target="_new"><%= t ".openid.link text" %></a>)</span>

     </div>
   </fieldset>
 
   <fieldset class="form-divider">
     <div class="form-row">
     </div>
   </fieldset>
 
   <fieldset class="form-divider">
     <div class="form-row">

-      <label class="standard-label"><%= t '.public editing.heading' %></label>
+      <label class="standard-label"><%= t ".public editing.heading" %></label>

       <span class="form-help deemphasize">
         <% if current_user.data_public? %>
       <span class="form-help deemphasize">
         <% if current_user.data_public? %>

-          <%= t '.public editing.enabled' %>
-          (<a href="<%= t '.public editing.enabled link' %>" target="_new"><%= t '.public editing.enabled link text' %></a>)
+          <%= t ".public editing.enabled" %>
+          (<a href="<%= t ".public editing.enabled link" %>" target="_new"><%= t ".public editing.enabled link text" %></a>)

         <% else %>
         <% else %>

-          <%= t '.public editing.disabled' %>
-          (<a href="#public"><%= t '.public editing.disabled link text' %></a>)
+          <%= t ".public editing.disabled" %>
+          (<a href="#public"><%= t ".public editing.disabled link text" %></a>)

         <% end %>
       </span>
     </div>
 
     <div class="form-row">
         <% end %>
       </span>
     </div>
 
     <div class="form-row">

-      <label class="standard-label"><%= t '.contributor terms.heading' %></label>
+      <label class="standard-label"><%= t ".contributor terms.heading" %></label>

       <span class="form-help deemphasize">
         <% if current_user.terms_agreed? %>
       <span class="form-help deemphasize">
         <% if current_user.terms_agreed? %>

-          <%= t '.contributor terms.agreed' %>
-          (<a href="<%= t '.contributor terms.link' %>" target="_new"><%= t '.contributor terms.link text' %></a>)
+          <%= t ".contributor terms.agreed" %>
+          (<a href="<%= t ".contributor terms.link" %>" target="_new"><%= t ".contributor terms.link text" %></a>)

           <% if current_user.consider_pd? %>
           <% if current_user.consider_pd? %>

-            <%= t '.contributor terms.agreed_with_pd' %>
+            <%= t ".contributor terms.agreed_with_pd" %>

           <% end %>
         <% else %>
           <% end %>
         <% else %>

-          <%= t '.contributor terms.not yet agreed' %>
-          <%= link_to t('.contributor terms.review link text'), :controller => 'users', :action => 'terms' %>
+          <%= t ".contributor terms.not yet agreed" %>
+          <%= link_to t(".contributor terms.review link text"), :controller => "users", :action => "terms" %>

         <% end %>
       </span>
     </div>
     <div class="form-row">
         <% end %>
       </span>
     </div>
     <div class="form-row">

-      <label class="standard-label"><%= t '.preferred editor' %></label>
-      <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
+      <label class="standard-label"><%= t ".preferred editor" %></label>
+      <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>

     </div>
   </fieldset>
 
   <fieldset class="form-divider">
     <div class='form-row'>
     </div>
   </fieldset>
 
   <fieldset class="form-divider">
     <div class='form-row'>

-      <label class="standard-label"><%= t '.profile description' %></label>
+      <label class="standard-label"><%= t ".profile description" %></label>

       <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
     </div>
 
     <div class="form-row">
       <%= richtext_area :user, :description, :object => current_user, :cols => 80, :rows => 20 %>
     </div>
 
     <div class="form-row">

-      <label class="standard-label"><%= t '.preferred languages' %></label>
+      <label class="standard-label"><%= t ".preferred languages" %></label>

       <%= f.text_field :languages %>
     </div>
 
     <div class='form-row accountImage'>
       <%= f.text_field :languages %>
     </div>
 
     <div class='form-row accountImage'>

-      <label class="standard-label"><%= t '.image' %></label>
+      <label class="standard-label"><%= t ".image" %></label>

         <%= user_image current_user %>
         <ul class='form-list accountImage-options'>
         <% if current_user.image.file? %>
         <li>
           <%= radio_button_tag "image_action", "keep", !current_user.image_use_gravatar %>
         <%= user_image current_user %>
         <ul class='form-list accountImage-options'>
         <% if current_user.image.file? %>
         <li>
           <%= radio_button_tag "image_action", "keep", !current_user.image_use_gravatar %>

-          <label class='standard-label' for='image_action_keep'><%= t '.keep image' %></label>
+          <label class='standard-label' for='image_action_keep'><%= t ".keep image" %></label>

         </li>
         <% end %>
         <% if current_user.image.file? || current_user.image_use_gravatar? %>
         <li>
           <%= radio_button_tag "image_action", "delete" %>
         </li>
         <% end %>
         <% if current_user.image.file? || current_user.image_use_gravatar? %>
         <li>
           <%= radio_button_tag "image_action", "delete" %>

-          <label class='standard-label' for='image_action_delete'><%= t '.delete image' %></label>
+          <label class='standard-label' for='image_action_delete'><%= t ".delete image" %></label>

         </li>
         <% end %>
         <% if current_user.image.file? %>
           <li>
             <%= radio_button_tag "image_action", "new" %>
             <label class='standard-label' for='image_action_new'>
         </li>
         <% end %>
         <% if current_user.image.file? %>
           <li>
             <%= radio_button_tag "image_action", "new" %>
             <label class='standard-label' for='image_action_new'>

-                <%= t '.replace image' %>
-                <span class="form-help deemphasize"><%= t '.image size hint' %></span>
+                <%= t ".replace image" %>
+                <span class="form-help deemphasize"><%= t ".image size hint" %></span>

             </label>
             <%= f.file_field :image %>
           </li>
             </label>
             <%= f.file_field :image %>
           </li>


@@ -129,8 +129,8 @@
         <li>
           <%= radio_button_tag "image_action", "new" %>
           <label class='standard-label' for='image_action_new'>
         <li>
           <%= radio_button_tag "image_action", "new" %>
           <label class='standard-label' for='image_action_new'>

-            <%= t '.new image' %>
-            <span class="form-help deemphasize"><%= t '.image size hint' %></span>
+            <%= t ".new image" %>
+            <span class="form-help deemphasize"><%= t ".image size hint" %></span>

           </label>
           <%= f.file_field :image %>
         </li>
           </label>
           <%= f.file_field :image %>
         </li>


@@ -138,8 +138,8 @@
         <li>
           <%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %>
           <label class='standard-label' for='image_action_gravatar'>
         <li>
           <%= radio_button_tag "image_action", "gravatar", current_user.image_use_gravatar %>
           <label class='standard-label' for='image_action_gravatar'>

-            <%= t '.gravatar.gravatar' %>
-            <span class='form-help deemphasize'> (<a href="<%= t '.gravatar.link' %>" target="_new"><%= t '.gravatar.link text' %></a>)</span>
+            <%= t ".gravatar.gravatar" %>
+            <span class='form-help deemphasize'> (<a href="<%= t ".gravatar.link" %>" target="_new"><%= t ".gravatar.link text" %></a>)</span>

           </label>
         </li>
       </ul>
           </label>
         </li>
       </ul>


@@ -148,15 +148,15 @@
 
   <fieldset class="form-divider">
     <div class='form-row location clearfix'>
 
   <fieldset class="form-divider">
     <div class='form-row location clearfix'>

-    <label class="standard-label"><%= t '.home location' %></label>
+    <label class="standard-label"><%= t ".home location" %></label>

     <div id="homerow" <% unless current_user.home_lat and current_user.home_lon %>class="nohome"<% end %> >
     <div id="homerow" <% unless current_user.home_lat and current_user.home_lon %>class="nohome"<% end %> >

-      <p class="message form-help deemphasize"><%= t '.no home location' %></p>
+      <p class="message form-help deemphasize"><%= t ".no home location" %></p>

         <div class='form-column'>
         <div class='form-column'>

-          <label class="standard-label secondary"><%= t '.latitude' %></label>
+          <label class="standard-label secondary"><%= t ".latitude" %></label>

           <%= f.text_field :home_lat, :id => "home_lat" %>
         </div>
         <div class='form-column'>
           <%= f.text_field :home_lat, :id => "home_lat" %>
         </div>
         <div class='form-column'>

-          <label class="standard-label secondary"><%= t '.longitude' %></label>
+          <label class="standard-label secondary"><%= t ".longitude" %></label>

           <%= f.text_field :home_lon, :id => "home_lon" %>
         </div>
       </div>
           <%= f.text_field :home_lon, :id => "home_lon" %>
         </div>
       </div>


@@ -164,17 +164,17 @@
 
     <div class="form-row">
       <input type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
 
     <div class="form-row">
       <input type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />

-      <label class="standard-label" for="updatehome"><%= t '.update home location on click' %></label>
+      <label class="standard-label" for="updatehome"><%= t ".update home location on click" %></label>

     </div>
     <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
   </fieldset>
 
     </div>
     <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
   </fieldset>
 

-  <%= submit_tag t('.save changes button') %>
+  <%= submit_tag t(".save changes button") %>

 <% end %>
 
 <% unless current_user.data_public? %>
 <a name="public"></a>
 <% end %>
 
 <% unless current_user.data_public? %>
 <a name="public"></a>

-<h2><%= t '.public editing note.heading' %></h2>
-<%= raw t '.public editing note.text' %>
-  <%= button_to t('.make edits public button'), :action => :go_public %>
+<h2><%= t ".public editing note.heading" %></h2>
+<%= raw t ".public editing note.text" %>
+  <%= button_to t(".make edits public button"), :action => :go_public %>

 <% end %>
 <% end %>

diff --git a/app/views/users/blocked.html.erb b/app/views/users/blocked.html.erb
index 08ce4cc539454e02f3166332b3da6d02e3521bba..2b2ff06f663f3df883bba83db8be5f0348ef2cd3 100644 (file)
--- a/app/views/users/blocked.html.erb
+++ b/app/views/users/blocked.html.erb
@@ -1,10 +1,10 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t 'users.new.title' %></h1>
+  <h1><%= t "users.new.title" %></h1>

   <div class='header-illustration new-user-main'></div>
   <div class='header-illustration new-user-arm'></div>
 <% end %>
 
 <div class="message">
   <div class='header-illustration new-user-main'></div>
   <div class='header-illustration new-user-arm'></div>
 <% end %>
 
 <div class="message">

-  <h1><%= t 'users.new.no_auto_account_create' %></h1>
-  <h2><%= raw t 'users.new.contact_webmaster', :webmaster => "mailto:#{Settings.support_email}" %></h2>
+  <h1><%= t "users.new.no_auto_account_create" %></h1>
+  <h2><%= raw t "users.new.contact_webmaster", :webmaster => "mailto:#{Settings.support_email}" %></h2>

 </div>
 </div>

diff --git a/app/views/users/confirm.html.erb b/app/views/users/confirm.html.erb
index 167801cbbb84519fce0077d4df54203e11a88109..3a2e125789a66e818a843ea58d0ba3dff0eaec07 100644 (file)
--- a/app/views/users/confirm.html.erb
+++ b/app/views/users/confirm.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t '.heading' %></h1>
+  <h1><%= t ".heading" %></h1>

   <div class='header-illustration confirm-main'></div>
 <% end %>
 
   <div class='header-illustration confirm-main'></div>
 <% end %>
 


@@ -10,12 +10,12 @@
 
   <% content_for(:content_class) { "user_confirm" } %>
 
 
   <% content_for(:content_class) { "user_confirm" } %>
 

-  <p><%= t '.press confirm button' %></p>
+  <p><%= t ".press confirm button" %></p>

 
   <%= form_tag({}, { :id => "confirm" }) do %>
     <input type="display_name" name="confirm_string" value="<%= params[:display_name] %>">
     <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
 
   <%= form_tag({}, { :id => "confirm" }) do %>
     <input type="display_name" name="confirm_string" value="<%= params[:display_name] %>">
     <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">

-    <input type="submit" name="confirm_action" value="<%= t '.button' %>">
+    <input type="submit" name="confirm_action" value="<%= t ".button" %>">

   <% end %>
 <% else %>
   <h1>
   <% end %>
 <% else %>
   <h1>


@@ -26,5 +26,5 @@
   </h1>
 
   <p class='deemphasize'><%= t ".reconfirm_html",
   </h1>
 
   <p class='deemphasize'><%= t ".reconfirm_html",

-                               :reconfirm => url_for(:action => 'confirm_resend') %></p>
+                               :reconfirm => url_for(:action => "confirm_resend") %></p>

 <% end %>
 <% end %>

diff --git a/app/views/users/confirm_email.html.erb b/app/views/users/confirm_email.html.erb
index ecf3e1d3cec62ee568b3ba52084bdc362a53e3e0..65dca50aa4c1d683042f93154ab6a6352a0002ff 100644 (file)
--- a/app/views/users/confirm_email.html.erb
+++ b/app/views/users/confirm_email.html.erb
@@ -5,12 +5,12 @@
 <% content_for(:content_class) { "user_confirm" } %>
 
 <% content_for :heading do %>
 <% content_for(:content_class) { "user_confirm" } %>
 
 <% content_for :heading do %>

-  <h1><%= t '.heading' %></h1>
+  <h1><%= t ".heading" %></h1>

 <% end %>
 
 <% end %>
 

-<p><%= t '.press confirm button' %></p>
+<p><%= t ".press confirm button" %></p>

 
 <%= form_tag({}, { :id => "confirm" }) do %>
   <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
 
 <%= form_tag({}, { :id => "confirm" }) do %>
   <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">

-  <input type="submit" name="confirm_action" value="<%= t '.button' %>">
+  <input type="submit" name="confirm_action" value="<%= t ".button" %>">

 <% end %>
 <% end %>

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index deb0eab4c315bef77f2d94ab37ccbb89331a823d..ffaceeff012d8a00c0fa6313094451ca2a8b8b1a 100644 (file)
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,11 +1,11 @@
-<% @title = t('.title') %>
+<% @title = t(".title") %>

 
 <% content_for :head do %>
   <%= javascript_include_tag "user" %>
 <% end %>
 
 <% content_for :heading do %>
 
 <% content_for :head do %>
   <%= javascript_include_tag "user" %>
 <% end %>
 
 <% content_for :heading do %>

-  <h1><%= t('.heading') %></h1>
+  <h1><%= t(".heading") %></h1>

 <% end %>
 
 <% unless @users.empty? %>
 <% end %>
 
 <% unless @users.empty? %>


@@ -16,7 +16,7 @@
     <table id="user_list">
       <tr>
         <td colspan="2">
     <table id="user_list">
       <tr>
         <td colspan="2">

-          <%= t '.showing',
+          <%= t ".showing",

                 :page => @user_pages.current_page.number,
                 :first_item => @user_pages.current_page.first_item,
                 :last_item => @user_pages.current_page.last_item,
                 :page => @user_pages.current_page.number,
                 :first_item => @user_pages.current_page.first_item,
                 :last_item => @user_pages.current_page.last_item,


@@ -30,12 +30,12 @@
           <%= check_box_tag "user_all", "1", false %>
         </td>
       </tr>
           <%= check_box_tag "user_all", "1", false %>
         </td>
       </tr>

-      <%= render :partial => 'user', :collection => @users %>
+      <%= render :partial => "user", :collection => @users %>

     </table>
 
     <div id="user_list_actions buttons">
     </table>
 
     <div id="user_list_actions buttons">

-      <%= submit_tag t('.confirm'), :name => "confirm" %>
-      <%= submit_tag t('.hide'), :name => "hide" %>
+      <%= submit_tag t(".confirm"), :name => "confirm" %>
+      <%= submit_tag t(".hide"), :name => "hide" %>

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

diff --git a/app/views/users/login.html.erb b/app/views/users/login.html.erb
index 2e7217f192597a53364e400f52d0a5d3ffc9dc77..9bfa23cbc75dc979d51a84571708c88ac19a8e1b 100644 (file)
--- a/app/views/users/login.html.erb
+++ b/app/views/users/login.html.erb
@@ -3,41 +3,41 @@
 <% end %>
 
 <% content_for :heading do %>
 <% end %>
 
 <% content_for :heading do %>

-  <h1><%= t '.heading' %></h1>
+  <h1><%= t ".heading" %></h1>

 <% end %>
 
 <div id="login_login">
   <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>
 <% end %>
 
 <div id="login_login">
   <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %>

-    <%= hidden_field_tag('referer', h(params[:referer])) %>
+    <%= hidden_field_tag("referer", h(params[:referer])) %>

 
 

-    <p class='deemphasize'><%= t '.no account' %> <%= link_to t('.register now'), :action => :new, :referer => params[:referer] %></p>
+    <p class='deemphasize'><%= t ".no account" %> <%= link_to t(".register now"), :action => :new, :referer => params[:referer] %></p>

 
     <div id="loginForm" class="standard-form">
 
       <fieldset>
         <div class="form-row">
           <label for="username" class="standard-label">
 
     <div id="loginForm" class="standard-form">
 
       <fieldset>
         <div class="form-row">
           <label for="username" class="standard-label">

-            <%= t '.email or username' %>
+            <%= t ".email or username" %>

           </label>
           <%= text_field_tag "username", params[:username], :tabindex => 1 %>
         </div>
         <div class="form-row">
           <label for="password" class="standard-label">
           </label>
           <%= text_field_tag "username", params[:username], :tabindex => 1 %>
         </div>
         <div class="form-row">
           <label for="password" class="standard-label">

-            <%= t '.password' %>
+            <%= t ".password" %>

           </label>
           <%= password_field_tag "password", "", :tabindex => 2 %>
         </div>
         <span class="form-help deemphasize">
           </label>
           <%= password_field_tag "password", "", :tabindex => 2 %>
         </div>
         <span class="form-help deemphasize">

-          <%= link_to t('.lost password link'), :controller => 'users', :action => 'lost_password' %>
+          <%= link_to t(".lost password link"), :controller => "users", :action => "lost_password" %>

         </span>
       </fieldset>
 
       <fieldset>
         <%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %>
         <label for="remember_me" class="standard-label">
         </span>
       </fieldset>
 
       <fieldset>
         <%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %>
         <label for="remember_me" class="standard-label">

-          <%= t '.remember' %>
+          <%= t ".remember" %>

         </label>
         </label>

-        <%= submit_tag t('.login_button'), :tabindex => 4 %>
+        <%= submit_tag t(".login_button"), :tabindex => 4 %>

       </fieldset>
 
     </div>
       </fieldset>
 
     </div>


@@ -49,7 +49,7 @@
 
       <fieldset class='form-divider'>
 
 
       <fieldset class='form-divider'>
 

-        <p class='standard-label'><%= t '.with external' %></p>
+        <p class='standard-label'><%= t ".with external" %></p>

 
         <ul class='clearfix' id="login_auth_buttons">
           <li><%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %></li>
 
         <ul class='clearfix' id="login_auth_buttons">
           <li><%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %></li>


@@ -74,13 +74,13 @@
         </ul>
 
         <div id='login_openid_url' class='form-row'>
         </ul>
 
         <div id='login_openid_url' class='form-row'>

-          <label for='openid_url' class="standard-label"><%= raw t '.openid', :logo => openid_logo %></label>
+          <label for='openid_url' class="standard-label"><%= raw t ".openid", :logo => openid_logo %></label>

           <%= hidden_field_tag("openid_referer", params[:referer]) if params[:referer] %>
           <%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url") %>
           <%= hidden_field_tag("openid_referer", params[:referer]) if params[:referer] %>
           <%= text_field_tag("openid_url", "", :tabindex => 3, :class => "openid_url") %>

-          <span class="minorNote">(<a href="<%= t 'users.account.openid.link' %>" target="_new"><%= t 'users.account.openid.link text' %></a>)</span>
+          <span class="minorNote">(<a href="<%= t "users.account.openid.link" %>" target="_new"><%= t "users.account.openid.link text" %></a>)</span>

         </div>
 
         </div>
 

-        <%= submit_tag t('.login_button'), :tabindex => 6, :id => "login_openid_submit" %>
+        <%= submit_tag t(".login_button"), :tabindex => 6, :id => "login_openid_submit" %>

 
       </fieldset>
 
 
       </fieldset>
 

diff --git a/app/views/users/logout.html.erb b/app/views/users/logout.html.erb
index f0faae9c4b5be2df21f76241eef05fc34bfe9912..273c7e1b94d0c7f39fd042481a2fbbb058e9c0c5 100644 (file)
--- a/app/views/users/logout.html.erb
+++ b/app/views/users/logout.html.erb
@@ -1,9 +1,9 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t '.heading' %></h1>
+  <h1><%= t ".heading" %></h1>

 <% end %>
 
 <%= form_tag :action => "logout" do %>
   <%= hidden_field_tag("referer", h(params[:referer])) %>
   <%= hidden_field_tag("session", session.id) %>
 <% end %>
 
 <%= form_tag :action => "logout" do %>
   <%= hidden_field_tag("referer", h(params[:referer])) %>
   <%= hidden_field_tag("session", session.id) %>

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

 <% end %>
 <% end %>

diff --git a/app/views/users/lost_password.html.erb b/app/views/users/lost_password.html.erb
index 46d18b4300f2af3b92ba53a61307a4d67afeab43..3cfd8cc83f88dcbf929c17fcbf90ba1656453541 100644 (file)
--- a/app/views/users/lost_password.html.erb
+++ b/app/views/users/lost_password.html.erb
@@ -1,13 +1,13 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t '.heading' %></h1>
+  <h1><%= t ".heading" %></h1>

 <% end %>
 
 <% end %>
 

-<p><%= t '.help_text' %></p>
+<p><%= t ".help_text" %></p>

 
 

-<%= form_tag :action => 'lost_password' do %>
+<%= form_tag :action => "lost_password" do %>

   <div class="standard-form">
   <div class="standard-form">

-    <label class="standard-label"><%= t '.email address' %></label>
-    <%= text_field('user', 'email', :tabindex => 1) %>
-    <%= submit_tag t('.new password button'), :tabindex => 2 %>
+    <label class="standard-label"><%= t ".email address" %></label>
+    <%= text_field("user", "email", :tabindex => 1) %>
+    <%= submit_tag t(".new password button"), :tabindex => 2 %>

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

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index b84adca888b24720a56e890694d59dc53988a7b0..69b5800a4d774d442935db05ae3a0cc8f7873298 100644 (file)
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -3,66 +3,66 @@
 <% end %>
 
 <% content_for :heading do %>
 <% end %>
 
 <% content_for :heading do %>

-  <h1><%= t '.title' %></h1>
+  <h1><%= t ".title" %></h1>

   <div class='header-illustration new-user-main'></div>
   <div class='header-illustration new-user-arm'></div>
 <% end %>
 
   <div class='header-illustration new-user-main'></div>
   <div class='header-illustration new-user-arm'></div>
 <% end %>
 

-<%= form_for current_user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do |f| %>
-  <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
+<%= form_for current_user, :url => { :action => "create" }, :html => { :class => "standard-form fillL col6 inner22" } do |f| %>
+  <%= hidden_field_tag("referer", h(@referer)) unless @referer.nil? %>

 
   <fieldset>
     <div class="form-row">
       <label for="email" class="standard-label">
 
   <fieldset>
     <div class="form-row">
       <label for="email" class="standard-label">

-        <%= t '.email address' %>
+        <%= t ".email address" %>

       </label>
       <%= f.email_field(:email, :tabindex => 1) %>
       <%= f.error_message_on(:email) %>
     </div>
     <div class="form-row">
       <label for="email_confirmation" class="standard-label">
       </label>
       <%= f.email_field(:email, :tabindex => 1) %>
       <%= f.error_message_on(:email) %>
     </div>
     <div class="form-row">
       <label for="email_confirmation" class="standard-label">

-        <%= t '.confirm email address' %>
+        <%= t ".confirm email address" %>

       </label>
       <%= f.email_field(:email_confirmation, :tabindex => 2) %>
       <%= f.error_message_on(:email_confirmation) %>
     </div>
       </label>
       <%= f.email_field(:email_confirmation, :tabindex => 2) %>
       <%= f.error_message_on(:email_confirmation) %>
     </div>

-    <span class="form-help deemphasize"><%= raw(t '.not displayed publicly') %></span>
+    <span class="form-help deemphasize"><%= raw(t ".not displayed publicly") %></span>

   </fieldset>
 
   <fieldset>
     <div class="form-row">
       <label for="display_name" class="standard-label">
   </fieldset>
 
   <fieldset>
     <div class="form-row">
       <label for="display_name" class="standard-label">

-        <%= t '.display name' %>
+        <%= t ".display name" %>

       </label>
       <%= f.text_field(:display_name, :tabindex => 3) %>
       <%= f.error_message_on(:display_name) %>
     </div>
       </label>
       <%= f.text_field(:display_name, :tabindex => 3) %>
       <%= f.error_message_on(:display_name) %>
     </div>

-    <span class="form-help deemphasize"><%= t '.display name description' %></span>
+    <span class="form-help deemphasize"><%= t ".display name description" %></span>

   </fieldset>
 
   <fieldset class="form-divider" id="auth_field">
     <div class="form-row">
       <label for="openid_url" class="standard-label">
   </fieldset>
 
   <fieldset class="form-divider" id="auth_field">
     <div class="form-row">
       <label for="openid_url" class="standard-label">

-        <%= raw t '.external auth' %>
+        <%= raw t ".external auth" %>

       </label>
       <%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %>
       <%= f.text_field(:auth_uid, :tabindex => 5) %>
       <%= f.error_message_on(:auth_uid) %>
     </div>
       </label>
       <%= f.select(:auth_provider, Auth::PROVIDERS, :default => "", :tabindex => 4) %>
       <%= f.text_field(:auth_uid, :tabindex => 5) %>
       <%= f.error_message_on(:auth_uid) %>
     </div>

-    <span class="form-help deemphasize"><%= t '.auth no password' %></span>
+    <span class="form-help deemphasize"><%= t ".auth no password" %></span>

   </fieldset>
 
   <fieldset>
     <div class="form-row">
       <label for='user[pass_crypt]' class="standard-label">
   </fieldset>
 
   <fieldset>
     <div class="form-row">
       <label for='user[pass_crypt]' class="standard-label">

-        <%= t '.password' %>
+        <%= t ".password" %>

       </label>
       <%= f.password_field(:pass_crypt, :tabindex => 6) %>
       <%= f.error_message_on(:pass_crypt) %>
     </div>
     <div class="form-row">
       <label class="standard-label">
       </label>
       <%= f.password_field(:pass_crypt, :tabindex => 6) %>
       <%= f.error_message_on(:pass_crypt) %>
     </div>
     <div class="form-row">
       <label class="standard-label">

-        <%= t '.confirm password' %>
+        <%= t ".confirm password" %>

       </label>
       <%= f.password_field(:pass_crypt_confirmation, :tabindex => 7) %>
       <%= f.error_message_on(:pass_crypt_confirmation) %>
       </label>
       <%= f.password_field(:pass_crypt_confirmation, :tabindex => 7) %>
       <%= f.error_message_on(:pass_crypt_confirmation) %>


@@ -73,10 +73,10 @@
     <%= link_to raw(t(".use external auth")), "#", :id => "auth_enable" %>
   </div>
 
     <%= link_to raw(t(".use external auth")), "#", :id => "auth_enable" %>
   </div>
 

-  <%= submit_tag t('.continue'), :tabindex => 8 %>
+  <%= submit_tag t(".continue"), :tabindex => 8 %>

 <% end %>
 
 <div class='aside col6 deemphasize inner22'>
 <% end %>
 
 <div class='aside col6 deemphasize inner22'>

-  <h4><%= t '.about.header' %></h4>
-  <%= t '.about.html' %>
+  <h4><%= t ".about.header" %></h4>
+  <%= t ".about.html" %>

 </div>
 </div>

diff --git a/app/views/users/no_such_user.html.erb b/app/views/users/no_such_user.html.erb
index 6cab0f54cf683d7ca2c92e7facec63cbeae4f2b2..8f94cf372a8c922dfc58566d2a0217d5ceb8705c 100644 (file)
--- a/app/views/users/no_such_user.html.erb
+++ b/app/views/users/no_such_user.html.erb
@@ -1,4 +1,4 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t '.heading', :user => h(@not_found_user) %></h1>
+  <h1><%= t ".heading", :user => h(@not_found_user) %></h1>

 <% end %>
 <% end %>

-<p><%= t '.body', :user => h(@not_found_user) %></p>
+<p><%= t ".body", :user => h(@not_found_user) %></p>

diff --git a/app/views/users/reset_password.html.erb b/app/views/users/reset_password.html.erb
index afa4cb202f3ad500eeab01ff8f470032db4ebaf9..6290cca969ba36898959656ffcf41623b604e47e 100644 (file)
--- a/app/views/users/reset_password.html.erb
+++ b/app/views/users/reset_password.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-  <h1><%= t '.heading', :user => current_user.display_name %></h1>
+  <h1><%= t ".heading", :user => current_user.display_name %></h1>

 <% end %>
 
 <%= error_messages_for current_user %>
 <% end %>
 
 <%= error_messages_for current_user %>


@@ -8,13 +8,13 @@
 <%= hidden_field_tag(:token, params[:token]) %>
   <div class="standard-form">
     <fieldset>
 <%= hidden_field_tag(:token, params[:token]) %>
   <div class="standard-form">
     <fieldset>

-      <label class="standard-label"><%= t '.password' %></label>
-      <%= password_field(:user, :pass_crypt, :value => '', :tabindex => 4) %>
+      <label class="standard-label"><%= t ".password" %></label>
+      <%= password_field(:user, :pass_crypt, :value => "", :tabindex => 4) %>

     </fieldset>
     <fieldset>
     </fieldset>
     <fieldset>

-      <label class="standard-label"><%= t '.confirm password' %></label>
-      <%= password_field(:user, :pass_crypt_confirmation, :value => '', :tabindex => 5) %>
+      <label class="standard-label"><%= t ".confirm password" %></label>
+      <%= password_field(:user, :pass_crypt_confirmation, :value => "", :tabindex => 5) %>

     </fieldset>
     </fieldset>

-    <%= submit_tag t('.reset'), :tabindex => 6 %>
+    <%= submit_tag t(".reset"), :tabindex => 6 %>

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

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 4f08b63513b550e123ed39e65bfff8307e9364f4..baf788f84b649a60aa8ec679c877789c995b7a36 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -7,37 +7,37 @@
         <!-- Displaying user's own profile page to themself -->
         <ul class='secondary-actions clearfix'>
           <li>
         <!-- Displaying user's own profile page to themself -->
         <ul class='secondary-actions clearfix'>
           <li>

-            <%= link_to t('.my edits'), :controller => 'changesets', :action => 'index', :display_name => current_user.display_name %>
+            <%= link_to t(".my edits"), :controller => "changesets", :action => "index", :display_name => current_user.display_name %>

             <span class='count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
           </li>
           <li>
             <span class='count-number'><%= number_with_delimiter(current_user.changesets.size) %></span>
           </li>
           <li>

-            <%= link_to t('.my notes'), :controller => 'notes', :action => 'mine' %>
+            <%= link_to t(".my notes"), :controller => "notes", :action => "mine" %>

           </li>
           <li>
           </li>
           <li>

-            <%= link_to t('.my traces'), :controller => 'traces', :action => 'mine' %>
+            <%= link_to t(".my traces"), :controller => "traces", :action => "mine" %>

             <span class='count-number'><%= number_with_delimiter(current_user.traces.size) %></span>
           </li>
           <li>
             <span class='count-number'><%= number_with_delimiter(current_user.traces.size) %></span>
           </li>
           <li>

-            <%= link_to t('.my diary'), :controller => 'diary_entries', :action => 'index', :display_name => current_user.display_name %>
+            <%= link_to t(".my diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %>

             <span class='count-number'><%= number_with_delimiter(current_user.diary_entries.size) %></span>
           </li>
           <li>
             <span class='count-number'><%= number_with_delimiter(current_user.diary_entries.size) %></span>
           </li>
           <li>

-            <%= link_to t('.my comments'), :controller => 'diary_entries', :action => 'comments', :display_name => current_user.display_name %>
+            <%= link_to t(".my comments"), :controller => "diary_entries", :action => "comments", :display_name => current_user.display_name %>

           </li>
           <li>
           </li>
           <li>

-            <%= link_to t('.my settings'), :controller => 'users', :action => 'account', :display_name => current_user.display_name %>
+            <%= link_to t(".my settings"), :controller => "users", :action => "account", :display_name => current_user.display_name %>

           </li>
 
           <% if current_user.blocks.exists? %>
             <li>
           </li>
 
           <% if current_user.blocks.exists? %>
             <li>

-              <%= link_to t('.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => current_user.display_name %>
+              <%= link_to t(".blocks on me"), :controller => "user_blocks", :action => "blocks_on", :display_name => current_user.display_name %>

               <span class='count-number'><%= number_with_delimiter(current_user.blocks.active.size) %></span>
             </li>
           <% end %>
 
           <% if current_user and current_user.moderator? and current_user.blocks_created.exists? %>
             <li>
               <span class='count-number'><%= number_with_delimiter(current_user.blocks.active.size) %></span>
             </li>
           <% end %>
 
           <% if current_user and current_user.moderator? and current_user.blocks_created.exists? %>
             <li>

-              <%= link_to t('.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => current_user.display_name %>
+              <%= link_to t(".blocks by me"), :controller => "user_blocks", :action => "blocks_by", :display_name => current_user.display_name %>

               <span class='count-number'><%= number_with_delimiter(current_user.blocks_created.active.size) %></span>
             </li>
           <% end %>
               <span class='count-number'><%= number_with_delimiter(current_user.blocks_created.active.size) %></span>
             </li>
           <% end %>


@@ -49,56 +49,56 @@
         <ul class='secondary-actions clearfix'>
 
           <li>
         <ul class='secondary-actions clearfix'>
 
           <li>

-            <%= link_to t('.edits'), :controller => 'changesets', :action => 'index', :display_name => @user.display_name %>
+            <%= link_to t(".edits"), :controller => "changesets", :action => "index", :display_name => @user.display_name %>

             <span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
           </li>
           <li>
             <span class='count-number'><%= number_with_delimiter(@user.changesets.size) %></span>
           </li>
           <li>

-            <%= link_to t('.notes'), :controller => 'notes', :action => 'mine' %>
+            <%= link_to t(".notes"), :controller => "notes", :action => "mine" %>

           </li>
           <li>
           </li>
           <li>

-            <%= link_to t('.traces'), :controller => 'traces', :action => 'index', :display_name => @user.display_name %>
+            <%= link_to t(".traces"), :controller => "traces", :action => "index", :display_name => @user.display_name %>

             <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
           </li>
 
           <!-- Displaying another user's profile page -->
 
           <li>
             <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
           </li>
 
           <!-- Displaying another user's profile page -->
 
           <li>

-            <%= link_to t('.send message'), new_message_path(@user) %>
+            <%= link_to t(".send message"), new_message_path(@user) %>

           </li>
           <li>
           </li>
           <li>

-            <%= link_to t('.diary'), :controller => 'diary_entries', :action => 'index', :display_name => @user.display_name %>
+            <%= link_to t(".diary"), :controller => "diary_entries", :action => "index", :display_name => @user.display_name %>

             <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
           </li>
           <li>
             <span class='count-number'><%= number_with_delimiter(@user.diary_entries.size) %></span>
           </li>
           <li>

-            <%= link_to t('.comments'), :controller => 'diary_entries', :action => 'comments', :display_name => @user.display_name %>
+            <%= link_to t(".comments"), :controller => "diary_entries", :action => "comments", :display_name => @user.display_name %>

           </li>
           <li>
             <% if current_user and current_user.is_friends_with?(@user) %>
           </li>
           <li>
             <% if current_user and current_user.is_friends_with?(@user) %>

-              <%= link_to t('.remove as friend'), remove_friend_path(:display_name => @user.display_name), :method => :post %>
+              <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %>

             <% elsif current_user %>
             <% elsif current_user %>

-              <%= link_to t('.add as friend'), make_friend_path(:display_name => @user.display_name), :method => :post %>
+              <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %>

             <% else %>
             <% else %>

-              <%= link_to t('.add as friend'), make_friend_path(:display_name => @user.display_name) %>
+              <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name) %>

             <% end %>
           </li>
 
           <% if @user.blocks.exists? %>
             <li>
             <% end %>
           </li>
 
           <% if @user.blocks.exists? %>
             <li>

-              <%= link_to t('.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %>
+              <%= link_to t(".block_history"), :controller => "user_blocks", :action => "blocks_on", :display_name => @user.display_name %>

               <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
             </li>
           <% end %>
 
           <% if @user.moderator? and @user.blocks_created.exists? %>
             <li>
               <span class='count-number'><%= number_with_delimiter(@user.blocks.active.size) %></span>
             </li>
           <% end %>
 
           <% if @user.moderator? and @user.blocks_created.exists? %>
             <li>

-              <%= link_to t('.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %>
+              <%= link_to t(".moderator_history"), :controller => "user_blocks", :action => "blocks_by", :display_name => @user.display_name %>

               <span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
             </li>
           <% end %>
 
           <% if current_user and current_user.moderator? %>
             <li>
               <span class='count-number'><%= number_with_delimiter(@user.blocks_created.active.size) %></span>
             </li>
           <% end %>
 
           <% if current_user and current_user.moderator? %>
             <li>

-            <%= link_to t('.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @user.display_name %>
+            <%= link_to t(".create_block"), :controller => "user_blocks", :action => "new", :display_name => @user.display_name %>

             </li>
           <% end %>
 
             </li>
           <% end %>
 


@@ -116,28 +116,28 @@
         <ul class='secondary-actions clearfix'>
           <% if ["active", "confirmed"].include? @user.status %>
             <li>
         <ul class='secondary-actions clearfix'>
           <% if ["active", "confirmed"].include? @user.status %>
             <li>

-              <%= link_to t('.deactivate_user'), set_status_user_path(:status => 'pending', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
+              <%= link_to t(".deactivate_user"), set_status_user_path(:status => "pending", :display_name => @user.display_name), :data => { :confirm => t(".confirm") } %>

             </li>
           <% elsif ["pending"].include? @user.status %>
             <li>
             </li>
           <% elsif ["pending"].include? @user.status %>
             <li>

-              <%= link_to t('.activate_user'), set_status_user_path(:status => 'active', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
+              <%= link_to t(".activate_user"), set_status_user_path(:status => "active", :display_name => @user.display_name), :data => { :confirm => t(".confirm") } %>

             </li>
           <% end %>
 
           <% if ["active", "suspended"].include? @user.status %>
             <li>
             </li>
           <% end %>
 
           <% if ["active", "suspended"].include? @user.status %>
             <li>

-              <%= link_to t('.confirm_user'), set_status_user_path(:status => 'confirmed', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
+              <%= link_to t(".confirm_user"), set_status_user_path(:status => "confirmed", :display_name => @user.display_name), :data => { :confirm => t(".confirm") } %>

             </li>
           <% end %>
             <li>
               <% if ["pending", "active", "confirmed", "suspended"].include? @user.status %>
             </li>
           <% end %>
             <li>
               <% if ["pending", "active", "confirmed", "suspended"].include? @user.status %>

-                <%= link_to t('.hide_user'), set_status_user_path(:status => 'deleted', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
+                <%= link_to t(".hide_user"), set_status_user_path(:status => "deleted", :display_name => @user.display_name), :data => { :confirm => t(".confirm") } %>

             <% else %>
             <% else %>

-              <%= link_to t('.unhide_user'), set_status_user_path(:status => 'active', :display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
+              <%= link_to t(".unhide_user"), set_status_user_path(:status => "active", :display_name => @user.display_name), :data => { :confirm => t(".confirm") } %>

             </li>
           <% end %>
           <li>
             </li>
           <% end %>
           <li>

-            <%= link_to t('.delete_user'), delete_user_path(:display_name => @user.display_name), :data => { :confirm => t('.confirm') } %>
+            <%= link_to t(".delete_user"), delete_user_path(:display_name => @user.display_name), :data => { :confirm => t(".confirm") } %>

           </li>
         </ul>
 
           </li>
         </ul>
 


@@ -145,14 +145,14 @@
 
       <p class='deemphasize'>
         <small>
 
       <p class='deemphasize'>
         <small>

-          <%= t '.mapper since' %> <%= l @user.creation_time.to_date, :format => :long %>
+          <%= t ".mapper since" %> <%= l @user.creation_time.to_date, :format => :long %>

           <% unless @user.terms_agreed %>
             |
           <% unless @user.terms_agreed %>
             |

-            <%= t '.ct status' %>
+            <%= t ".ct status" %>

             <% if @user.terms_seen? -%>
             <% if @user.terms_seen? -%>

-              <%= t '.ct declined' %>
+              <%= t ".ct declined" %>

             <% else -%>
             <% else -%>

-              <%= t '.ct undecided' %>
+              <%= t ".ct undecided" %>

             <% end -%>
           <% end -%>
         </small>
             <% end -%>
           <% end -%>
         </small>


@@ -165,12 +165,12 @@
 
   <% if current_user and current_user.administrator? -%>
     <div class='admin-user-info deemphasize'>
 
   <% if current_user and current_user.administrator? -%>
     <div class='admin-user-info deemphasize'>

-      <small><b><%= t '.email address' %></b> <%= @user.email %></small>
+      <small><b><%= t ".email address" %></b> <%= @user.email %></small>

       <% unless @user.creation_ip.nil? -%>
       <% unless @user.creation_ip.nil? -%>

-        <small><b><%= t '.created from' %></b> <%= @user.creation_ip %></small>
+        <small><b><%= t ".created from" %></b> <%= @user.creation_ip %></small>

       <% end -%>
       <% end -%>

-      <small><b><%= t '.status' %></b> <%= @user.status.capitalize %></small>
-      <small><b><%= t '.spam score' %></b> <%= @user.spam_score %></small>
+      <small><b><%= t ".status" %></b> <%= @user.status.capitalize %></small>
+      <small><b><%= t ".spam score" %></b> <%= @user.spam_score %></small>

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


@@ -179,7 +179,7 @@
   <% if current_user and @user.id == current_user.id %>
     <% if @user.home_lat.nil? or @user.home_lon.nil? %>
       <div id="map" class="content_map">
   <% if current_user and @user.id == current_user.id %>
     <% if @user.home_lat.nil? or @user.home_lon.nil? %>
       <div id="map" class="content_map">

-        <p id="no_home_location"><%= raw(t '.if set location', :settings_link => (link_to t('.settings_link_text'), :controller => 'users', :action => 'account', :display_name => current_user.display_name)) %></p>
+        <p id="no_home_location"><%= raw(t ".if set location", :settings_link => (link_to t(".settings_link_text"), :controller => "users", :action => "account", :display_name => current_user.display_name)) %></p>

       </div>
     <% else %>
       <% content_for :head do %>
       </div>
     <% else %>
       <% content_for :head do %>


@@ -200,14 +200,14 @@
     <% nearby = @user.nearby - friends %>
 
   <div class="activity-block column-1">
     <% nearby = @user.nearby - friends %>
 
   <div class="activity-block column-1">

-    <h3><%= t '.my friends' %></h3>
+    <h3><%= t ".my friends" %></h3>

 
     <% if friends.empty? %>
 
     <% if friends.empty? %>

-      <%= t '.no friends' %>
+      <%= t ".no friends" %>

     <% else %>
       <ul class='secondary-actions clearfix'>
     <% else %>
       <ul class='secondary-actions clearfix'>

-        <li><%= link_to t('.friends_changesets'), friend_changesets_path %></li>
-        <li><%= link_to t('.friends_diaries'), friend_diaries_path %></li>
+        <li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
+        <li><%= link_to t(".friends_diaries"), friend_diaries_path %></li>

       </ul>
       <div id="friends-container">
         <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
       </ul>
       <div id="friends-container">
         <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>


@@ -216,14 +216,14 @@
   </div>
 
   <div class="activity-block column-1">
   </div>
 
   <div class="activity-block column-1">

-    <h3><%= t '.nearby users' %></h3>
+    <h3><%= t ".nearby users" %></h3>

 
     <% if nearby.empty? %>
 
     <% if nearby.empty? %>

-      <%= t '.no nearby users' %>
+      <%= t ".no nearby users" %>

     <% else %>
       <ul class='secondary-actions clearfix'>
     <% else %>
       <ul class='secondary-actions clearfix'>

-        <li><%= link_to t('.nearby_changesets'), nearby_changesets_path %></li>
-        <li><%= link_to t('.nearby_diaries'), nearby_diaries_path %></li>
+        <li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
+        <li><%= link_to t(".nearby_diaries"), nearby_diaries_path %></li>

       </ul>
       <div id="nearbyusers">
         <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
       </ul>
       <div id="nearbyusers">
         <%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>

diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb
index acd617653df630fd4c620a1316195216affdd71d..a42ccd4752c42bade366940f2a50d7fd2e6b41cd 100644 (file)
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :heading do %>
 <% end %>
 
 <% content_for :heading do %>

-  <h1><%= t '.heading' %></h1>
+  <h1><%= t ".heading" %></h1>

   <div class='header-illustration new-user-terms'></div>
 <% end %>
 
   <div class='header-illustration new-user-terms'></div>
 <% end %>
 


@@ -11,14 +11,14 @@
   <!-- legale is <%= @legale %> -->
   <div class='form-row horizontal-list'>
     <label class="standard-label">
   <!-- legale is <%= @legale %> -->
   <div class='form-row horizontal-list'>
     <label class="standard-label">

-      <%= t '.legale_select' %>
+      <%= t ".legale_select" %>

     </label>
 
     </label>
 

-    <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %>
+    <% [["france", "FR"], ["italy", "IT"], ["rest_of_world", "GB"]].each do |name, legale| %>

       <div class="form-row">
         <label for="legale_<%= legale %>">
       <div class="form-row">
         <label for="legale_<%= legale %>">

-          <%= radio_button_tag 'legale', legale, @legale == legale, :data => { :url => url_for(:legale => legale) } %>
-          <%= t('.legale_names.' + name) %>
+          <%= radio_button_tag "legale", legale, @legale == legale, :data => { :url => url_for(:legale => legale) } %>
+          <%= t(".legale_names." + name) %>

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


@@ -30,24 +30,24 @@
 
   <div class="form-row">
     <label for="user_consider_pd">
 
   <div class="form-row">
     <label for="user_consider_pd">

-      <%= check_box('user', 'consider_pd') %>
-      <%= t '.consider_pd' %>
+      <%= check_box("user", "consider_pd") %>
+      <%= t ".consider_pd" %>

     </label>
     </label>

-    <span class="minorNote">(<%= link_to(t('.consider_pd_why'), t('.consider_pd_why_url'), :target => :new) %>)</span>
+    <span class="minorNote">(<%= link_to(t(".consider_pd_why"), t(".consider_pd_why_url"), :target => :new) %>)</span>

 
 

-    <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
+    <%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %>

 
     <div class="buttons form-row inner20 clearfix">
 
     <div class="buttons form-row inner20 clearfix">

-      <p class="deemphasize"><%= t '.read and accept' %></p>
-      <%= submit_tag(t('.agree'), :name => "agree", :id => "agree") %>
-      <%= submit_tag(t('.decline'), :name => "decline", :id => "decline") %>
+      <p class="deemphasize"><%= t ".read and accept" %></p>
+      <%= submit_tag(t(".agree"), :name => "agree", :id => "agree") %>
+      <%= submit_tag(t(".decline"), :name => "decline", :id => "decline") %>

     </div>
 
     <div class="deemphasize">
       <p id="contributorGuidance">
     </div>
 
     <div class="deemphasize">
       <p id="contributorGuidance">

-        <%= raw t '.guidance',
-                  :summary => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
-                  :translations => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
+        <%= raw t ".guidance",
+                  :summary => "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary",
+                  :translations => "https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations" %>

       </p>
     </div>
   </div>
       </p>
     </div>
   </div>