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

Remove duplicate translation strings, and use short form translation lookups

Browse source
This commit is contained in:
Andy Allan 2020-11-25 14:17:41 +00:00
parent 8f157ab2b1
commit 342e25dd5a
5 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/user_mailer/email_confirm.html.erb
View file

@ -1,7 +1,7 @@
<p><%= t "user_mailer.email_confirm_html.greeting" %></p>
<p><%= t ".greeting" %></p>
<p><%= t "user_mailer.email_confirm_html.hopefully_you", :server_url => Settings.server_url, :new_address => @address %></p>
<p><%= t ".hopefully_you", :server_url => Settings.server_url, :new_address => @address %></p>
<p><%= t "user_mailer.email_confirm_html.click_the_link" %></p>
<p><%= t ".click_the_link" %></p>
<p><a href="<%= @url %>"><%= @url %></a></p>

6
app/views/user_mailer/email_confirm.text.erb
View file

@ -1,7 +1,7 @@
<%= t 'user_mailer.email_confirm_plain.greeting' %>
<%= t '.greeting' %>
<%= word_wrap(t 'user_mailer.email_confirm_plain.hopefully_you', :server_url => Settings.server_url, :new_address => @address) %>
<%= word_wrap(t '.hopefully_you', :server_url => Settings.server_url, :new_address => @address) %>
<%= t 'user_mailer.email_confirm_plain.click_the_link' %>
<%= t '.click_the_link' %>
<%= @url %>

6
app/views/user_mailer/lost_password.html.erb
View file

@ -1,7 +1,7 @@
<p><%= t "user_mailer.lost_password_html.greeting" %></p>
<p><%= t ".greeting" %></p>
<p><%= t "user_mailer.lost_password_html.hopefully_you" %></p>
<p><%= t ".hopefully_you" %></p>
<p><%= t "user_mailer.lost_password_html.click_the_link" %></p>
<p><%= t ".click_the_link" %></p>
<p><a href="<%= @url %>"><%= @url %></a></p>

6
app/views/user_mailer/lost_password.text.erb
View file

@ -1,7 +1,7 @@
<%= t 'user_mailer.lost_password_plain.greeting' %>
<%= t '.greeting' %>
<%= word_wrap(t 'user_mailer.lost_password_plain.hopefully_you') %>
<%= word_wrap(t '.hopefully_you') %>
<%= t 'user_mailer.lost_password_plain.click_the_link' %>
<%= t '.click_the_link' %>
<%= @url %>

10
config/locales/en.yml
View file

@ -1449,21 +1449,11 @@ en:
welcome: "After you confirm your account, we'll provide you with some additional information to get you started."
email_confirm:
subject: "[OpenStreetMap] Confirm your email address"
email_confirm_plain:
greeting: "Hi,"
hopefully_you: "Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}."
click_the_link: "If this is you, please click the link below to confirm the change."
email_confirm_html:
greeting: "Hi,"
hopefully_you: "Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}."
click_the_link: "If this is you, please click the link below to confirm the change."
lost_password:
subject: "[OpenStreetMap] Password reset request"
lost_password_plain:
greeting: "Hi,"
hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
click_the_link: "If this is you, please click the link below to reset your password."
lost_password_html:
greeting: "Hi,"
hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
click_the_link: "If this is you, please click the link below to reset your password."