Merge a final translation from i18n branch.

diff --git a/app/views/notifier/friend_notification.rhtml b/app/views/notifier/friend_notification.rhtml
index 4103a763d8826a6621ef2539bb30738260df6086..8917061f1444d3e556ee824c1d374696da85a74b 100644 (file)
--- a/app/views/notifier/friend_notification.rhtml
+++ b/app/views/notifier/friend_notification.rhtml
@@ -1,3 +1,4 @@
-<%= @user %> has added you as a friend on OpenStreetMap.
+<%= t'notifier.friend_notification.had_added_you', :user => @user %>
+
+<%= t'notifier.friend_notification.see_their_profile', :userurl => @userurl %>
 
-You can see their profile at <%= @userurl %> and add them as a friend too if you wish.
\ No newline at end of file

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 06ce50027a071a206a40a96dd4db6bf4e59b01a7..7f8320cba374be7dbc18621089b4da36a81a2628 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -245,6 +245,9 @@ en:
       hi: "Hi {{to_user}},"
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
       footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
+    friend_notification:
+      had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
+      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
     signup_confirm_plain:
       greeting: "Hi there!"
       hopefully_you: "Someone (hopefully you) would like to create an account over at"