From a5124ed40900e1a8c16c3acffda651dcdc70e810 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 22 Oct 2018 10:59:05 +0100 Subject: [PATCH 1/1] Update translation keys for renaming of user to users Fixes #2031 --- app/views/users/_contact.html.erb | 4 ++-- test/controllers/users_controller_test.rb | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb index bcc2faf35..ec3913696 100644 --- a/app/views/users/_contact.html.erb +++ b/app/views/users/_contact.html.erb @@ -14,9 +14,9 @@ <% if @user.home_lon and @user.home_lat and contact.home_lon and contact.home_lat %> <% distance = @user.distance(contact) %> <% if distance < 1 %> - (<%= t 'user.show.m away', :count => (distance * 1000).round %>) + (<%= t 'users.show.m away', :count => (distance * 1000).round %>) <% else %> - (<%= t 'user.show.km away', :count => distance.round %>) + (<%= t 'users.show.km away', :count => distance.round %>) <% end %> <% end %>

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index ce64310cb..94e65e091 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -941,8 +941,9 @@ class UsersControllerTest < ActionController::TestCase assert_response :not_found # Test a normal user - user = create(:user) - create(:friend, :befriender => user) + user = create(:user, :home_lon => 1.1, :home_lat => 1.1) + friend_user = create(:user, :home_lon => 1.2, :home_lat => 1.2) + create(:friend, :befriender => user, :befriendee => friend_user) get :show, :params => { :display_name => user.display_name } assert_response :success assert_select "div#userinformation" do -- 2.43.2