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

Refactor terms declined flash message to use a partial

Browse source 
This allows us to include a link in the flash message, without having
to use html_safe. Also refactor to avoid having html angle brackets in
the translation strings, while still allowing locale-specific urls.
This commit is contained in:
Andy Allan 2021-06-23 20:09:19 +01:00
parent 3dd639c8d0
commit 0876ea0bee
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/users_controller.rb
View file

@ -42,7 +42,7 @@ class UsersController < ApplicationController
if current_user if current_user
current_user.terms_seen = true current_user.terms_seen = true
flash[:notice] = t("users.new.terms declined", :url => t("users.new.terms declined url")).html_safe if current_user.save flash[:notice] = { :partial => "users/terms_declined_flash" } if current_user.save
if params[:referer] if params[:referer]
redirect_to safe_referer(params[:referer]) redirect_to safe_referer(params[:referer])

1
app/views/users/_terms_declined_flash.html.erb Normal file
View file

@ -0,0 +1 @@
<%= t ".terms_declined_html", :terms_declined_link => link_to(t(".terms_declined_link"), t(".terms_declined_url")) %>

6
config/locales/en.yml
View file

@ -2334,8 +2334,6 @@ en:
auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one." auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
continue: Sign Up continue: Sign Up
terms accepted: "Thanks for accepting the new contributor terms!" terms accepted: "Thanks for accepting the new contributor terms!"
terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
terms: terms:
title: "Terms" title: "Terms"
heading: "Terms" heading: "Terms"
@ -2358,6 +2356,10 @@ en:
france: "France" france: "France"
italy: "Italy" italy: "Italy"
rest_of_world: "Rest of the world" rest_of_world: "Rest of the world"
terms_declined_flash:
terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}.
terms_declined_link: this wiki page
terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
no_such_user: no_such_user:
title: "No such user" title: "No such user"
heading: "The user %{user} does not exist" heading: "The user %{user} does not exist"