confirmation email plain text version - comments on wrapping?

diff --git a/app/views/notifier/signup_confirm.text.plain.rhtml b/app/views/notifier/signup_confirm.text.plain.rhtml
index 444891d673fe4af0ebd8263330b338d7e8264ae8..661179909c36319ab557e0d48ff7fa68a359c8aa 100644 (file)
--- a/app/views/notifier/signup_confirm.text.plain.rhtml
+++ b/app/views/notifier/signup_confirm.text.plain.rhtml
@@ -1,37 +1,37 @@
-Hi there!
+<%= t'notifier.signup_confirm_plain.greeting' %>

 
 

-Someone (hopefully you) would like to create an account over at
+<%= t'notifier.signup_confirm_plain.hopefully_you' %>

 <%= SERVER_URL %>
 
 <%= SERVER_URL %>
 

-If this is you, welcome! Please click the link below to confirm that
-account and read on for more information about OpenStreetMap.
+<%= t'notifier.signup_confirm_plain.click_the_link_1' %>
+<%= t'notifier.signup_confirm_plain.click_the_link_2' %>

 
 <%= @url %>
 
 
 <%= @url %>
 

-You can watch an introductory video to OpenStreetMap here:
+<%= t'notifier.signup_confirm_plain.introductory_video' %>

 
        http://showmedo.com/videos/video?name=1800000&fromSeriesID=180  
 
 
        http://showmedo.com/videos/video?name=1800000&fromSeriesID=180  
 

-There are more videos here:
+<%= t'notifier.signup_confirm_plain.more_videos' %>

 
        http://showmedo.com/videos/series?name=mS2P1ZqS6        
 
 
        http://showmedo.com/videos/series?name=mS2P1ZqS6        
 

-Get reading about OpenStreetMap on the wiki:
+<%= t'notifier.signup_confirm_plain.the_wiki' %>

 
        http://wiki.openstreetmap.org/wiki/Beginners%27_Guide
 
 
        http://wiki.openstreetmap.org/wiki/Beginners%27_Guide
 

-OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:
+<%= t'notifier.signup_confirm_plain.opengeodata' %>

 
        http://www.opengeodata.org/
 
 
        http://www.opengeodata.org/
 

-You may also want to sign up to the OpenStreetMap wiki at:
+<%= t'notifier.signup_confirm_plain.wiki_signup' %>

 
        http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page
 
 
        http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page
 

-It is recommended that you create a user wiki page, which includes
-category tags noting where you are, such as [[Category:Users_in_London]].
+<%= t'notifier.signup_confirm_plain.user_wiki_1' %>
+<%= t'notifier.signup_confirm_plain.user_wiki_2' %>

 
 

-A list of current users in categories, based on where in the world
-they are, is available from:
+<%= t'notifier.signup_confirm_plain.current_user_1' %>
+<%= t'notifier.signup_confirm_plain.current_user_2' %>

 
 http://wiki.openstreetmap.org/index.php/Category:Users_by_geographical_region
 
 http://wiki.openstreetmap.org/index.php/Category:Users_by_geographical_region

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c337ae5aa977581fb984595b94631be875b81ced..8082e7f21080d4a67b13ee2946fe7336ca79bc2a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -279,6 +279,23 @@ en:
       reading_your_sent_messages: "Reading your sent messages"
       to: "To"
       back_to_outbox: "Back to outbox"
       reading_your_sent_messages: "Reading your sent messages"
       to: "To"
       back_to_outbox: "Back to outbox"

+  notifier:
+    signup_confirm_plain:
+      greeting: "Hi there!"
+      hopefully_you: "Someone (hopefully you) would like to create an account over at"
+      # next two translations run-on : please word wrap appropriately
+      click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
+      click_the_link_2: "account and read on for more information about OpenStreetMap."
+      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
+      more_videos: "There are more videos here:"
+      the_wiki: "Get reading about OpenStreetMap on the wiki:"
+      opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
+      # next four translations are in pairs : please word wrap appropriately
+      user_wiki_1: "It is recommended that you create a user wiki page, which includes"
+      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
+      current_user_1: "A list of current users in categories, based on where in the world"
+      current_user_2: "they are, is available from:"

   site:
     index:
       js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
   site:
     index:
       js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."


@@ -354,7 +371,6 @@ en:
     trace_paging_nav:
       showing: "Showing page"
       of: "of"
     trace_paging_nav:
       showing: "Showing page"
       of: "of"

-

     trace:
       pending: "PENDING"
       more: "more"
     trace:
       pending: "PENDING"
       more: "more"