Use cancancan to authorize user_preference_controller

[rails.git] / app / views / user / terms.html.erb

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index 3d8cb22f72c19555b27bac45ed4ff1e07f4a825e..a836c859020a3d3526d538d60718ba4d4b58735a 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :heading do %>
-  <h1><%= t 'user.terms.heading' %></h1>
+  <h1><%= t '.heading' %></h1>
   <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">
-      <%= t 'user.terms.legale_select' %>
+      <%= t '.legale_select' %>
     </label>
 
     <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %>
       <div class="form-row">
         <label for="legale_<%= legale %>">
           <%= radio_button_tag 'legale', legale, @legale == legale, :data => { :url => url_for(:legale => legale) } %>
-          <%= t('user.terms.legale_names.' + name) %>
+          <%= t('.legale_names.' + name) %>
         </label>
       </div>
     <% end %>
@@ -31,23 +31,23 @@
   <div class="form-row">
     <label for="user_consider_pd">
       <%= check_box('user', 'consider_pd') %>
-      <%= t 'user.terms.consider_pd' %>
+      <%= t '.consider_pd' %>
     </label>
-    <span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.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? %>
 
     <div class="buttons form-row inner20 clearfix">
-      <p class="deemphasize"><%= t 'user.terms.read and accept' %></p>
-      <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
-      <%= submit_tag(t('user.terms.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">
-        <%= raw t 'user.terms.guidance',
-                  :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
-                  :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
+        <%= 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>