Make URL that link to the OSM Wiki configurable by translations. A lot

of these pages have been translated into other languages and users
using other languages would want to visit those in preference to the
English version.

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 2561ce540ba8083c04dff309b82893734af7ecdb..e7e058963f04c6a4565ca299b46c63444d0ca89d 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -103,9 +103,9 @@
       <% end %>
 
       <div id="left_menu" class="left_menu">
-        <a href="http://wiki.openstreetmap.org"><%= t 'layouts.help_wiki' %></a><br />
+        <a href="<%= t 'layouts.help_wiki_url' %>"><%= t 'layouts.help_wiki' %></a><br />
         <a href="http://www.opengeodata.org/"><%= t 'layouts.news_blog' %></a><br />
-        <a href="http://wiki.openstreetmap.org/wiki/Merchandise"><%= t 'layouts.shop' %></a><br />
+        <a href="<%= t 'layouts.shop_url' %>"><%= t 'layouts.shop' %></a><br />
         <%= yield :left_menu %>
       </div>
 

diff --git a/app/views/notifier/signup_confirm.text.plain.rhtml b/app/views/notifier/signup_confirm.text.plain.rhtml
index 7c4e758720e20ec5e601383f647648e3dd7e9523..c836220c79ac98ba0d3e551b5ed923ffc01f0364 100644 (file)
--- a/app/views/notifier/signup_confirm.text.plain.rhtml
+++ b/app/views/notifier/signup_confirm.text.plain.rhtml
@@ -18,7 +18,7 @@
 
 <%= t'notifier.signup_confirm_plain.the_wiki' %>
 
-       http://wiki.openstreetmap.org/wiki/Beginners%27_Guide
+       <%= t'notifier.signup_confirm_plain.the_wiki_url' %>
 
 <%= t'notifier.signup_confirm_plain.opengeodata' %>
 
@@ -26,7 +26,7 @@
 
 <%= t'notifier.signup_confirm_plain.wiki_signup' %>
 
-       http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page
+       <%= t'notifier.signup_confirm_plain.wiki_signup_url' %>
 
 <%= t'notifier.signup_confirm_plain.user_wiki_1' %>
 <%= t'notifier.signup_confirm_plain.user_wiki_2' %>

diff --git a/app/views/trace/_trace_form.rhtml b/app/views/trace/_trace_form.rhtml
index b8117901f0ab510de8cc3f3b0486c37f9e112ebc..5962c8e8f461f339a98b74e58f1e52c96f3bc27c 100644 (file)
--- a/app/views/trace/_trace_form.rhtml
+++ b/app/views/trace/_trace_form.rhtml
@@ -4,6 +4,6 @@
   <tr><td align="right"><%= t'trace.trace_form.description' %></td><td><%= f.text_field :description, :size => 50, :maxlength => 255 %></td></tr>
   <tr><td align="right"><%= t'trace.trace_form.tags' %></td><td><%= f.text_field :tagstring, :size => 50, :maxlength => 255 %></td></tr>
   <tr><td align="right"><%= t'trace.trace_form.public' %></td><td><%= f.check_box :public %></td></tr>
-  <tr><td></td><td><%= submit_tag t('trace.trace_form.upload_button') %> | <a href="http://wiki.openstreetmap.org/wiki/Upload"><%= t'trace.trace_form.help' %></a></td></tr>
+  <tr><td></td><td><%= submit_tag t('trace.trace_form.upload_button') %> | <a href="<%= t'trace.trace_form.help_url' %>"><%= t'trace.trace_form.help' %></a></td></tr>
 </table>
 <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e9752e6b9cbb354ac39ff5b5bf3e208c16b2d9e7..dbcaa65e50a3cd1dc877d883dd29ce4d2810a3ef 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -348,8 +348,10 @@ en:
     donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
     donate_link_text: donating
     help_wiki: "Help & Wiki"
+    help_wiki_url: "http://wiki.openstreetmap.org"
     news_blog: "News blog"
     shop: Shop
+    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
   notifier:
@@ -383,8 +385,10 @@ en:
       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:"
+      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
       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:"
+      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
       # 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]]."
@@ -538,6 +542,7 @@ en:
       public: "Public?"
       upload_button: "Upload"
       help: "Help"
+      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
     trace_header:
       see_just_your_traces: "See just your traces, or upload a trace"
       see_all_traces: "See all traces"