X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/446837c3511bf76f11b0d1e6d5a3ff79b69b0d70..ef6803416be6a3be43162f18ed5128cebc4c6033:/app/views/users/show.html.erb?ds=sidebyside diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 8987785da..81e33dddb 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -78,7 +78,7 @@ <%= link_to t(".comments"), diary_comments_path(@user) %>
  • - <% if current_user and current_user.is_friends_with?(@user) %> + <% if current_user and current_user.friends_with?(@user) %> <%= link_to t(".remove as friend"), remove_friend_path(:display_name => @user.display_name), :method => :post %> <% elsif current_user %> <%= link_to t(".add as friend"), make_friend_path(:display_name => @user.display_name), :method => :post %> @@ -118,12 +118,12 @@
    -
    -
    <%= t ".mapper since" %>
    -
    <%= l @user.created_at.to_date, :format => :long %>
    +
    +
    <%= t ".mapper since" %>
    +
    <%= l @user.created_at.to_date, :format => :long %>
    <% unless @user.terms_agreed %> -
    <%= t ".ct status" %>
    -
    +
    <%= t ".ct status" %>
    +
    <% if @user.terms_seen? -%> <%= t ".ct declined" %> <% else -%> @@ -188,17 +188,17 @@ <% if current_user and current_user.administrator? -%>
    -
    -
    <%= t ".email address" %>
    -
    <%= @user.email %>
    +
    +
    <%= t ".email address" %>
    +
    <%= @user.email %>
    <% unless @user.creation_ip.nil? -%> -
    <%= t ".created from" %>
    -
    <%= @user.creation_ip %>
    +
    <%= t ".created from" %>
    +
    <%= @user.creation_ip %>
    <% end -%> -
    <%= t ".status" %>
    -
    <%= @user.status.capitalize %>
    -
    <%= t ".spam score" %>
    -
    <%= @user.spam_score %>
    +
    <%= t ".status" %>
    +
    <%= @user.status.capitalize %>
    +
    <%= t ".spam score" %>
    +
    <%= @user.spam_score %>