Merge remote-tracking branch 'upstream/pull/1983'

[rails.git] / app / views / site / help.html.erb

diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index a1b1adb9227949f6a2c0af3c89443d260acc70c3..085ea63d53eb69bccd5660d2e2765dc937f071c5 100644 (file)
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -1,18 +1,18 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

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

 <% end %>
 
 <% end %>
 

-<p class='introduction'><%= t "help_page.introduction" %></p>
+<p class='introduction'><%= t ".introduction" %></p>

 
 

-<% ['welcome', 'help', 'wiki'].each do |site| %>
-  <% unless site == 'welcome' && !@user %>
+<% ['welcome', 'beginners_guide', 'help', 'mailing_lists', 'forums', 'irc', 'switch2osm', 'wiki'].each do |site| %>
+  <% unless site == 'welcome' && !current_user %>

   <div class='<%= site %> help-item'>
   <h3>
   <div class='<%= site %> help-item'>
   <h3>

-    <a href='<%= t "help_page.#{site}.url" %>'>
-      <%= t "help_page.#{site}.title" %>
+    <a href='<%= t ".#{site}.url" %>'>
+      <%= t ".#{site}.title" %>

     </a>
   </h3>
     </a>
   </h3>

-  <p><%= t "help_page.#{site}.description" %></p>
+  <p><%= t ".#{site}.description" %></p>

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