Download as
Browse Code »

Commit 632a48c91213723aace07e2015fb14515941e940

Authored by Rodrigo Souto
Committed by Antonio Terceiro
1 parent 07ab0e42
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies

Substituting 'Contact' by 'Send a message'

Showing 6 changed files with 8 additions and 8 deletions   Show diff stats
app/views/blocks/profile_info_actions/community.rhtml
  Diff comments   View file @632a48c
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 15
16 <% if profile.enable_contact? %> 16 <% if profile.enable_contact? %>
17 <li> 17 <li>
18 - <%= link_to content_tag('span', _('Contact us')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> 18 + <%= link_to content_tag('span', _('Send a message')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %>
19 </li> 19 </li>
20 <% end %> 20 <% end %>
21 21
app/views/blocks/profile_info_actions/enterprise.rhtml
  Diff comments   View file @632a48c
@@ -5,6 +5,6 @@ @@ -5,6 +5,6 @@
5 <% end %> 5 <% end %>
6 <% end %> 6 <% end %>
7 <% if profile.enable_contact? %> 7 <% if profile.enable_contact? %>
8 - <li> <%= 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'} %> </li> 8 + <li> <%= 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'} %> </li>
9 <% end %> 9 <% end %>
10 </ul> 10 </ul>
app/views/blocks/profile_info_actions/person.rhtml
  Diff comments   View file @632a48c
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <% end %> 6 <% end %>
7 7
8 <% if user.is_a_friend?(profile) && profile.enable_contact? %> 8 <% if user.is_a_friend?(profile) && profile.enable_contact? %>
9 - <li> <%= link_to content_tag('span', _('Contact')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li> 9 + <li> <%= link_to content_tag('span', _('Send a message')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>
10 <% end %> 10 <% end %>
11 11
12 <% end %> 12 <% end %>
app/views/contact/new.rhtml
  Diff comments   View file @632a48c
1 -<h1><%= _('Contact %s') % profile.name %></h1> 1 +<h1><%= _('Send a message to %s') % profile.name %></h1>
2 2
3 <%= error_messages_for 'contact' %> 3 <%= error_messages_for 'contact' %>
4 4
test/functional/contact_controller_test.rb
  Diff comments   View file @632a48c
@@ -27,7 +27,7 @@ class ContactControllerTest &lt; Test::Unit::TestCase @@ -27,7 +27,7 @@ class ContactControllerTest &lt; Test::Unit::TestCase
27 27
28 should 'display destinatary name in title' do 28 should 'display destinatary name in title' do
29 get :new, :profile => enterprise.identifier 29 get :new, :profile => enterprise.identifier
30 - assert_tag :tag => 'h1', :content => "Contact #{enterprise.name}" 30 + assert_tag :tag => 'h1', :content => "Send a message to #{enterprise.name}"
31 end 31 end
32 32
33 should 'add form to create contact via post' do 33 should 'add form to create contact via post' do
test/functional/profile_controller_test.rb
  Diff comments   View file @632a48c
@@ -337,19 +337,19 @@ class ProfileControllerTest &lt; Test::Unit::TestCase @@ -337,19 +337,19 @@ class ProfileControllerTest &lt; Test::Unit::TestCase
337 should 'display contact us for enterprises' do 337 should 'display contact us for enterprises' do
338 ent = Enterprise.create!(:name => 'my test enterprise', :identifier => 'my-test-enterprise') 338 ent = Enterprise.create!(:name => 'my test enterprise', :identifier => 'my-test-enterprise')
339 get :index, :profile => 'my-test-enterprise' 339 get :index, :profile => 'my-test-enterprise'
340 - assert_tag :tag => 'a', :attributes => { :href => "/contact/my-test-enterprise/new" }, :content => 'Contact us' 340 + assert_tag :tag => 'a', :attributes => { :href => "/contact/my-test-enterprise/new" }, :content => 'Send a message'
341 end 341 end
342 342
343 should 'not display contact us for non-enterprises' do 343 should 'not display contact us for non-enterprises' do
344 get :index, :profile => @profile.identifier 344 get :index, :profile => @profile.identifier
345 - assert_no_tag :tag => 'a', :attributes => { :href => "/contact/#{@profile.identifier}/new" }, :content => 'Contact us' 345 + assert_no_tag :tag => 'a', :attributes => { :href => "/contact/#{@profile.identifier}/new" }, :content => 'Send a message'
346 end 346 end
347 347
348 should 'display contact us only if enabled' do 348 should 'display contact us only if enabled' do
349 ent = fast_create(Enterprise, :name => 'my test enterprise', :identifier => 'my-test-enterprise') 349 ent = fast_create(Enterprise, :name => 'my test enterprise', :identifier => 'my-test-enterprise')
350 ent.update_attribute(:enable_contact_us, false) 350 ent.update_attribute(:enable_contact_us, false)
351 get :index, :profile => 'my-test-enterprise' 351 get :index, :profile => 'my-test-enterprise'
352 - assert_no_tag :tag => 'a', :attributes => { :href => "/contact/my-test-enterprise/new" }, :content => 'Contact us' 352 + assert_no_tag :tag => 'a', :attributes => { :href => "/contact/my-test-enterprise/new" }, :content => 'Send a message'
353 end 353 end
354 354
355 should 'display contact button only if friends' do 355 should 'display contact button only if friends' do