diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3d9121b..c01e06a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -538,7 +538,7 @@ module ApplicationHelper {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}}, {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}}, {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community', :style => 'display: none'}}, - {_('Leave') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display: none'}}, + {_('Leave community') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display: none'}}, {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}} ] elsif profile.kind_of?(Enterprise) diff --git a/app/views/memberships/index.rhtml b/app/views/memberships/index.rhtml index 5a2f37e..7b3fba2 100644 --- a/app/views/memberships/index.rhtml +++ b/app/views/memberships/index.rhtml @@ -23,7 +23,7 @@ <%= _('Created at: %s') % show_date(membership.created_at) unless membership.enterprise? %>
<% button_bar do %> <%= button 'menu-ctrl-panel', _('Control panel of this group'), membership.admin_url %> - <%= button 'menu-logout', _('Leave'), membership.leave_url(true), :class => 'leave-community' %> + <%= button 'menu-logout', _('Leave community'), membership.leave_url(true), :class => 'leave-community' %> <% if (membership.community? && user.has_permission?(:destroy_profile, membership)) %> <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => membership.identifier } %> <% end %> diff --git a/po/es/noosfero.po b/po/es/noosfero.po index 7b6b318..e4540c2 100644 --- a/po/es/noosfero.po +++ b/po/es/noosfero.po @@ -4621,14 +4621,14 @@ msgstr[1] "" #: app/views/blocks/profile_info_actions/community.rhtml:19 #, fuzzy msgid "Leave community" -msgstr "Una comunidad" +msgstr "Salir de la comunidad" #: app/views/blocks/profile_info_actions/community.rhtml:11 #: app/views/blocks/profile_info_actions/community.rhtml:23 #: app/views/profile/_private_profile.rhtml:10 #, fuzzy msgid "Join community" -msgstr "Una comunidad" +msgstr "Unirse a la comunidad" #: app/views/blocks/profile_info_actions/community.rhtml:46 msgid "Join this community" diff --git a/po/pt/noosfero.po b/po/pt/noosfero.po index 59f8a46..e03591d 100644 --- a/po/pt/noosfero.po +++ b/po/pt/noosfero.po @@ -4431,11 +4431,11 @@ msgstr "Sair da comunidade" #: app/views/blocks/profile_info_actions/community.rhtml:23 #: app/views/profile/_private_profile.rhtml:10 msgid "Join community" -msgstr "Entrar em comunidade" +msgstr "Entrar na comunidade" #: app/views/blocks/profile_info_actions/community.rhtml:46 msgid "Join this community" -msgstr "Entrar nessa comunidade" +msgstr "Entrar nesta comunidade" #: app/views/blocks/profile_info_actions/enterprise.rhtml:4 msgid "Add as favorite" diff --git a/test/functional/memberships_controller_test.rb b/test/functional/memberships_controller_test.rb index 8f990c2..7720a01 100644 --- a/test/functional/memberships_controller_test.rb +++ b/test/functional/memberships_controller_test.rb @@ -99,7 +99,7 @@ class MembershipsControllerTest < Test::Unit::TestCase community = Community.create!(:name => 'my test community', :description => 'description test') community.add_member(profile) get :index, :profile => profile.identifier - assert_tag :tag => 'a', :attributes => { :href => "/profile/#{community.identifier}/leave?reload=true" }, :content => 'Leave' + assert_tag :tag => 'a', :attributes => { :href => "/profile/#{community.identifier}/leave?reload=true" }, :content => 'Leave community' end should 'current user is added as admin after create new community' do diff --git a/test/unit/application_helper_test.rb b/test/unit/application_helper_test.rb index c986a9d..7ba4807 100644 --- a/test/unit/application_helper_test.rb +++ b/test/unit/application_helper_test.rb @@ -546,7 +546,7 @@ class ApplicationHelperTest < Test::Unit::TestCase community.stubs(:url).returns('url for community') community.stubs(:public_profile_url).returns('url for community') links = links_for_balloon(community) - assert_equal ['Wall', 'Members', 'Agenda', 'Join', 'Leave', 'Send an e-mail'], links.map{|i| i.keys.first} + assert_equal ['Wall', 'Members', 'Agenda', 'Join', 'Leave community', 'Send an e-mail'], links.map{|i| i.keys.first} end should 'return ordered list of links to balloon to Enterprise' do -- libgit2 0.21.2