From b22ae7161314dc76417ccbf71a6ad20c01de8892 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Sun, 31 May 2009 09:33:20 +0000 Subject: [PATCH 1/1] Last of the databrowser i18n --- app/views/browse/_tag_details.rhtml | 2 +- app/views/browse/_way_details.rhtml | 4 ++-- app/views/browse/way.rhtml | 9 ++++----- app/views/browse/way_history.rhtml | 9 ++++----- config/locales/en.yml | 17 +++++++++++++++++ 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/app/views/browse/_tag_details.rhtml b/app/views/browse/_tag_details.rhtml index ac407a7d7..b5f2d97e7 100644 --- a/app/views/browse/_tag_details.rhtml +++ b/app/views/browse/_tag_details.rhtml @@ -1,6 +1,6 @@ <% unless tag_details.tags.empty? %> - Tags: + <%= t'browse.tag_details.tags' %> <%= render :partial => "tag", :collection => tag_details.tags.sort %> diff --git a/app/views/browse/_way_details.rhtml b/app/views/browse/_way_details.rhtml index 1122c80f3..3c90395b7 100644 --- a/app/views/browse/_way_details.rhtml +++ b/app/views/browse/_way_details.rhtml @@ -3,7 +3,7 @@ <%= render :partial => "common_details", :object => way_details %> - +
Nodes:<%= t'browse.way_details.nodes' %> <% way_details.way_nodes.each do |wn| %> @@ -15,7 +15,7 @@ <% unless way_details.containing_relation_members.empty? %> - +
Part of:<%= t'browse.way_details.part_of' %> <%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %> diff --git a/app/views/browse/way.rhtml b/app/views/browse/way.rhtml index 9a733bf9d..79c913a07 100644 --- a/app/views/browse/way.rhtml +++ b/app/views/browse/way.rhtml @@ -1,11 +1,11 @@ <% @name = printable_name @way -@title = 'Way | ' + @name +@title = t('browse.way.way') + ' | ' + @name %>
<%= render :partial => "map", :object => @way %> diff --git a/app/views/browse/way_history.rhtml b/app/views/browse/way_history.rhtml index c39cad54d..edb967e9e 100644 --- a/app/views/browse/way_history.rhtml +++ b/app/views/browse/way_history.rhtml @@ -1,8 +1,8 @@ <% @name = printable_name @way -@title = 'Way History | ' + @name +@title = t('browse.way_history.way_history') + ' | ' + @name %> -

Way History: <%= h(@name) %>

+

<%= t'browse.way_history.way_history_title', :way_name => h(@name) %>

-

Way: <%= h(@name) %>

+

<%= t'browse.way.way_title', :way_name => h(@name) %>

<%= render :partial => "navigation" %> @@ -15,9 +15,8 @@ <%= render :partial => "way_details", :object => @way %>
- <%= link_to "Download XML", :controller => "way", :action => "read" %> - or - <%= link_to "view history", :action => "way_history" %> + <%= t'browse.way.download', :download_xml_link => link_to(t('browse.way.download_xml'), :controller => "way", :action => "read"), + :view_history_link => link_to(t('browse.way.view_history'), :action => "way_history") %>
@@ -11,9 +11,8 @@ <%= render :partial => "way_details", :object => way %>
<% end %> - <%= link_to "Download XML", :controller => "old_way", :action => "history" %> - or - <%= link_to "view details", :action => "way" %> + <%= t'browse.way_history.download', :download_xml_link => link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history"), + :view_details_link => link_to(t('browse.way_history.view_details'), :action => "way") %> <%= render :partial => "map", :object => @way %> diff --git a/config/locales/en.yml b/config/locales/en.yml index eb80d4416..ab290327c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -85,6 +85,23 @@ en: private_user: "private user" edited_by: "Edited by" at_timestamp: "at" + tag_details: + tags: "Tags:" + way_details: + nodes: "Nodes:" + part_of: "Part of:" + way_history: + way_history: "Way History" + way_history_title: "Way History: {{way_name}}" + download: "{{download_xml_link}} or {{view_details_link}}" + download_xml: "Download XML" + view_details: "view details" + way: + way: "Way" + way_title: "Way: {{way_name}}" + download: "{{download_xml_link}} or {{view_history_link}}" + download_xml: "Download XML" + view_history: "view history" diary_entry: list: new: New Diary Entry -- 2.39.5