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

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

Browse source 
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.
This commit is contained in:
Ævar Arnfjörð Bjarmason 2009-06-06 21:36:49 +00:00
parent d0fcedcfb7
commit e72f35f8d9
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/layouts/site.rhtml
View file

@ -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>

4
app/views/notifier/signup_confirm.text.plain.rhtml
View file

@ -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' %>

2
app/views/trace/_trace_form.rhtml
View file

@ -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 %>

5
config/locales/en.yml
View file

@ -348,8 +348,10 @@ en:
donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
donate_link_text: donating
help_wiki: "Help &amp; 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"