Download as
Browse Code »

Commit 7ce466a92327c45dfa8a61dfe75ebfbb731d0b2a

Authored by Antonio Terceiro
1 parent 59e2f02e
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Rename Comment::Notifier to CommentNotifier

Showing 6 changed files with 44 additions and 44 deletions   Show diff stats
app/mailers/comment_notifier.rb
  Diff comments   View file @7ce466a
1 -class Comment::Notifier < ActionMailer::Base 1 +class CommentNotifier < ActionMailer::Base
2 def notification(comment) 2 def notification(comment)
3 profile = comment.article.profile 3 profile = comment.article.profile
4 @recipient = profile.nickname || profile.name 4 @recipient = profile.nickname || profile.name
app/models/comment.rb
  Diff comments   View file @7ce466a
@@ -132,11 +132,11 @@ class Comment &lt; ActiveRecord::Base @@ -132,11 +132,11 @@ class Comment &lt; ActiveRecord::Base
132 def notify_by_mail 132 def notify_by_mail
133 if source.kind_of?(Article) && article.notify_comments? 133 if source.kind_of?(Article) && article.notify_comments?
134 if !notification_emails.empty? 134 if !notification_emails.empty?
135 - Comment::Notifier.notification(self).deliver 135 + CommentNotifier.notification(self).deliver
136 end 136 end
137 emails = article.followers - [author_email] 137 emails = article.followers - [author_email]
138 if !emails.empty? 138 if !emails.empty?
139 - Comment::Notifier.mail_to_followers(self, emails).deliver 139 + CommentNotifier.mail_to_followers(self, emails).deliver
140 end 140 end
141 end 141 end
142 end 142 end
app/views/comment/notifier/mail_to_followers.html.erb
View file @59e2f02
@@ -1,22 +0,0 @@ @@ -1,22 +0,0 @@
1 -<%= _('Hi!') %>  
2 -  
3 -<%= word_wrap(_('%{sender} (%{sender_link}) commented on the content "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>  
4 -  
5 -<%= word_wrap(_('Title: %s') % @comment_title) if @comment_title %>  
6 -  
7 -<%= _("Comment:") %>  
8 --------------------------------------------------------------------------------  
9 -<%= word_wrap(@comment_body) %>  
10 --------------------------------------------------------------------------------  
11 -  
12 -<%= _('Click on the address below to view this comment:') %>  
13 -<%= url_for @comment_url %>  
14 -  
15 -<%= _('Click on the address below to cancel the notification of new comments:') %>  
16 -<%= url_for @unsubscribe_url %>  
17 -  
18 -<%= _("Greetings,") %>  
19 -  
20 ---  
21 -<%= _('%s team.') % @environment %>  
22 -<%= url_for @url %>  
app/views/comment/notifier/notification.text.erb
View file @59e2f02
@@ -1,19 +0,0 @@ @@ -1,19 +0,0 @@
1 -<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>  
2 -  
3 -<%= word_wrap(_('%{sender} (%{sender_link}) created a new comment on your article "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>  
4 -  
5 -<%= word_wrap(_('Title: %s') % @comment_title) %>  
6 -  
7 -<%= _("Comment:") %>  
8 --------------------------------------------------------------------------------  
9 -<%= word_wrap(@comment_body) %>  
10 --------------------------------------------------------------------------------  
11 -  
12 -<%= _('Access the address below to view this comment:') %>  
13 -<%= url_for @comment_url %>  
14 -  
15 -<%= _("Greetings,") %>  
16 -  
17 ---  
18 -<%= _('%s team.') % @environment %>  
19 -<%= url_for @url %>  
app/views/comment_notifier/mail_to_followers.html.erb 0 → 100644
  Diff comments   View file @7ce466a
@@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
  1 +<%= _('Hi!') %>
  2 +
  3 +<%= word_wrap(_('%{sender} (%{sender_link}) commented on the content "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
  4 +
  5 +<%= word_wrap(_('Title: %s') % @comment_title) if @comment_title %>
  6 +
  7 +<%= _("Comment:") %>
  8 +-------------------------------------------------------------------------------
  9 +<%= word_wrap(@comment_body) %>
  10 +-------------------------------------------------------------------------------
  11 +
  12 +<%= _('Click on the address below to view this comment:') %>
  13 +<%= url_for @comment_url %>
  14 +
  15 +<%= _('Click on the address below to cancel the notification of new comments:') %>
  16 +<%= url_for @unsubscribe_url %>
  17 +
  18 +<%= _("Greetings,") %>
  19 +
  20 +--
  21 +<%= _('%s team.') % @environment %>
  22 +<%= url_for @url %>
app/views/comment_notifier/notification.text.erb 0 → 100644
  Diff comments   View file @7ce466a
@@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
  1 +<%= _('Hi, %{recipient}!') % { :recipient => @recipient } %>
  2 +
  3 +<%= word_wrap(_('%{sender} (%{sender_link}) created a new comment on your article "%{article_title}".') % { :sender => @sender, :sender_link => url_for(@sender_link), :article_title => @article_title }) %>
  4 +
  5 +<%= word_wrap(_('Title: %s') % @comment_title) %>
  6 +
  7 +<%= _("Comment:") %>
  8 +-------------------------------------------------------------------------------
  9 +<%= word_wrap(@comment_body) %>
  10 +-------------------------------------------------------------------------------
  11 +
  12 +<%= _('Access the address below to view this comment:') %>
  13 +<%= url_for @comment_url %>
  14 +
  15 +<%= _("Greetings,") %>
  16 +
  17 +--
  18 +<%= _('%s team.') % @environment %>
  19 +<%= url_for @url %>