diff --git a/app/views/blocks/profile_info_actions/community.rhtml b/app/views/blocks/profile_info_actions/community.rhtml index c7c8db7..ae2e44e 100644 --- a/app/views/blocks/profile_info_actions/community.rhtml +++ b/app/views/blocks/profile_info_actions/community.rhtml @@ -15,7 +15,7 @@ <% if profile.enable_contact? %>
  • - <%= link_to content_tag('span', _('Contact us')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> + <%= link_to content_tag('span', _('Send a message')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %>
  • <% end %> diff --git a/app/views/blocks/profile_info_actions/enterprise.rhtml b/app/views/blocks/profile_info_actions/enterprise.rhtml index d1feda8..b3dd6ad 100644 --- a/app/views/blocks/profile_info_actions/enterprise.rhtml +++ b/app/views/blocks/profile_info_actions/enterprise.rhtml @@ -5,6 +5,6 @@ <% end %> <% end %> <% if profile.enable_contact? %> -
  • <%= link_to content_tag('span', _('Contact us')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %>
  • +
  • <%= link_to content_tag('span', _('Send a message')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %>
  • <% end %> diff --git a/app/views/blocks/profile_info_actions/person.rhtml b/app/views/blocks/profile_info_actions/person.rhtml index 054e2d2..e5a8a6e 100644 --- a/app/views/blocks/profile_info_actions/person.rhtml +++ b/app/views/blocks/profile_info_actions/person.rhtml @@ -6,7 +6,7 @@ <% end %> <% if user.is_a_friend?(profile) && profile.enable_contact? %> -
  • <%= link_to content_tag('span', _('Contact')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %>
  • +
  • <%= link_to content_tag('span', _('Send a message')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %>
  • <% end %> <% end %> diff --git a/app/views/contact/new.rhtml b/app/views/contact/new.rhtml index ec8aa26..ff32b35 100644 --- a/app/views/contact/new.rhtml +++ b/app/views/contact/new.rhtml @@ -1,4 +1,4 @@ -

    <%= _('Contact %s') % profile.name %>

    +

    <%= _('Send a message to %s') % profile.name %>

    <%= error_messages_for 'contact' %> diff --git a/test/functional/contact_controller_test.rb b/test/functional/contact_controller_test.rb index fd935e2..f3c2811 100644 --- a/test/functional/contact_controller_test.rb +++ b/test/functional/contact_controller_test.rb @@ -27,7 +27,7 @@ class ContactControllerTest < Test::Unit::TestCase should 'display destinatary name in title' do get :new, :profile => enterprise.identifier - assert_tag :tag => 'h1', :content => "Contact #{enterprise.name}" + assert_tag :tag => 'h1', :content => "Send a message to #{enterprise.name}" end should 'add form to create contact via post' do diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb index a7827b2..eff4d9b 100644 --- a/test/functional/profile_controller_test.rb +++ b/test/functional/profile_controller_test.rb @@ -337,19 +337,19 @@ class ProfileControllerTest < Test::Unit::TestCase should 'display contact us for enterprises' do ent = Enterprise.create!(:name => 'my test enterprise', :identifier => 'my-test-enterprise') get :index, :profile => 'my-test-enterprise' - assert_tag :tag => 'a', :attributes => { :href => "/contact/my-test-enterprise/new" }, :content => 'Contact us' + assert_tag :tag => 'a', :attributes => { :href => "/contact/my-test-enterprise/new" }, :content => 'Send a message' end should 'not display contact us for non-enterprises' do get :index, :profile => @profile.identifier - assert_no_tag :tag => 'a', :attributes => { :href => "/contact/#{@profile.identifier}/new" }, :content => 'Contact us' + assert_no_tag :tag => 'a', :attributes => { :href => "/contact/#{@profile.identifier}/new" }, :content => 'Send a message' end should 'display contact us only if enabled' do ent = fast_create(Enterprise, :name => 'my test enterprise', :identifier => 'my-test-enterprise') ent.update_attribute(:enable_contact_us, false) get :index, :profile => 'my-test-enterprise' - assert_no_tag :tag => 'a', :attributes => { :href => "/contact/my-test-enterprise/new" }, :content => 'Contact us' + assert_no_tag :tag => 'a', :attributes => { :href => "/contact/my-test-enterprise/new" }, :content => 'Send a message' end should 'display contact button only if friends' do -- libgit2 0.21.2