diff --git a/app/views/friends/index.html.erb b/app/views/friends/index.html.erb
index 10b5f69..acd63a8 100644
--- a/app/views/friends/index.html.erb
+++ b/app/views/friends/index.html.erb
@@ -16,7 +16,7 @@
<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
<%= button(:search, _('Find people'), :controller => 'search', :action => 'assets', :asset => 'people') %>
<% unless @plugins.dispatch(:remove_invite_friends_button).include?(true) %>
- <%= button(:search, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
+ <%= button(:person, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
<% end %>
<% end %>
diff --git a/app/views/invite/invite_friends.html.erb b/app/views/invite/invite_friends.html.erb
index 3e6b5fd..2b3f5d7 100644
--- a/app/views/invite/invite_friends.html.erb
+++ b/app/views/invite/invite_friends.html.erb
@@ -2,7 +2,7 @@
<%= _('Ask for friendship') %>
<% description = _('You can search for user profiles and ask them to become your friends.') %>
<% else %>
- <%= _('Invite your friends to join %s') % profile.name %>
+ <%= _('Invite people to join') %>
<% description = _('You can search for user profiles and invite them to join this group.') %>
<% end %>
diff --git a/app/views/invite/select_friends.html.erb b/app/views/invite/select_friends.html.erb
index 38b1055..936f1a3 100644
--- a/app/views/invite/select_friends.html.erb
+++ b/app/views/invite/select_friends.html.erb
@@ -1,18 +1,18 @@
<%= render :partial => 'invite/dialog_wait_loading', :locals => {:contact_list => @contact_list.id } if @import_from != 'manual' %>
<% if profile.person? %>
- <%= _('Invite your friends') %>
+ <%= _('Invite people') %>
<% else %>
- <%= _('Invite your friends to join %s') % profile.name %>
+ <%= _('Invite people to join') %>
<% end %>
-<%= _('Step 2 of 2: Selecting Friends') %>
+<%= _('Step 2 of 2: Selecting People') %>
<%= button(:back, _('Back'), { :action => 'invite_friends' }, :id => 'invitation_back_button') %>
-<%= _('Indicate which friends you want to invite.') %>
+<%= _('Indicate which people you want to invite.') %>
<%= form_tag do %>
@@ -33,6 +33,6 @@
<%= render :partial => 'invite/personalize_invitation_mail', :locals => {:mail_template => @mail_template } %>
<% button_bar do %>
- <%= submit_button(:ok, _("Invite my friends!")) %>
+ <%= submit_button(:ok, _("Invite!")) %>
<% end %>
<% end %>
diff --git a/app/views/profile/friends.html.erb b/app/views/profile/friends.html.erb
index 7a43ee0..439a810 100644
--- a/app/views/profile/friends.html.erb
+++ b/app/views/profile/friends.html.erb
@@ -18,7 +18,7 @@
<%= button :back, _('Go back'), { :controller => 'profile' } %>
<% if user == profile %>
<%= button :edit, _('Manage my friends'), :controller => 'friends', :action => 'index', :profile => profile.identifier %>
- <%= button(:search, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
+ <%= button(:person, _('Invite people'), :controller => 'invite', :action => 'invite_friends') %>
<% end %>
<% end %>
diff --git a/app/views/profile/members.html.erb b/app/views/profile/members.html.erb
index 1df0e7c..fc9f1ae 100644
--- a/app/views/profile/members.html.erb
+++ b/app/views/profile/members.html.erb
@@ -18,7 +18,7 @@
<%= button :back, _('Go back'), { :controller => 'profile' } %>
<% if profile.community? and user %>
<% if user.has_permission?(:invite_members, profile) %>
- <%= button :search, _('Invite your friends to join %s') % profile.name, :controller => 'invite', :action => 'invite_friends' %>
+ <%= button :person, _('Invite people to join'), :controller => 'invite', :action => 'invite_friends' %>
<% end %>
<% if user.has_permission?(:send_mail_to_members, profile) %>
<%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
diff --git a/app/views/profile_members/_index_buttons.html.erb b/app/views/profile_members/_index_buttons.html.erb
index c7c92d1..480e4f1 100644
--- a/app/views/profile_members/_index_buttons.html.erb
+++ b/app/views/profile_members/_index_buttons.html.erb
@@ -2,7 +2,7 @@
<%= button :back, _('Back'), :controller => 'profile_editor' %>
<%= button :add, _('Add members'), :action => 'add_members' if profile.enterprise? %>
<% if profile.community? and user.has_permission?(:invite_members, profile) %>
- <%= button :search, _('Invite your friends to join %s') % profile.short_name, :controller => 'invite', :action => 'invite_friends' %>
+ <%= button :person, _('Invite people to join'), :controller => 'invite', :action => 'invite_friends' %>
<% end %>
<% if profile.community? and user.has_permission?(:send_mail_to_members, profile) %>
<%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
diff --git a/features/invitation.feature b/features/invitation.feature
index 4877e82..5fcf85a 100644
--- a/features/invitation.feature
+++ b/features/invitation.feature
@@ -37,30 +37,30 @@ Feature: invitation
And I fill in "manual_import_addresses" with "misfits@devil.doll"
And I follow "Personalize invitation mail"
And I fill in "mail_template" with "Follow this link "
- When I press "Invite my friends!"
+ When I press "Invite!"
Then I should be on /profile/josesilva/friends
Scenario: see link to invite members to community
When I am on /profile/26-bsslines/members
- Then I should see "Invite your friends to join 26 Bsslines" link
+ Then I should see "Invite people to join" link
Scenario: not see link to invite members to community if has no rights
Given I am logged in as "josesantos"
When I am on /profile/26-bsslines/members
- Then I should not see "Invite your friends to join 26 Bsslines" link
+ Then I should not see "Invite people to join" link
Scenario: go to invitation screen when follow link to invite members
Given I am on /profile/26-bsslines/members
- When I follow "Invite your friends to join 26 Bsslines"
+ When I follow "Invite people to join"
Then I am on /profile/26-bsslines/invite/friends
Scenario: see title when invite members
When I am on /profile/26-bsslines/invite/friends
- Then I should see "Invite your friends to join 26 Bsslines"
+ Then I should see "Invite people to join"
Scenario: not see link to invite members to enterprise
When I am on /profile/beatles-for-sale/members
- Then I should not see "Invite your friends to join Beatles For Sale" link
+ Then I should not see "Invite people to join" link
Scenario: deny access if user has no right to invite members
Given I am logged in as "josesantos"
@@ -69,7 +69,7 @@ Feature: invitation
Scenario: not see link to invite members to enterprise in manage members
Given I am on Beatles For Sale's members management
- Then I should not see "Invite your friends to join Beatles For Sale" link
+ Then I should not see "Invite people to join" link
@selenium
Scenario: back to members after invite friends to join a community
@@ -80,7 +80,7 @@ Feature: invitation
And I fill in "manual_import_addresses" with "misfits@devil.doll"
And I follow "Personalize invitation mail"
And I fill in "mail_template" with "Follow this link "
- When I press "Invite my friends!"
+ When I press "Invite!"
Then I should be on /profile/26-bsslines/members
@selenium
@@ -92,7 +92,7 @@ Feature: invitation
And I fill in "manual_import_addresses" with "santos@invalid.br"
And I follow "Personalize invitation mail"
And I fill in "mail_template" with "Follow this link "
- And I press "Invite my friends!"
+ And I press "Invite!"
Given there are no pending jobs
When I am logged in as "josesantos"
And I go to josesantos's control panel
@@ -138,7 +138,7 @@ Feature: invitation
And I fill in "manual_import_addresses" with "santos@invalid.br"
And I follow "Personalize invitation mail"
And I fill in "mail_template" with "Follow this link "
- And I press "Invite my friends!"
+ And I press "Invite!"
Given there are no pending jobs
When I am logged in as "josesantos"
And I go to josesantos's control panel
diff --git a/features/step_definitions/invitation_steps.rb b/features/step_definitions/invitation_steps.rb
index 11d8b31..ace9029 100644
--- a/features/step_definitions/invitation_steps.rb
+++ b/features/step_definitions/invitation_steps.rb
@@ -1,13 +1,13 @@
Given /^I invite email "(.+)" to join community "(.+)"$/ do |email, community|
identifier = Community.find_by_name(community).identifier
visit("/myprofile/#{identifier}/profile_members")
- first(:link, "Invite your friends to join #{community}").click
+ first(:link, "Invite people to join").click
choose("Email")
click_button('Next')
fill_in('manual_import_addresses', :with => "#{email}")
click_link('Personalize invitation mail')
fill_in('mail_template', :with => 'Follow this link ')
- click_button("Invite my friends!")
+ click_button("Invite!")
end
Given /^I invite email "(.+)" to be my friend$/ do |email|
@@ -18,5 +18,5 @@ Given /^I invite email "(.+)" to be my friend$/ do |email|
fill_in('manual_import_addresses', :with => "#{email}")
click_link('Personalize invitation mail')
fill_in('mail_template', :with => 'Follow this link ')
- click_button("Invite my friends!")
+ click_button("Invite!")
end
--
libgit2 0.21.2