From c00deabf7507739edd242f3cb83bbd6b413e61f8 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Thu, 12 Feb 2015 00:15:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E3=80=8B=20Signed-off-by:=20alan=20<54753343?=
 =?UTF-8?q?4@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb                               | 2 +-
 app/views/mailer/send_for_user_activities.html.erb | 4 ++--
 app/views/mailer/send_for_user_activities.text.erb | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 4da1f9b42..14c01b93d 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -134,7 +134,7 @@ class Mailer < ActionMailer::Base
     @issue_author_url = url_for(user_activities_url(@author))
     recipients ||= []
     if @forum.author.mail_notification != 'day' && @forum.author.mail_notification != 'week'
-      recipients << @forum.author.mail
+      recipients << @forum.creator.mail
     end
     if @author.mail_notification != 'day' && @author.mail_notification != 'week'
       recipients << @author.mail
diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index ed7877360..1735bd899 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -319,7 +319,7 @@
             <li  style="clear: both; list-style: none;">
               <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
 
-              <%= link_to forum.author, user_activities_url(forum.author,:token => @token.value),
+              <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value),
                           :class => "wmail_name",
                           :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
               <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_forum_new) %></span>
@@ -349,7 +349,7 @@
                   <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value),
                               :class => "wmail_name",
                               :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_memo_new_from_forum) %></span>
+                  <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply)  %></span>
 
                   <%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id)),
                               :class => 'wmail_info',
diff --git a/app/views/mailer/send_for_user_activities.text.erb b/app/views/mailer/send_for_user_activities.text.erb
index b7d0553e3..4de42b8aa 100644
--- a/app/views/mailer/send_for_user_activities.text.erb
+++ b/app/views/mailer/send_for_user_activities.text.erb
@@ -259,7 +259,7 @@
             <% @forums.each do |forum|%>
                 ▪
 
-                  <%= link_to forum.author, user_activities_url(forum.author,:token => @token.value) %>
+                  <%= link_to forum.creator, user_activities_url(forum.creator,:token => @token.value) %>
                   <%= l(:label_forum_new) %>
 
                   <%= link_to truncate(forum.name,length: 30,omission: '...'),forum_url(forum,:token => @token.value)
@@ -279,7 +279,7 @@
                 ▪
 
                   <%= link_to memo.author, user_activities_url(memo.author,:token => @token.value)%>
-                  <%= l(:label_memo_new_from_forum) %>
+                  <%= memo.parent_id.nil? ? l(:label_memo_new_from_forum) : l(:label_reply) %>
 
                   <%= link_to truncate(memo.subject,length: 30,omission: '...'),forum_memo_url(memo.forum, (memo.parent_id.nil? ? memo : memo.parent_id))
                               %>