X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/983e21db2e3ccc5f645f40a5f076d35e2b7897c2..b8a8a88004d25837a10436fdc13128146b32c32b:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 554d1e364..4b53c66f6 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -8,7 +8,7 @@ class Notifier < ActionMailer::Base
 
   def signup_confirm(user, token)
     with_recipient_locale user do
-      @url = url_for(:controller => "user", :action => "confirm",
+      @url = url_for(:controller => "users", :action => "confirm",
                      :display_name => user.display_name,
                      :confirm_string => token.token)
 
@@ -20,7 +20,7 @@ class Notifier < ActionMailer::Base
   def email_confirm(user, token)
     with_recipient_locale user do
       @address = user.new_email
-      @url = url_for(:controller => "user", :action => "confirm_email",
+      @url = url_for(:controller => "users", :action => "confirm_email",
                      :confirm_string => token.token)
 
       mail :to => user.new_email,
@@ -30,7 +30,7 @@ class Notifier < ActionMailer::Base
 
   def lost_password(user, token)
     with_recipient_locale user do
-      @url = url_for(:controller => "user", :action => "reset_password",
+      @url = url_for(:controller => "users", :action => "reset_password",
                      :token => token.token)
 
       mail :to => user.email,
@@ -70,7 +70,7 @@ class Notifier < ActionMailer::Base
       @text = message.body
       @title = message.title
       @readurl = message_url(message)
-      @replyurl = reply_message_url(message)
+      @replyurl = message_reply_url(message)
       @author = @from_user
 
       attach_user_avatar(message.sender)
@@ -105,7 +105,7 @@ class Notifier < ActionMailer::Base
     with_recipient_locale friend.befriendee do
       @friend = friend
       @viewurl = user_url(@friend.befriender)
-      @friendurl = url_for(:controller => "user", :action => "make_friend",
+      @friendurl = url_for(:controller => "users", :action => "make_friend",
                            :display_name => @friend.befriender.display_name)
       @author = @friend.befriender.display_name
 
@@ -181,8 +181,8 @@ class Notifier < ActionMailer::Base
   end
 
   def user_avatar_file_path(user)
-    image = user && user.image
-    if image && image.file?
+    image = user&.image
+    if image&.file?
       return image.path(:small)
     else
       return Rails.root.join("app", "assets", "images", "users", "images", "small.png")