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

diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb
index b7efe912e27e68dea89326de851e2591b1f6e476..a5dc3291de8968c1a02ab8a59a198ee853e0d8d8 100644 (file)
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -69,8 +69,8 @@
   <%= 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">

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 28698fa522787766f63afbd153c8de37c7a5d489..4e74be841886eb659142b1af66f724d8e1bf9889 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2689,7 +2689,6 @@ en:
         privacy_policy_title: OSMF privacy policy including section on email addresses
         contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
         contributor_terms: "contributor terms"
-      tou: "terms of use"
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       email_help:
@@ -2717,9 +2716,9 @@ en:
       guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
       readable_summary: human readable summary
       informal_translations: informal translations
-      continue: Continue
+      continue: "Continue"
       declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
-      decline: "Decline"
+      cancel: "Cancel"
       you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
       legale_select: "Country of residence:"
       legale_names: