From 99b8b9f9033967a149494b0c3fc40faed84fd33d Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 31 Aug 2010 19:56:55 -0300 Subject: [PATCH] Change wording of the member invitation message --- app/models/invite_member.rb | 2 +- app/views/tasks/_invite_member.rhtml | 2 +- features/invitation.feature | 10 +++++----- po/pt/noosfero.po | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/models/invite_member.rb b/app/models/invite_member.rb index 968c502..2063200 100644 --- a/app/models/invite_member.rb +++ b/app/models/invite_member.rb @@ -16,7 +16,7 @@ class InviteMember < Invitation end def description - _('%s invites you to join the community %s.') % [person.name, community.name] + _('%s invited you to join the community %s') % [person.name, community.name] end def expanded_message diff --git a/app/views/tasks/_invite_member.rhtml b/app/views/tasks/_invite_member.rhtml index 2934ce2..9bdecf6 100644 --- a/app/views/tasks/_invite_member.rhtml +++ b/app/views/tasks/_invite_member.rhtml @@ -2,7 +2,7 @@ <%= link_to( profile_image(task.requestor, :minor, :border => 0), task.requestor.public_profile_url ) %> -<%= _('%s invites you to join the community %s.') % +<%= _('%s invited you to join the community %s') % [content_tag('strong', link_to( task.requestor.name, task.requestor.public_profile_url ) ), content_tag('strong', link_to( task.community.name, task.community.public_profile_url ) )] %> diff --git a/features/invitation.feature b/features/invitation.feature index c825ed2..a660b94 100644 --- a/features/invitation.feature +++ b/features/invitation.feature @@ -93,7 +93,7 @@ Feature: invitation Given there are no pending jobs When I am logged in as "josesantos" And I go to the Control panel - And I should see "josesilva invites you to join the community 26 Bsslines." + And I should see "josesilva invited you to join the community 26 Bsslines" Scenario: noosfero user accepts to join community Given I invite email "santos@invalid.br" to join community "26 Bsslines" @@ -101,10 +101,10 @@ Feature: invitation When I am logged in as "josesantos" And I go to the Control panel And I follow "Process requests" - And I should see "josesilva invites you to join the community 26 Bsslines." + And I should see "josesilva invited you to join the community 26 Bsslines" And I choose "Accept" When I press "Ok!" - Then I should not see "josesilva invites you to join the community 26 Bsslines." + Then I should not see "josesilva invited you to join the community 26 Bsslines" When I go to the Control panel And I follow "Manage my groups" Then I should see "26 Bsslines" @@ -115,10 +115,10 @@ Feature: invitation When I am logged in as "josesantos" And I go to the Control panel And I follow "Process requests" - And I should see "josesilva invites you to join the community 26 Bsslines." + And I should see "josesilva invited you to join the community 26 Bsslines" And I choose "Reject" When I press "Ok!" - Then I should not see "josesilva invites you to join the community 26 Bsslines." + Then I should not see "josesilva invited you to join the community 26 Bsslines" When I go to the Control panel And I follow "Manage my groups" Then I should not see "26 Bsslines" diff --git a/po/pt/noosfero.po b/po/pt/noosfero.po index 3785e07..a400862 100644 --- a/po/pt/noosfero.po +++ b/po/pt/noosfero.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: noosfero 0.25.3\n" "POT-Creation-Date: 2010-08-30 16:46-0300\n" -"PO-Revision-Date: 2010-08-30 16:47-0300\n" +"PO-Revision-Date: 2010-08-31 19:55-0300\n" "Last-Translator: Joenio Costa \n" "Language-Team: LANGUAGE TEAM \n" "MIME-Version: 1.0\n" @@ -3207,8 +3207,8 @@ msgid "'%{user} wants to activate email '%{email}'" msgstr "%{user} quer ativar o e-mail '%{email}'" #: app/models/invite_member.rb:19 app/views/tasks/_invite_member.rhtml:5 -msgid "%s invites you to join the community %s." -msgstr "%s te está te convidando para entrar na comunidade %s." +msgid "%s invited you to join the community %s" +msgstr "%s te convidou para entrar na comunidade %s" #: app/models/invite_member.rb:28 app/models/invite_friend.rb:20 msgid "Hello ," -- libgit2 0.21.2