Typo in site key. More of the user view i18n'ed

diff --git a/app/views/site/_key.rhtml b/app/views/site/_key.rhtml
index 6969916a28180cfccb1605ca090c04c8604805e4..9782b4cc59ef6422229d173b68289563b40a960f 100644 (file)
--- a/app/views/site/_key.rhtml
+++ b/app/views/site/_key.rhtml
@@ -1,5 +1,5 @@
 <% content_for :left_menu do %>
-<%= link_to_function t('side.key.map_key'), "showKey();" %>
+<%= link_to_function t('site.key.map_key'), "showKey();" %>
 <% end %>
 
 <script type="text/javascript">

diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml
index c76ca23ae620055bdbe1db9aca8569bfaf371468..9bfffad4ba5e1f12d8ce264b03e7236b36a45184 100644 (file)
--- a/app/views/user/view.rhtml
+++ b/app/views/user/view.rhtml
@@ -1,30 +1,29 @@
-<% @this_user = User.find_by_display_name(@this_user.display_name) %>
 <h2><%= h(@this_user.display_name) %></h2>
 <div id="userinformation">
 <% if @user and @this_user.id == @user.id %>
 <!-- Displaying user's own profile page -->
-<%= link_to 'my diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
-| <%= link_to 'new diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
-| <%= link_to 'my edits', :controller => 'changeset', :action => 'list_user', :display_name => @user.display_name %>
-| <%= link_to 'my traces', :controller => 'trace', :action=>'mine' %>
-| <%= link_to 'my settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %>
+<%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>
+| <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
+| <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list_user', :display_name => @user.display_name %>
+| <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %>
+| <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
 <% else %>
 <!-- Displaying another user's profile page -->
-<%= link_to 'send message', :controller => 'message', :action => 'new', :user_id => @this_user.id %>
-| <%= link_to 'diary', :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
-| <%= link_to 'edits', :controller => 'changeset', :action => 'list_user', :display_name => @this_user.display_name %>
-| <%= link_to 'traces', :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
+<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @this_user.id %>
+| <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
+| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list_user', :display_name => @this_user.display_name %>
+| <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
 | <% if @user and @user.is_friends_with?(@this_user) %>
-  <%= link_to 'remove as friend', :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %>
+  <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %>
 <% else %>
-  <%= link_to 'add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %>
+  <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %>
 <% end %>
 <% end %>
 </div>
 
 <% if @this_user != nil %>
 <P>
-<b>Mapper since : </b><%= @this_user.creation_time %> (<%= time_ago_in_words(@this_user.creation_time) %> ago)
+<b><%= t 'user.view.mapper since' %></b><%= l @this_user.creation_time %> (<%= time_ago_in_words(@this_user.creation_time) %> ago)
 </P>
 <% end %>
   

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b9e0cd7ef8e1f0ca7562ba1973a7fab1b7ef36bf..ac61b1f9d2819d6c18e1113b021700ff8da87504 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -73,7 +73,7 @@ en:
       anon_edits: "({{link}})"
       anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."
-      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/index.php/Editing">Several other options</a> are also available for editing OpenStreetMap.'
+      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
       potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point.)"
     sidebar:
       search_results: Search Results
@@ -83,7 +83,7 @@ en:
       where_am_i: "Where am I?"
       submit_text: "Go"
       searching: "Searching..."
-      search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/index.php/Search'>more examples...</a>"
+      search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
     key:
       map_key: "Map key"
   user:
@@ -107,10 +107,23 @@ en:
       license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
       email address: "Email Address: "
       confirm email address: "Confirm Email Address: "
-      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/index.php/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
+      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
       display name: "Display Name: "
       password: "Password: "
       confirm password: "Confirm Password: "
       signup: Signup
     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:
+      my diary: my diary
+      new diary entry: new diary entry
+      my edits: my edits
+      my traces: my traces
+      my settings: my settings
+      send message: send message
+      diary: diary
+      edits: edits
+      traces: traces
+      remove as friend: remove as friend
+      add as friend: add as friend
+      mapper since: "Mapper since: "