Added translates to trace/view

diff --git a/app/views/trace/view.rhtml b/app/views/trace/view.rhtml
index 585342c0224c6abc6c88f024d194ee40efbf6ee9..381a2fc973c2c7612c871f270e8e51e117d3e753 100644 (file)
--- a/app/views/trace/view.rhtml
+++ b/app/views/trace/view.rhtml
@@ -3,44 +3,44 @@
   <% if @trace.inserted %>
     <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
   <% else %>
-    <span style="color:red">PENDING</span>
+    <span style="color:red"><%= t'trace.view.pending' %></span>
   <% end %>
 
 <table border="0">
   <tr>
-    <td>Filename:</td>
-    <td><%= @trace.name %> (<%= link_to 'download', :controller => 'trace', :action => 'data', :id => @trace.id %>)</td>
+    <td><%= t'trace.view.filename' %></td>
+    <td><%= @trace.name %> (<%= link_to t('trace.view.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)</td>
   </tr> 
   <tr>
-    <td>Uploaded at:</td>
+    <td><%= t'trace.view.uploaded' %></td>
     <td><%= @trace.timestamp %></td>
   </tr>
   <% if @trace.inserted? %>
   <tr>
-    <td>Points:</td>
+    <td><%= t'trace.view.points' %></td>
     <td><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %></td></tr>
   <tr>
-    <td>Start coordinate:</td>
-    <td><div class="geo" style="display: inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to 'map', :controller => 'site', :action => 'index', :lat => @trace.latitude, :lon => @trace.longitude, :zoom => 14 %> / <%=link_to 'edit', :controller => 'site', :action => 'edit', :lat => @trace.latitude, :lon => @trace.longitude, :gpx=> @trace.id, :zoom => 14 %>)</td>
+    <td><%= t'trace.view.start_coordinates' %></td>
+    <td><div class="geo" style="display: inline"><span class="latitude"><%= @trace.latitude %></span>; <span class="longitude"><%= @trace.longitude %></span></div> (<%=link_to t('trace.view.map'), :controller => 'site', :action => 'index', :lat => @trace.latitude, :lon => @trace.longitude, :zoom => 14 %> / <%=link_to t('trace.view.edit'), :controller => 'site', :action => 'edit', :lat => @trace.latitude, :lon => @trace.longitude, :gpx=> @trace.id, :zoom => 14 %>)</td>
   </tr>
   <% end %>
   <tr>
-    <td>Owner:</td>
+    <td><%= t'trace.view.owner' %></td>
     <td><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></td>
   </tr>
   <tr>
-    <td>Description:</td>
+    <td><%= t'trace.view.description' %></td>
     <td><%= h(@trace.description) %></td>
   </tr>
   <tr>
-    <td>Tags:</td>
+    <td><%= t'trace.view.tags' %></td>
     <td>
     <% if @trace.tags %>
       <% @trace.tags.each do |tag| %>
         <%= link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } %>
       <% end %>
     <% else %>
-      None
+      <%= t'trace.view.none' %>
     <% end %>
     </td>
   </tr>
@@ -51,13 +51,13 @@
 <table>
   <tr>
     <% unless @trace.public? %>
-    <td><%= button_to 'Make this track public permanently', :controller => 'trace', :action => 'make_public', :id => @trace.id %></td>
+    <td><%= button_to t('trace.view.make_public'), :controller => 'trace', :action => 'make_public', :id => @trace.id %></td>
     <% end %>
     <% if @trace.user == @user %>
-    <td><%= button_to 'Edit this track', :controller => 'trace', :action => 'edit', :id => @trace.id %></td>
+    <td><%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %></td>
     <% end %>
     <% if @trace.user == @user %>
-    <td><%= button_to 'Delete this track', :controller => 'trace', :action => 'delete', :id => @trace.id %></td>
+    <td><%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %></td>
     <% end %>
   </tr>
 </table>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 53d9098b3a483d566a043a66c1ee5e6a6eeb9232..ee5bb1b76e9dd80bcbc7ebaeb7fe08c69ab995cd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -275,28 +275,44 @@ en:
       description: "Description:"
       tags: "Tags:"
       save_button: "Save Changes"
+    view:
+         pending: "PENDING"
+         filename: "Filename:"
+         download: "download"
+      uploaded: "Uploaded at:"
+         points: "Points:"
+         start_coordinates: "Start coordinate:"
+         map: "map"
+      edit: "edit"
+         owner: "Owner:"
+         description: "Description:"
+         tags: "Tags"
+         none: "None"
+         make_public: "Make this track public permanently"
+         edit_track: "Edit this track"
+         delete_track: "Delete this track"
   user:
     login:
-      heading: Login
+      heading: "Login"
       please login: "Please login or {{create_user_link}}."
-      create_account: create an account
+      create_account: "create an account"
       email or username: "Email Address or Username: "
       password: "Password: "
       lost password link: "Lost your password?"
-      login_button: Login
+      login_button: "Login"
     lost_password:
-      title: lost password
+      title: "lost 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
+      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
+      heading: "Create a User Account"
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
       fill_form: "Fill in the form and we'll send you a quick email to activate your account."