X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e26348fc18a921dbf740c3cad7bb79de5fd8f27d..c05d63d06495ca1fc91beaa729c6f43763ea0f82:/app/views/layouts/site.rhtml
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index cf7ad9fc8..b524b4167 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -1,5 +1,5 @@
-
+
<%= javascript_include_tag 'prototype' %>
<%= javascript_include_tag 'site' %>
@@ -8,6 +8,7 @@
<%= stylesheet_link_tag 'print', :media => "print" %>
<%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
<%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
+ <%= yield :head %>
OpenStreetMap<%= ' | '+ h(@title) if @title %>
@@ -21,14 +22,14 @@
<% 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 %>
@@ -37,23 +38,26 @@
<%
viewclass = ''
editclass = ''
+ historyclass = ''
exportclass = ''
traceclass = ''
viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index'
editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit'
+ historyclass = 'active' if params['controller'] == 'changeset' and params['action'] == 'list_bbox'
exportclass = 'active' if params['controller'] == 'site' and params['action'] == 'export'
traceclass = 'active' if params['controller'] == 'trace'
diaryclass = 'active' if params['controller'] == 'diary_entry'
%>
- <%= link_to 'View', {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass} %>
- <%= link_to 'Edit', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass} %>
+ <%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => 'view maps', :class => viewclass} %>
+ <%= link_to t('layouts.edit'), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => 'edit maps', :class => editclass} %>
+ <%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list_bbox' }, {:id => 'historyanchor', :title => 'changeset history', :class => historyclass} %>
<% if params['controller'] == 'site' and (params['action'] == 'index' or params['action'] == 'export') %>
- <%= link_to_remote 'Export', {:url => {:controller => 'export', :action => 'start'}}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass, :href => url_for(:controller => 'site', :action => 'export')} %>
+ <%= 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')} %>
<% else %>
- <%= link_to 'Export', {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass} %>
+ <%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => 'export map data', :class => exportclass} %>
<% end %>
- <%= link_to 'GPS Traces', {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass} %>
- <%= link_to 'User Diaries', {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => 'view user diaries', :class => diaryclass} %>
+ <%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list'}, {:id => 'traceanchor', :title => 'manage traces', :class => traceclass} %>
+ <%= link_to t('layouts.user_diaries'), {:controller => 'diary_entry', :action => 'list', :display_name => nil}, {:id => 'diaryanchor', :title => 'view user diaries', :class => diaryclass} %>
@@ -63,55 +67,63 @@
OpenStreetMap
<%= link_to(image_tag("osm_logo.png", :size => "120x120", :border => 0), :controller => 'site', :action => 'index') %>
- The Free Wiki World Map
+ <%= t('layouts.tag_line') %>
<% unless @user %>
- OpenStreetMap is a free editable map of the whole world. It is made by people like you.
-
- OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth.
-
- OpenStreetMap's hosting is kindly supported by the
UCL VR Centre and
bytemark.
+
+ <%= t 'layouts.intro_1' %>
+
+
+ <%= t 'layouts.intro_2' %>.
+
+
+ <%= t 'layouts.intro_3',
+ :ucl => 'UCL VR Centre',
+ :bytemark => 'bytemark' %>
+
<% end %>
<% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
- The OpenStreetMap database is currently offline while
- essential database maintenance work is carried out.
+ <%= t 'layouts.offline' %>
- <% elsif OSM_STATUS == :api_readonly %>
+ <% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
- The OpenStreetMap database is currently in read-only mode while
- essential database maintenance work is carried out.
+ <%= t 'layouts.read_only' %>
+ <% end %>
+
+ <% if false %>
+
<% end %>
- <%= yield :optionals %>
-
-
-
-
+
+ <%= t 'layouts.sotm' %>
+
- <%= link_to (image_tag "cc_button.png", :alt => "CC by-sa 2.0", :border => "0"), "http://creativecommons.org/licenses/by-sa/2.0/" %>
+ <%= yield :optionals %>
-
-
+
+
+
+ <%= link_to image_tag("cc_button.png", :alt => "CC by-sa 2.0", :border => "0"), "http://creativecommons.org/licenses/by-sa/2.0/" %>
+
+