more databrowser i18n

diff --git a/app/views/browse/_node_details.rhtml b/app/views/browse/_node_details.rhtml
index 492aa06db43f44de461eb2a834ff01010bc8b45c..55b9fe2880dccde29b0977833d20f5964767be80 100644 (file)
--- a/app/views/browse/_node_details.rhtml
+++ b/app/views/browse/_node_details.rhtml
@@ -4,7 +4,7 @@
 
   <% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %>
     <tr valign="top">
 
   <% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %>
     <tr valign="top">

-      <th>Part of:</th>
+      <th><%= t 'browse.node_details.part_of' %></th>

       <td>
         <table cellpadding="0">
           <% node_details.ways.each do |way| %>
       <td>
         <table cellpadding="0">
           <% node_details.ways.each do |way| %>

diff --git a/app/views/browse/_paging_nav.rhtml b/app/views/browse/_paging_nav.rhtml
index fcfbb05dc048b8193bf16efb3bc448aaee7f641c..30e23b7dd5ed6c01e953d85c6739dff3518e111e 100644 (file)
--- a/app/views/browse/_paging_nav.rhtml
+++ b/app/views/browse/_paging_nav.rhtml
@@ -1,12 +1,12 @@
 <tr><td colspan='2'>
 <% current_page = pages.current_page %>
 
 <tr><td colspan='2'>
 <% current_page = pages.current_page %>
 

-Showing page 
+<%= t'browse.paging_nav.showing_page' %> 

 <%= current_page.number %> (<%= current_page.first_item %><% 
 if (current_page.first_item < current_page.last_item) # if more than 1 trace on page 
   %>-<%= current_page.last_item %><% 
 end %>
 <%= current_page.number %> (<%= current_page.first_item %><% 
 if (current_page.first_item < current_page.last_item) # if more than 1 trace on page 
   %>-<%= current_page.last_item %><% 
 end %>

-of <%= pages.item_count %>)
+<%= t'browse.paging_nav.of'%> <%= pages.item_count %>)

 
 <% if pages.page_count > 1 %>
 | <%= pagination_links_each(pages, {}) { |n| link_to_page(n, page_param) } %>
 
 <% if pages.page_count > 1 %>
 | <%= pagination_links_each(pages, {}) { |n| link_to_page(n, page_param) } %>

diff --git a/app/views/browse/node.rhtml b/app/views/browse/node.rhtml
index f798526a893fba11ca5099dad873894e3cd79d65..035598e550f7a84fc66c8210ef3c0ec650e4650e 100644 (file)
--- a/app/views/browse/node.rhtml
+++ b/app/views/browse/node.rhtml
@@ -1,11 +1,11 @@
 <%
 @name = printable_name @node
 <%
 @name = printable_name @node

-@title = 'Node | ' + @name
+@title = t('browse.node.node') + ' | ' + @name

 %>
 <table width="100%">
   <tr>
     <td>
 %>
 <table width="100%">
   <tr>
     <td>

-      <h2>Node: <%= h(@name) %></h2>
+      <h2><%= t'browse.node.node_title', :node_name => h(@name) %></h2>

     </td>
     <td>
       <%= render :partial => "navigation" %>
     </td>
     <td>
       <%= render :partial => "navigation" %>


@@ -15,9 +15,8 @@
     <td>
       <%= render :partial => "node_details", :object => @node %>
       <hr />
     <td>
       <%= render :partial => "node_details", :object => @node %>
       <hr />

-      <%= link_to "Download XML", :controller => "node", :action => "read" %>
-      or
-      <%= link_to "view history", :action => "node_history" %>
+      <%= t'browse.node.download', :download_xml_link => link_to (t('browse.node.download_xml'), :controller => "node", :action => "read"),
+                                   :view_history_link => link_to (t('browse.node.view_history'), :action => "node_history") %>

     </td>
     <%= render :partial => "map", :object => @node %>
   </tr>
     </td>
     <%= render :partial => "map", :object => @node %>
   </tr>

diff --git a/app/views/browse/node_history.rhtml b/app/views/browse/node_history.rhtml
index 918be42dc1593230597e7479948fb912a4c81a99..ea96c091fb7bbf1b10fa882bee543e3c7ee003b2 100644 (file)
--- a/app/views/browse/node_history.rhtml
+++ b/app/views/browse/node_history.rhtml
@@ -1,6 +1,6 @@
 <%
 @name = printable_name @node
 <%
 @name = printable_name @node

