Download as
Browse Code »

Commit 99b8b9f9033967a149494b0c3fc40faed84fd33d

Authored by Antonio Terceiro
1 parent 35568d4d
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

Change wording of the member invitation message

Showing 4 changed files with 10 additions and 10 deletions   Show diff stats
app/models/invite_member.rb
  Diff comments   View file @99b8b9f
@@ -16,7 +16,7 @@ class InviteMember < Invitation @@ -16,7 +16,7 @@ class InviteMember < Invitation
16 end 16 end
17 17
18 def description 18 def description
19 - _('%s invites you to join the community %s.') % [person.name, community.name] 19 + _('%s invited you to join the community %s') % [person.name, community.name]
20 end 20 end
21 21
22 def expanded_message 22 def expanded_message
app/views/tasks/_invite_member.rhtml
  Diff comments   View file @99b8b9f
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 <%= link_to( profile_image(task.requestor, :minor, :border => 0), task.requestor.public_profile_url ) %> 3 <%= link_to( profile_image(task.requestor, :minor, :border => 0), task.requestor.public_profile_url ) %>
4 4
5 -<%= _('%s invites you to join the community %s.') % 5 +<%= _('%s invited you to join the community %s') %
6 [content_tag('strong', link_to( task.requestor.name, task.requestor.public_profile_url ) ), 6 [content_tag('strong', link_to( task.requestor.name, task.requestor.public_profile_url ) ),
7 content_tag('strong', link_to( task.community.name, task.community.public_profile_url ) )] %> 7 content_tag('strong', link_to( task.community.name, task.community.public_profile_url ) )] %>
8 8
features/invitation.feature
  Diff comments   View file @99b8b9f
@@ -93,7 +93,7 @@ Feature: invitation @@ -93,7 +93,7 @@ Feature: invitation
93 Given there are no pending jobs 93 Given there are no pending jobs
94 When I am logged in as "josesantos" 94 When I am logged in as "josesantos"
95 And I go to the Control panel 95 And I go to the Control panel
96 - And I should see "josesilva invites you to join the community 26 Bsslines." 96 + And I should see "josesilva invited you to join the community 26 Bsslines"
97 97
98 Scenario: noosfero user accepts to join community 98 Scenario: noosfero user accepts to join community
99 Given I invite email "santos@invalid.br" to join community "26 Bsslines" 99 Given I invite email "santos@invalid.br" to join community "26 Bsslines"
@@ -101,10 +101,10 @@ Feature: invitation @@ -101,10 +101,10 @@ Feature: invitation
101 When I am logged in as "josesantos" 101 When I am logged in as "josesantos"
102 And I go to the Control panel 102 And I go to the Control panel
103 And I follow "Process requests" 103 And I follow "Process requests"
104 - And I should see "josesilva invites you to join the community 26 Bsslines." 104 + And I should see "josesilva invited you to join the community 26 Bsslines"
105 And I choose "Accept" 105 And I choose "Accept"
106 When I press "Ok!" 106 When I press "Ok!"
107 - Then I should not see "josesilva invites you to join the community 26 Bsslines." 107 + Then I should not see "josesilva invited you to join the community 26 Bsslines"
108 When I go to the Control panel 108 When I go to the Control panel
109 And I follow "Manage my groups" 109 And I follow "Manage my groups"
110 Then I should see "26 Bsslines" 110 Then I should see "26 Bsslines"
@@ -115,10 +115,10 @@ Feature: invitation @@ -115,10 +115,10 @@ Feature: invitation
115 When I am logged in as "josesantos" 115 When I am logged in as "josesantos"
116 And I go to the Control panel 116 And I go to the Control panel
117 And I follow "Process requests" 117 And I follow "Process requests"
118 - And I should see "josesilva invites you to join the community 26 Bsslines." 118 + And I should see "josesilva invited you to join the community 26 Bsslines"
119 And I choose "Reject" 119 And I choose "Reject"
120 When I press "Ok!" 120 When I press "Ok!"
121 - Then I should not see "josesilva invites you to join the community 26 Bsslines." 121 + Then I should not see "josesilva invited you to join the community 26 Bsslines"
122 When I go to the Control panel 122 When I go to the Control panel
123 And I follow "Manage my groups" 123 And I follow "Manage my groups"
124 Then I should not see "26 Bsslines" 124 Then I should not see "26 Bsslines"
po/pt/noosfero.po
  Diff comments   View file @99b8b9f
@@ -13,7 +13,7 @@ msgid &quot;&quot; @@ -13,7 +13,7 @@ msgid &quot;&quot;
13 msgstr "" 13 msgstr ""
14 "Project-Id-Version: noosfero 0.25.3\n" 14 "Project-Id-Version: noosfero 0.25.3\n"
15 "POT-Creation-Date: 2010-08-30 16:46-0300\n" 15 "POT-Creation-Date: 2010-08-30 16:46-0300\n"
16 -"PO-Revision-Date: 2010-08-30 16:47-0300\n" 16 +"PO-Revision-Date: 2010-08-31 19:55-0300\n"
17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n" 17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18 "Language-Team: LANGUAGE TEAM <E-MAIL@ADDRESS or HOME PAGE>\n" 18 "Language-Team: LANGUAGE TEAM <E-MAIL@ADDRESS or HOME PAGE>\n"
19 "MIME-Version: 1.0\n" 19 "MIME-Version: 1.0\n"
@@ -3207,8 +3207,8 @@ msgid &quot;&#39;%{user} wants to activate email &#39;%{email}&#39;&quot; @@ -3207,8 +3207,8 @@ msgid &quot;&#39;%{user} wants to activate email &#39;%{email}&#39;&quot;
3207 msgstr "%{user} quer ativar o e-mail '%{email}'" 3207 msgstr "%{user} quer ativar o e-mail '%{email}'"
3208 3208
3209 #: app/models/invite_member.rb:19 app/views/tasks/_invite_member.rhtml:5 3209 #: app/models/invite_member.rb:19 app/views/tasks/_invite_member.rhtml:5
3210 -msgid "%s invites you to join the community %s."  
3211 -msgstr "%s te está te convidando para entrar na comunidade %s." 3210 +msgid "%s invited you to join the community %s"
  3211 +msgstr "%s te convidou para entrar na comunidade %s"
3212 3212
3213 #: app/models/invite_member.rb:28 app/models/invite_friend.rb:20 3213 #: app/models/invite_member.rb:28 app/models/invite_friend.rb:20
3214 msgid "Hello <friend>," 3214 msgid "Hello <friend>,"