Add some more missing translations. Use .to_sentence instead of .join(', ') so that...

diff --git a/app/views/browse/_way_details.rhtml b/app/views/browse/_way_details.rhtml
index a11f06aadf89cfb16dc6fb6c1fcbb3d4c7f863cf..cd912984c2db5efb82e050475696f15d5ac5424e 100644 (file)
--- a/app/views/browse/_way_details.rhtml
+++ b/app/views/browse/_way_details.rhtml
@@ -11,7 +11,7 @@
             <%= link_to h(printable_name(wn.node)), :action => "node", :id => wn.node_id.to_s %>
             <% related_ways = wn.node.ways.reject { |w| w.id == way_details.id } %>
            <% if related_ways.size > 0 then %>
             <%= link_to h(printable_name(wn.node)), :action => "node", :id => wn.node_id.to_s %>
             <% related_ways = wn.node.ways.reject { |w| w.id == way_details.id } %>
            <% if related_ways.size > 0 then %>

-        (<%= t 'browse.way_details.also_part_of', :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), :action => "way", :id => w.id.to_s) }.join(", ") %>)
+        (<%= t 'browse.way_details.also_part_of', :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), :action => "way", :id => w.id.to_s) }.to_sentence %>)

             <% end %>
          </td></tr>
         <% end %>
             <% end %>
          </td></tr>
         <% end %>

diff --git a/app/views/trace/_trace.rhtml b/app/views/trace/_trace.rhtml
index 7c52e79ced8092e5440427a9691d17e25e6ae84c..4e1733148c943fc1fc8c56aeb73a0bc89022336e 100644 (file)
--- a/app/views/trace/_trace.rhtml
+++ b/app/views/trace/_trace.rhtml
@@ -10,9 +10,9 @@
   <td class="<%= cl %>"><%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %>
     <span class="gpxsummary" title="<%= trace.timestamp %>"> ... 
       <% if trace.inserted %> 
   <td class="<%= cl %>"><%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %>
     <span class="gpxsummary" title="<%= trace.timestamp %>"> ... 
       <% if trace.inserted %> 

-        (<%= trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %> points)
+        (<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)

       <% end %> 
       <% end %> 

-      ... <%= time_ago_in_words( trace.timestamp ) %>  ago</span>
+      ... <%= t'trace.trace.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %></span>

       <%= link_to t('trace.trace.more'), {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id}, {:title => t('trace.trace.trace_details')} %> /
       <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :lat => trace.latitude, :lon => trace.longitude, :zoom => 14}, {:title => t('trace.trace.view_map')} %> /
       <%= link_to t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %>
       <%= link_to t('trace.trace.more'), {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id}, {:title => t('trace.trace.trace_details')} %> /
       <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :lat => trace.latitude, :lon => trace.longitude, :zoom => 14}, {:title => t('trace.trace.view_map')} %> /
       <%= link_to t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 75a10defdf90b9d163e2c6f3b8a961cb7a09dc76..c285f25249b97b05810c06adff77f2ae49fa8332 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -163,7 +163,7 @@ en:
     way_details:
       nodes: "Nodes:"
       part_of: "Part of:"
     way_details:
       nodes: "Nodes:"
       part_of: "Part of:"

-      also_part_of: "also part of {{related_ways}}"
+      also_part_of: "also part of the ways {{related_ways}}"

     way_history:
       way_history: "Way History"
       way_history_title: "Way History: {{way_name}}"
     way_history:
       way_history: "Way History"
       way_history_title: "Way History: {{way_name}}"


@@ -482,6 +482,8 @@ en:
       of: "of"
     trace:
       pending: "PENDING"
       of: "of"
     trace:
       pending: "PENDING"

+      count_points: "{{count}} points"
+      ago: "{{time_in_words_ago}} ago"

       more: "more"
       trace_details: "View Trace Details"
       view_map: "View Map"
       more: "more"
       trace_details: "View Trace Details"
       view_map: "View Map"