-@title = 'Node History | ' + @name
+@title = t('browse.node_history.node_history') + ' | ' + @name

 %>
 <h2>Node History: <%= h(@name) %></h2>
 
 %>
 <h2>Node History: <%= h(@name) %></h2>
 


@@ -11,9 +11,8 @@
         <%= render :partial => "node_details", :object => node %>
         <hr />
       <% end %>
         <%= render :partial => "node_details", :object => node %>
         <hr />
       <% end %>

-      <%= link_to "Download XML", :controller => "old_node", :action => "history" %>
-      or
-      <%= link_to "view details", :action => "node" %>
+      <%= t 'browse.node_history.download', :download_xml_link => link_to (t'browse.node_history.download_xml', :controller => "old_node", :action => "history"),
+                                            :view_details_link => link_to (t'browse.node_history.view_details', :action => "node") %>

     </td>
     <%= render :partial => "map", :object => @node %>
   </tr>
     </td>
     <%= render :partial => "map", :object => @node %>
   </tr>

diff --git a/app/views/browse/not_found.rhtml b/app/views/browse/not_found.rhtml
index 1322a0a6fffea6afa08799337325e04d0dcbdafd..82a81afa5dddf3c83c91dbed29ed35b4cf12b537 100644 (file)
--- a/app/views/browse/not_found.rhtml
+++ b/app/views/browse/not_found.rhtml
@@ -1 +1 @@
-<p>Sorry, the <%= @type -%> with the id <%= params[:id] -%>, could not be found.</p>
+<p><%= t'browse.not_found.sorry', :type=> @type , :id => params[:id] %></p>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8f6caf72985eab053d404e83ce7aa1f22002d30f..c086f66f92a2c2635b34a9c1a31ce0f762470c74 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -32,6 +32,24 @@ en:
       loading: "Loading..."
       deleted: "Deleted"
       view_larger_map: "View Larger Map"
       loading: "Loading..."
       deleted: "Deleted"
       view_larger_map: "View Larger Map"

+    node_details: 
+      part_of: "Part of:"
+    node_history:
+      node_history: "Node History"
+      download: "{{download_xml_link}} or {{view_details_link}}"
+      download_xml: "Download XML"
+      view_details: "view details"
+    node:
+      node: "Node"
+      node_title: "Node: {{node_name}}"
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: "Download XML"
+      view_history: "view history"
+    not_found:
+      sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
+    paging_nav:
+      showing_page: "Showing page"
+      of: "of"

   diary_entry:
     list:
       new: New Diary Entry
   diary_entry:
     list:
       new: New Diary Entry


@@ -41,12 +59,12 @@ en:
       older_entries: Older Entries
       newer_entries: Newer Entries
     edit:
       older_entries: Older Entries
       newer_entries: Newer Entries
     edit:

-      subject: "Subject: "
-      body: "Body: "
-      language: "Language: "
-      location: "Location: "
-      latitude: "Latitude: "
-      longitude: "Longitude: "
+      subject: "Subject:"
+      body: "Body:"
+      language: "Language:"
+      location: "Location:"
+      latitude: "Latitude:"
+      longitude: "Longitude:"

       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location


@@ -125,16 +143,9 @@ en:
       lost password link: "Lost your password?"
       login_button: Login
     lost_password:
       lost password link: "Lost your password?"
       login_button: Login
     lost_password:

-      title: lost password

       heading: "Forgotten Password?"
       email address: "Email Address:"
       new password button: "Send me a new password"
       heading: "Forgotten Password?"
       email address: "Email Address:"
       new password button: "Send me a new password"

-      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
-      notice email cannot find: "Couldn't find that email address, sorry."
-    reset_password:
-      title: reset password
-      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
-      flash token bad: "Didn't find that token, check the URL maybe?"

     new:
       heading: Create a User Account
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
     new:
       heading: Create a User Account
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."


@@ -148,7 +159,6 @@ en:
       password: "Password: "
       confirm password: "Confirm Password: "
       signup: Signup
       password: "Password: "
       confirm password: "Confirm Password: "
       signup: Signup

-      flash create success message: "User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."

     no_such_user:
       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     view:
     no_such_user:
       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     view:


@@ -215,3 +225,4 @@ en:
       flash success: "Home location saved successfully"
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
       flash success: "Home location saved successfully"
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."

+