i18n'ing the site layout.

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 93abf3a5efac6ffd870e74a415f3aaaa8ea36d58..f7e9304542265e6ade8a2ff96e8500918f7c07b5 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -22,14 +22,14 @@
 
     <span id="greeting">
       <% if @user and @user.id %>
-        Welcome, <%= link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}%> | 
+        <%= t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}) %> | 
         <% @inbox_weight = 'bold' if @user.new_messages.size > 0 %>
         <%= yield :greeting %>
-        <%= link_to "inbox (#{@user.new_messages.size})", {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> |
-        <%= link_to 'logout', {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%>
-      <% else %>
-        <%= link_to 'log in', {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor'}%> |
-        <%= link_to 'sign up', {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %>
+        <%= link_to t('layouts.inbox', :size => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, {:style => "font-weight: #{@inbox_weight};" } %> |
+        <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :referer => request.request_uri}, {:id => 'logoutanchor'}%>
+      <% else %>               
+        <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.request_uri}, {:id => 'loginanchor'}%> |
+        <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor'} %>
       <% end %>
     </span>
 
@@ -48,16 +48,16 @@
         traceclass = 'active' if params['controller'] == 'trace'
         diaryclass = 'active' if params['controller'] == 'diary_entry'
         %>
-        <li><%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass} %></li>
-        <li><%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass} %></li>
-        <li><%= link_to 'History', {:controller => 'changeset', :action => 'list_bbox' }, {:id => 'historyanchor', :title => 'changeset history', :class => historyclass} %></li>
+        <li><%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass} %></li>
+        <li><%= link_to t('layouts.edit'), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass} %></li>
+        <li><%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list_bbox' }, {:id => 'historyanchor', :title => 'changeset history', :class => historyclass} %></li>
         <% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
-        <li><%= link_to_remote 'Export', {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %></li>
+        <li><%= link_to_remote t('layouts.export'), {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %></li>
         <% else %>
-        <li><%= link_to 'Export', {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass} %></li>
+        <li><%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass} %></li>
         <% end %>
-        <li><%= link_to 'GPS Traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass} %></li>
-        <li><%= link_to 'User Diaries', {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => 'view user diaries', :class => diaryclass} %></li>
+        <li><%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass} %></li>
+        <li><%= link_to t('layouts.user_diaries'), {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => 'view user diaries', :class => diaryclass} %></li>
       </ul>
     </div>
 
@@ -67,45 +67,38 @@
         <center>
           <h1>OpenStreetMap</h1>
           <%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0), :controller => 'site', :action => 'index') %><br/>
-          <h2 class="nowrap">The Free Wiki World Map</h2>
+          <h2 class="nowrap"><%= t('layouts.tag_line') %></h2>
         </center>
       </div>
 
       <% unless @user %>
       <div id="intro">
         <p>
-          OpenStreetMap is a free editable map of the whole world. It
-          is made by people like you.
+          <%= t 'layouts.intro_1' %>
         </p>
         <p>
-          OpenStreetMap allows you to view, edit and use geographical
-          data in a collaborative way from anywhere on Earth.
+          <%= t 'layouts.intro_2' %>.
         </p>
         <p>
-          OpenStreetMap's hosting is kindly supported by the
-          <a href="http://www.vr.ucl.ac.uk">UCL VR Centre</a> and
-          <a href="http://www.bytemark.co.uk">bytemark</a>.
+        <%= t 'layouts.intro_3', 
+              :ucl => '<a href="http://www.vr.ucl.ac.uk">UCL VR Centre</a>', 
+              :bytemark => '<a href="http://www.bytemark.co.uk">bytemark</a>' %>
         </p>
       </div>
       <% end %>
 
       <% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
       <div id="alert">
-        The OpenStreetMap database is currently offline while
-        essential database maintenance work is carried out.
+        <%= t 'layouts.offline' %>
       </div>
       <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
       <div id="alert">
-        The OpenStreetMap database is currently in read-only mode while
-        essential database maintenance work is carried out.
-      </div>
+        <%= t 'layouts.read_only' %>
       <% end %>
 
       <% if false %>
       <div id="donate" class="notice">
-        Support OpenStreetMap by
-        <a href="http://donate.openstreetmap.org/">donating</a>
-        to the Hardware Upgrade Fund.
+        <%= t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{donate_link_text}</a>" %>
       </div>
       <% end %>
 
@@ -117,16 +110,14 @@
       </div>
 
       <div id="sotm" class="notice">
-        Come to the 2009 OpenStreetMap
-        Conference, <a href="http://www.stateofthemap.org">The State
-        of the Map</a>, July 10-12 in Amsterdam!
+        <%= t 'layouts.sotm' %>
       </div>
 
       <%= yield :optionals %>
 
       <center>
         <div class="button" style="width: 115px">
-          <a href="http://donate.openstreetmap.org/"><img src="/images/donate.png" border="0" alt="Make a Donation" /></a>
+          <a href="http://donate.openstreetmap.org/"><img src="/images/donate.png" border="0" alt="<%= t 'layouts.alt_donation' %>" /></a>
         </div>
 
         <div id="cclogo" class="button" style="width: 88px">

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 15b25c4d66d3786d7c9a9b50d8d87980babf643c..a0daaa394dc74acf817b72c27c3a1c00e920e1f9 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -34,3 +34,25 @@ en:
       other: "{{count}} comments"
     edit_link: Edit this entry
     comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+  layouts:
+    welcome_user: "Welcome, {{user_link}}"
+    inbox: "inbox ({{size}})"
+    logout: logout
+    log_in: log in
+    sign_up: sign up
+    view: View
+    edit: Edit
+    history: History
+    export: Export
+    gps_traces: GPS Traces
+    user_diaries: User Diaries
+    tag_line: The Free Wiki World Map
+    intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
+    intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
+    intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}."
+    osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
+    osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
+    donate: "Support OpenStreetMap by {{link}} to the Hardware Upgrade Fund."
+    donate_link_text: donating
+    sotm: 'Come to the 2009 OpenStreetMap Conference, <a href="http://www.stateofthemap.org">The State of the Map</a>, July 10-12 in Amsterdam!'
+    alt_donation: Make a Donation