X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d4a461dc26ce20d2ae806f126c0b43a7214d2156..e0b175d3bd3ef655a20273dc2b7f04a8a34bb5f6:/app/views/user/view.html.erb
diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 91f85f305..bc70545f5 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -1,44 +1,44 @@
<% content_for :heading do %>
-
<%= raw(t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name)) %>
+
<%= raw(t '.if set location', :settings_link => (link_to t('.settings_link_text'), :controller => 'user', :action => 'account', :display_name => current_user.display_name)) %>
<% else %>
<% content_for :head do %>
@@ -182,27 +182,27 @@
<% end %>
<%
user_data = {
- :lon => @user.home_lon,
- :lat => @user.home_lat,
+ :lon => current_user.home_lon,
+ :lat => current_user.home_lat,
:icon => image_path("marker-red.png"),
- :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"})
+ :description => render(:partial => "popup", :object => current_user, :locals => {:type => "your location"})
}
%>
<%= content_tag "div", "", :id => "map", :class => "content_map", :data => {:user => user_data} %>
<% end %>
- <% friends = @this_user.friends.collect { |f| f.befriendee } %>
- <% nearby = @this_user.nearby - friends %>
+ <% friends = @user.friends.collect { |f| f.befriendee } %>
+ <% nearby = @user.nearby - friends %>
-
<%= t 'user.view.your friends' %>
+
<%= t '.my friends' %>
<% if friends.empty? %>
- <%= t 'user.view.no friends' %>
+ <%= t '.no friends' %>
<% else %>
- - <%= link_to t('user.view.friends_changesets'), friend_changesets_path %>
- - <%= link_to t('user.view.friends_diaries'), friend_diaries_path %>
+ - <%= link_to t('.friends_changesets'), friend_changesets_path %>
+ - <%= link_to t('.friends_diaries'), friend_diaries_path %>
<%= render :partial => "contact", :collection => friends, :locals => {:type => "friend"} %>
@@ -211,14 +211,14 @@
-
<%= t 'user.view.nearby users' %>
+
<%= t '.nearby users' %>
<% if nearby.empty? %>
- <%= t 'user.view.no nearby users' %>
+ <%= t '.no nearby users' %>
<% else %>
- - <%= link_to t('user.view.nearby_changesets'), nearby_changesets_path %>
- - <%= link_to t('user.view.nearby_diaries'), nearby_diaries_path %>
+ - <%= link_to t('.nearby_changesets'), nearby_changesets_path %>
+ - <%= link_to t('.nearby_diaries'), nearby_diaries_path %>
<%= render :partial => "contact", :collection => nearby, :locals => {:type => "nearby mapper"} %>