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

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

diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb
index 340aaf04e2ac7c4604e8322844560f87e4759dde..a5dc3291de8968c1a02ab8a59a198ee853e0d8d8 100644 (file)
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -11,11 +11,11 @@
 
 <%= form_tag({ :action => "save" }) do %>
   <!-- legale is <%= @legale %> -->
 
 <%= form_tag({ :action => "save" }) do %>
   <!-- legale is <%= @legale %> -->

-  <p class="text-muted"><%= t ".read and accept with tou" %></p>
+  <p class="text-body-secondary"><%= t ".read and accept with tou" %></p>

   <h4>
     <%= t ".heading_ct" %>
   </h4>
   <h4>
     <%= t ".heading_ct" %>
   </h4>

-  <p class="text-muted"><%= t ".contributor_terms_explain" %></p>
+  <p class="text-body-secondary"><%= t ".contributor_terms_explain" %></p>

   <label class="form-label">
     <%= t ".legale_select" %>
   </label>
   <label class="form-label">
     <%= t ".legale_select" %>
   </label>


@@ -35,7 +35,7 @@
   </div>
 
   <div>
   </div>
 
   <div>

-    <p id="contributorGuidance" class="text-muted">
+    <p id="contributorGuidance" class="text-body-secondary">

       <%= t ".guidance_info_html",
             :readable_summary_link => link_to(t(".readable_summary"),
                                               "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary"),
       <%= t ".guidance_info_html",
             :readable_summary_link => link_to(t(".readable_summary"),
                                               "https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary"),


@@ -55,7 +55,7 @@
   <h4>
     <%= t "layouts.tou" %>
   </h4>
   <h4>
     <%= t "layouts.tou" %>
   </h4>

-  <p class="text-muted"><%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %></p>
+  <p class="text-body-secondary"><%= t ".tou_explain_html", :tou_link => link_to(t("layouts.tou"), "https://wiki.osmfoundation.org/wiki/Terms_of_Use", :target => :new) %></p>

 
   <div class="mb-3">
     <div class="form-check">
 
   <div class="mb-3">
     <div class="form-check">


@@ -69,8 +69,8 @@
   <%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %>
 
   <div class="mb-3">
   <%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %>
 
   <div class="mb-3">

-    <%= submit_tag("Continue", :name => "continue", :id => "continue", :disabled => true, :class => "btn btn-primary") %>
-    <%= submit_tag("Cancel", :name => "decline", :id => "decline", :class => "btn btn-outline-secondary") %>
+    <%= submit_tag(t(".continue"), :name => "continue", :id => "continue", :disabled => true, :class => "btn btn-primary") %>
+    <%= submit_tag(t(".cancel"), :name => "decline", :id => "decline", :class => "btn btn-outline-secondary") %>

   </div>
 
   <div class="mb-3">
   </div>
 
   <div class="mb-3">