Download as
Browse Code »

Commit 15bf0b7ea4b937ac158b58c93d80cfb01bdcfd76

Authored by Rodrigo Souto
1 parent 77501269
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

[comments-refactor-review] Fixing ApproveComment information

Showing 1 changed file with 7 additions and 2 deletions   Show diff stats
app/models/approve_comment.rb
  Diff comments   View file @15bf0b7
@@ -10,7 +10,7 @@ class ApproveComment < Task @@ -10,7 +10,7 @@ class ApproveComment < Task
10 end 10 end
11 11
12 def requestor_name 12 def requestor_name
13 - requestor ? requestor.name : _('Anonymous') 13 + requestor ? requestor.name : (comment.name || _('Anonymous'))
14 end 14 end
15 15
16 def article 16 def article
@@ -41,7 +41,12 @@ class ApproveComment < Task @@ -41,7 +41,12 @@ class ApproveComment < Task
41 41
42 def information 42 def information
43 if article 43 if article
44 - {:message => _('%{requestor} commented on the the article: %{linked_subject}.') % {:requestor => requestor_name, :linked_subject => linked_subject} } 44 + if requestor
  45 + {:message => _('%{requestor} commented on the the article: %{linked_subject}.')}
  46 + else
  47 + { :message => _('%{requestor} commented on the the article: %{linked_subject}.'),
  48 + :variables => {:requestor => requestor_name} }
  49 + end
45 else 50 else
46 {:message => _("The article was removed.")} 51 {:message => _("The article was removed.")}
47 end 52 end