From ec9deb5dc2a4af5db3f0e993942a0aa438a21e94 Mon Sep 17 00:00:00 2001 From: Jenny Herbert Date: Sun, 31 May 2009 14:20:20 +0000 Subject: [PATCH] Added translates to trace/view --- app/views/trace/view.rhtml | 28 ++++++++++++++-------------- config/locales/en.yml | 28 ++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/app/views/trace/view.rhtml b/app/views/trace/view.rhtml index 585342c02..381a2fc97 100644 --- a/app/views/trace/view.rhtml +++ b/app/views/trace/view.rhtml @@ -3,44 +3,44 @@ <% if @trace.inserted %> <% else %> - PENDING + <%= t'trace.view.pending' %> <% end %> - - + + - + <% if @trace.inserted? %> - + - - + + <% end %> - + - + - + @@ -51,13 +51,13 @@
Filename:<%= @trace.name %> (<%= link_to 'download', :controller => 'trace', :action => 'data', :id => @trace.id %>)<%= t'trace.view.filename' %><%= @trace.name %> (<%= link_to t('trace.view.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)
Uploaded at:<%= t'trace.view.uploaded' %> <%= @trace.timestamp %>
Points:<%= t'trace.view.points' %> <%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>
Start coordinate:
<%= @trace.latitude %>; <%= @trace.longitude %>
(<%=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 %>)		<%= t'trace.view.start_coordinates' %>
<%= @trace.latitude %>; <%= @trace.longitude %>
(<%=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 %>)
Owner:<%= t'trace.view.owner' %> <%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %>
Description:<%= t'trace.view.description' %> <%= h(@trace.description) %>
Tags:<%= t'trace.view.tags' %> <% 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 %>
<% unless @trace.public? %> - + <% end %> <% if @trace.user == @user %> - + <% end %> <% if @trace.user == @user %> - + <% end %>
<%= button_to 'Make this track public permanently', :controller => 'trace', :action => 'make_public', :id => @trace.id %><%= button_to t('trace.view.make_public'), :controller => 'trace', :action => 'make_public', :id => @trace.id %><%= button_to 'Edit this track', :controller => 'trace', :action => 'edit', :id => @trace.id %><%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %><%= button_to 'Delete this track', :controller => 'trace', :action => 'delete', :id => @trace.id %><%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 53d9098b3..ee5bb1b76 100644 --- 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 webmaster 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." -- 2.43.2