Download as
Browse Code »

Commit 2545cee1a1939ee339595a0e1772fd5b1adede43

Authored by Daniela Feitosa
2 parents 3abe781b 309bdd2d
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Merge commit 'refs/merge-requests/91' of git://gitorious.org/noosfero/noosfero i… 

…nto merge-requests/91
Showing 6 changed files with 8 additions and 8 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @2545cee
... ... @@ -538,7 +538,7 @@ module ApplicationHelper
538 538 {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
539 539 {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
540 540 {_('Join') => {:href => url_for(profile.join_url), :class => 'join-community', :style => 'display: none'}},
541   - {_('Leave') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display: none'}},
  541 + {_('Leave community') => {:href => url_for(profile.leave_url), :class => 'leave-community', :style => 'display: none'}},
542 542 {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}}
543 543 ]
544 544 elsif profile.kind_of?(Enterprise)
... ...
app/views/memberships/index.rhtml
  Diff comments   View file @2545cee
... ... @@ -23,7 +23,7 @@
23 23 <%= _('Created at: %s') % show_date(membership.created_at) unless membership.enterprise? %> <br/>
24 24 <% button_bar do %>
25 25 <%= button 'menu-ctrl-panel', _('Control panel of this group'), membership.admin_url %>
26   - <%= button 'menu-logout', _('Leave'), membership.leave_url(true), :class => 'leave-community' %>
  26 + <%= button 'menu-logout', _('Leave community'), membership.leave_url(true), :class => 'leave-community' %>
27 27 <% if (membership.community? && user.has_permission?(:destroy_profile, membership)) %>
28 28 <%= button 'delete', _('Remove'), { :controller => 'profile_editor', :action => 'destroy_profile', :profile => membership.identifier } %>
29 29 <% end %>
... ...
po/es/noosfero.po
  Diff comments   View file @2545cee
... ... @@ -4621,14 +4621,14 @@ msgstr[1] &quot;&quot;
4621 4621 #: app/views/blocks/profile_info_actions/community.rhtml:19
4622 4622 #, fuzzy
4623 4623 msgid "Leave community"
4624   -msgstr "Una comunidad"
  4624 +msgstr "Salir de la comunidad"
4625 4625  
4626 4626 #: app/views/blocks/profile_info_actions/community.rhtml:11
4627 4627 #: app/views/blocks/profile_info_actions/community.rhtml:23
4628 4628 #: app/views/profile/_private_profile.rhtml:10
4629 4629 #, fuzzy
4630 4630 msgid "Join community"
4631   -msgstr "Una comunidad"
  4631 +msgstr "Unirse a la comunidad"
4632 4632  
4633 4633 #: app/views/blocks/profile_info_actions/community.rhtml:46
4634 4634 msgid "Join this community"
... ...
po/pt/noosfero.po
  Diff comments   View file @2545cee
... ... @@ -4431,11 +4431,11 @@ msgstr &quot;Sair da comunidade&quot;
4431 4431 #: app/views/blocks/profile_info_actions/community.rhtml:23
4432 4432 #: app/views/profile/_private_profile.rhtml:10
4433 4433 msgid "Join community"
4434   -msgstr "Entrar em comunidade"
  4434 +msgstr "Entrar na comunidade"
4435 4435  
4436 4436 #: app/views/blocks/profile_info_actions/community.rhtml:46
4437 4437 msgid "Join this community"
4438   -msgstr "Entrar nessa comunidade"
  4438 +msgstr "Entrar nesta comunidade"
4439 4439  
4440 4440 #: app/views/blocks/profile_info_actions/enterprise.rhtml:4
4441 4441 msgid "Add as favorite"
... ...
test/functional/memberships_controller_test.rb
  Diff comments   View file @2545cee
... ... @@ -99,7 +99,7 @@ class MembershipsControllerTest &lt; Test::Unit::TestCase
99 99 community = Community.create!(:name => 'my test community', :description => 'description test')
100 100 community.add_member(profile)
101 101 get :index, :profile => profile.identifier
102   - assert_tag :tag => 'a', :attributes => { :href => "/profile/#{community.identifier}/leave?reload=true" }, :content => 'Leave'
  102 + assert_tag :tag => 'a', :attributes => { :href => "/profile/#{community.identifier}/leave?reload=true" }, :content => 'Leave community'
103 103 end
104 104  
105 105 should 'current user is added as admin after create new community' do
... ...
test/unit/application_helper_test.rb
  Diff comments   View file @2545cee
... ... @@ -546,7 +546,7 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
546 546 community.stubs(:url).returns('url for community')
547 547 community.stubs(:public_profile_url).returns('url for community')
548 548 links = links_for_balloon(community)
549   - assert_equal ['Wall', 'Members', 'Agenda', 'Join', 'Leave', 'Send an e-mail'], links.map{|i| i.keys.first}
  549 + assert_equal ['Wall', 'Members', 'Agenda', 'Join', 'Leave community', 'Send an e-mail'], links.map{|i| i.keys.first}
550 550 end
551 551  
552 552 should 'return ordered list of links to balloon to Enterprise' do
... ...