From: Herve Saint-Amand <git@saintamh.org>
Date: Mon, 16 Jan 2017 21:13:52 +0000 (+0000)
Subject: Renamed @user_message_author to @author as suggested
X-Git-Tag: live~3588^2~11
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1e19e80d0e2420a1ca1951d364d4a95d159eceeb

Renamed @user_message_author to @author as suggested
---

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 1de865120..8e386edf8 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -77,7 +77,7 @@ class Notifier < ActionMailer::Base
       @replyurl = url_for(:host => SERVER_URL,
                           :controller => "message", :action => "reply",
                           :message_id => message.id)
-      @user_message_author = @from_user
+      @author = @from_user
 
       attach_user_avatar(message.sender)
 
@@ -110,7 +110,7 @@ class Notifier < ActionMailer::Base
                           :action => "new",
                           :display_name => comment.user.display_name,
                           :title => "Re: #{comment.diary_entry.title}")
-      @user_message_author = @from_user
+      @author = @from_user
 
       attach_user_avatar(comment.user)
 
@@ -129,7 +129,7 @@ class Notifier < ActionMailer::Base
       @friendurl = url_for(:host => SERVER_URL,
                            :controller => "user", :action => "make_friend",
                            :display_name => @friend.befriender.display_name)
-      @user_message_author = @friend.befriender.display_name
+      @author = @friend.befriender.display_name
 
       attach_user_avatar(@friend.befriender)
       mail :to => friend.befriendee.email,
@@ -151,7 +151,7 @@ class Notifier < ActionMailer::Base
                      I18n.t("notifier.note_comment_notification.anonymous")
                    end
 
-      @user_message_author = @commenter
+      @author = @commenter
       attach_user_avatar(comment.author)
 
       subject = if @owner
@@ -173,7 +173,7 @@ class Notifier < ActionMailer::Base
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name
-      @user_message_author = @commenter
+      @author = @commenter
 
       subject = if @owner
                   I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
diff --git a/app/views/notifier/_user_message_table.html.erb b/app/views/notifier/_user_message_table.html.erb
index 0a7300173..1b33e082b 100644
--- a/app/views/notifier/_user_message_table.html.erb
+++ b/app/views/notifier/_user_message_table.html.erb
@@ -4,10 +4,10 @@
       <%= link_to(
           image_tag(
             attachments["avatar.png"].url,
-            alt: @user_message_author,
-            title: @user_message_author
+            alt: @author,
+            title: @author
           ),
-          user_url(@user_message_author, :host => SERVER_URL),
+          user_url(@author, :host => SERVER_URL),
           :target => "_blank"
       ) %>
     </td>