diff --git a/app/models/approve_article.rb b/app/models/approve_article.rb index 127d696..627a210 100644 --- a/app/models/approve_article.rb +++ b/app/models/approve_article.rb @@ -116,10 +116,11 @@ class ApproveArticle < Task end def task_cancelled_message - message = _('Your request for publishing the article "{article}" was rejected.') + message = _('Your request for publishing the article "%{article}" was rejected.') % {:article => name} if !reject_explanation.blank? message += " " + _("Here is the reject explanation left by the administrator who rejected your article: \n\n%{reject_explanation}") % {:reject_explanation => reject_explanation} end + message end end diff --git a/test/unit/approve_article_test.rb b/test/unit/approve_article_test.rb index 13f6ff1..e9fc784 100644 --- a/test/unit/approve_article_test.rb +++ b/test/unit/approve_article_test.rb @@ -413,5 +413,14 @@ class ApproveArticleTest < ActiveSupport::TestCase end end + should 'return reject message even without reject explanation' do + task = ApproveArticle.new(:name => 'My Article') + assert_not_nil task.task_cancelled_message + end + + should 'show the name of the article in the reject message' do + task = ApproveArticle.new(:name => 'My Article') + assert_match /My Article/, task.task_cancelled_message + end end -- libgit2 0.21.2