Download as
Browse Code »

Commit 815c8f6a04c1ee64180ee98ca3144da838dbe994

Authored by Braulio Bhavamitra
2 parents 6573492a dbd7cf09
Exists in master and in 9 other branches article_hit_count, checkbox_to_user_can_edit_page, communities_ratings, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_user_email_validation, notification_plugin, notification_plugin_rebase

Merge branch 'better-phrase-on-add-member' into noosfero

Showing 2 changed files with 6 additions and 5 deletions   Show diff stats
app/models/add_member.rb
  Diff comments   View file @815c8f6
... ... @@ -26,7 +26,8 @@ class AddMember < Task
26 26 end
27 27  
28 28 def information
29   - {:message => _('%{requestor} wants to be a member of this community.')}
  29 + {:message => _("%{requestor} wants to be a member of '%{organization}'."),
  30 + variables: {requestor: requestor.name, organization: organization.name}}
30 31 end
31 32  
32 33 def accept_details
... ... @@ -42,7 +43,7 @@ class AddMember < Task
42 43 end
43 44  
44 45 def target_notification_description
45   - _('%{requestor} wants to be a member of this community.') % {:requestor => requestor.name}
  46 + _("%{requestor} wants to be a member of '%{organization}'.") % {:requestor => requestor.name, :organization => organization.name}
46 47 end
47 48  
48 49 def target_notification_message
... ...
test/unit/add_member_test.rb
  Diff comments   View file @815c8f6
... ... @@ -105,20 +105,20 @@ class AddMemberTest < ActiveSupport::TestCase
105 105 should 'have target notification message' do
106 106 task = AddMember.new(:person => person, :organization => community)
107 107  
108   - assert_match(/#{person.name} wants to be a member of this community.*[\n]*.*to accept or reject/, task.target_notification_message)
  108 + assert_match(/#{person.name} wants to be a member of '#{community.name}'.*[\n]*.*to accept or reject/, task.target_notification_message)
109 109 end
110 110  
111 111 should 'have target notification description' do
112 112 task = AddMember.new(:person => person, :organization => community)
113 113  
114   - assert_match(/#{task.requestor.name} wants to be a member of this community/, task.target_notification_description)
  114 + assert_match(/#{task.requestor.name} wants to be a member of '#{community.name}'/, task.target_notification_description)
115 115 end
116 116  
117 117 should 'deliver target notification message' do
118 118 task = AddMember.new(:person => person, :organization => community)
119 119  
120 120 email = TaskMailer.target_notification(task, task.target_notification_message).deliver
121   - assert_match(/#{task.requestor.name} wants to be a member of this community/, email.subject)
  121 + assert_match(/#{task.requestor.name} wants to be a member of '#{community.name}'/, email.subject)
122 122 end
123 123  
124 124 end
... ...