X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3e8d8092500a3713e8dfbb4fd61fd8a95d067d20..ecbd526956fbfaf3e59c27c25b72de2f4d780c7a:/app/views/user/view.html.erb diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 8aa4ead49..b333b5c67 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -75,7 +75,7 @@ <% end %> -

<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %>

+

<%= t 'user.view.mapper since' %> <%= l @this_user.creation_time, :format => :friendly %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %>

<% if @user and @user.administrator? %>

<%= t 'user.view.email address' %> <%= @this_user.email %>

@@ -87,7 +87,7 @@
<%= htmlize(@this_user.description) %>
<% if @user and @this_user.id == @user.id %> -
+
<% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %>

<%= 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) %>