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

separate translatable messages for privacy policy link in sign up form

Browse source
This commit is contained in:
Emin Kocan 2024-07-01 18:35:43 +02:00
parent 8ba1ea0f5d
commit ea7b19c8fa
2 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/views/users/new.html.erb
View file

@ -44,10 +44,10 @@
<%= f.hidden_field :auth_uid unless current_user.auth_uid.nil? %> <%= f.hidden_field :auth_uid unless current_user.auth_uid.nil? %>
<% if current_user.auth_uid.nil? or @email_hmac.nil? or not current_user.errors[:email].empty? %> <% if current_user.auth_uid.nil? or @email_hmac.nil? or not current_user.errors[:email].empty? %>
<%= f.email_field :email, :help => t(".email_help_html", <%= f.email_field :email, :help => t(".email_help.html",
:privacy_policy_link => link_to(t(".privacy_policy"), :privacy_policy_link => link_to(t(".email_help.privacy_policy"),
t(".privacy_policy_url"), t(".email_help.privacy_policy_url"),
:title => t(".privacy_policy_title"), :title => t(".email_help.privacy_policy_title"),
:target => :new)), :target => :new)),
:autofocus => true, :autofocus => true,
:tabindex => 1 %> :tabindex => 1 %>
@ -68,16 +68,16 @@
</div> </div>
<% end %> <% end %>
<p class="mb-3 text-body-secondary fs-6"><%= t(".by_signing_up_html", <p class="mb-3 text-body-secondary fs-6"><%= t(".by_signing_up.html",
:tou_link => link_to(t("layouts.tou"), :tou_link => link_to(t("layouts.tou"),
"https://wiki.osmfoundation.org/wiki/Terms_of_Use", "https://wiki.osmfoundation.org/wiki/Terms_of_Use",
:target => :new), :target => :new),
:privacy_policy_link => link_to(t(".privacy_policy"), :privacy_policy_link => link_to(t(".by_signing_up.privacy_policy"),
t(".privacy_policy_url"), t(".by_signing_up.privacy_policy_url"),
:title => t(".privacy_policy_title"), :title => t(".by_signing_up.privacy_policy_title"),
:target => :new), :target => :new),
:contributor_terms_link => link_to(t(".contributor_terms"), :contributor_terms_link => link_to(t(".by_signing_up.contributor_terms"),
t(".contributor_terms_url"), t(".by_signing_up.contributor_terms_url"),
:target => :new)) %></p> :target => :new)) %></p>
<%= f.form_group do %> <%= f.form_group do %>
<%= f.check_box :consider_pd, <%= f.check_box :consider_pd,

19
config/locales/en.yml
View file

@ -2752,17 +2752,22 @@ en:
welcome: "Welcome to OpenStreetMap" welcome: "Welcome to OpenStreetMap"
duplicate_social_email: "If you already have an OpenStreetMap account and wish to use a 3rd party identity provider, please log in using your password and modify the settings of your account." duplicate_social_email: "If you already have an OpenStreetMap account and wish to use a 3rd party identity provider, please log in using your password and modify the settings of your account."
display name description: "Your publicly displayed username. You can change this later in the preferences." display name description: "Your publicly displayed username. You can change this later in the preferences."
by_signing_up_html: "By signing up, you agree to our %{tou_link}, %{privacy_policy_link} and %{contributor_terms_link}." by_signing_up:
html: "By signing up, you agree to our %{tou_link}, %{privacy_policy_link} and %{contributor_terms_link}."
privacy_policy: privacy policy
privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
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" tou: "terms of use"
contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
contributor_terms: "contributor terms"
external auth: "Third Party Authentication:" external auth: "Third Party Authentication:"
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_html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.' email_help:
privacy_policy: privacy policy privacy_policy: privacy policy
privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
privacy_policy_title: OSMF privacy policy including section on email addresses privacy_policy_title: OSMF privacy policy including section on email addresses
html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}." consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}."
consider_pd: "public domain" consider_pd: "public domain"
consider_pd_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain consider_pd_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain