Update translation keys for renaming of user to users

Fixes #2031

diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb
index bcc2faf354bf54f4a1987a20deefd4d815c3c0f4..ec39136968cbf490aedd4dbaf62e3158ba134a4b 100644 (file)
--- 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 %>
     </p>

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index ce64310cb45734bbc66603f8a9561dbfde21fdfc..94e65e09146b56650ab505d310f3cf2d816433f5 100644 (file)
--- 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