cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2024-09-24 18:07:47 +01:00
commit ac31625f1b
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/users/terms.html.erb
View file

@ -69,8 +69,8 @@
<%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %> <%= hidden_field_tag("referer", h(params[:referer])) unless params[:referer].nil? %>
<div class="mb-3"> <div class="mb-3">
<%= submit_tag("Continue", :name => "continue", :id => "continue", :disabled => true, :class => "btn btn-primary") %> <%= submit_tag(t(".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(".cancel"), :name => "decline", :id => "decline", :class => "btn btn-outline-secondary") %>
</div> </div>
<div class="mb-3"> <div class="mb-3">

5
config/locales/en.yml
View file

@ -2689,7 +2689,6 @@ en:
privacy_policy_title: OSMF privacy policy including section on email addresses privacy_policy_title: OSMF privacy policy including section on email addresses
contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms" contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
contributor_terms: "contributor terms" contributor_terms: "contributor terms"
tou: "terms of use"
continue: Sign Up continue: Sign Up
terms accepted: "Thanks for accepting the new contributor terms!" terms accepted: "Thanks for accepting the new contributor terms!"
email_help: 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}" guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}"
readable_summary: human readable summary readable_summary: human readable summary
informal_translations: informal translations informal_translations: informal translations
continue: Continue continue: "Continue"
declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" 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." 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_select: "Country of residence:"
legale_names: legale_names: