Remove duplicate translation strings, and use short form translation lookups

diff --git a/app/views/user_mailer/email_confirm.html.erb b/app/views/user_mailer/email_confirm.html.erb
index 3848b192bd0858cbac0acb1a78b898282f146f32..d972e9f64a06d23d350f1d0635de41de54ca8d58 100644 (file)
--- a/app/views/user_mailer/email_confirm.html.erb
+++ b/app/views/user_mailer/email_confirm.html.erb
@@ -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>

diff --git a/app/views/user_mailer/email_confirm.text.erb b/app/views/user_mailer/email_confirm.text.erb
index e4fff2b6decaa9fd7971043f4dc540bb54f6607c..66bd5530776429a9faa5d7b059dec1fb3491c493 100644 (file)
--- a/app/views/user_mailer/email_confirm.text.erb
+++ b/app/views/user_mailer/email_confirm.text.erb
@@ -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 %>

diff --git a/app/views/user_mailer/lost_password.html.erb b/app/views/user_mailer/lost_password.html.erb
index 7e61b6c49c06d079addc22cb63429fd319608045..f22480bb34a881242b16320b455988ff48786820 100644 (file)
--- a/app/views/user_mailer/lost_password.html.erb
+++ b/app/views/user_mailer/lost_password.html.erb
@@ -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>

diff --git a/app/views/user_mailer/lost_password.text.erb b/app/views/user_mailer/lost_password.text.erb
index 778fa6540d00f8d7a9747ebc1be35f921126d654..560ec13295658fcd6aa3b57aa02abfed918e1287 100644 (file)
--- a/app/views/user_mailer/lost_password.text.erb
+++ b/app/views/user_mailer/lost_password.text.erb
@@ -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 %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8ceb04f8e4f8a42894817f91f2a829b5e5d45c5d..50dabce261599ee3a6f59d7b6b17bbc2fb97fd24 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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."