Download as
Browse Code »

Commit bf661b69c99feebc5616149ae6a29052c12fef60

Authored by Rodrigo Souto
Committed by Daniela Feitosa
1 parent 14a27a70
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Changing friends online to friends in chat 

PS: Remember to update translations

(ActionItem1946)
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/views/layouts/chat.rhtml
  Diff comments   View file @bf661b6
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 </head> 26 </head>
27 <body id='chat'> 27 <body id='chat'>
28 <div id='title-bar'> 28 <div id='title-bar'>
29 - <h1 class='title'><%= _("%s - Friends online (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1> 29 + <h1 class='title'><%= _("%s - Friends in chat (<span id='friends-online'>%d</span>)") % [h(page_title), 0] %></h1>
30 </div> 30 </div>
31 <div id='buddy-list'> 31 <div id='buddy-list'>
32 <div id='environment-logo'> 32 <div id='environment-logo'>
features/chat.feature
  Diff comments   View file @bf661b6
@@ -63,7 +63,7 @@ Feature: chat @@ -63,7 +63,7 @@ Feature: chat
63 And I am logged in as "tame" 63 And I am logged in as "tame"
64 When I follow "Open chat" 64 When I follow "Open chat"
65 And I select window "noosfero_chat" 65 And I select window "noosfero_chat"
66 - Then I should see "Chat - Colivre.net - Friends online (0)" 66 + Then I should see "Chat - Colivre.net - Friends in chat (0)"
67 67
68 @selenium 68 @selenium
69 Scenario: open chat with an online user in a new window 69 Scenario: open chat with an online user in a new window
@@ -74,7 +74,7 @@ Feature: chat @@ -74,7 +74,7 @@ Feature: chat
74 When I click "#chat-online-users-title" 74 When I click "#chat-online-users-title"
75 And I follow "Maria Silva" 75 And I follow "Maria Silva"
76 And I select window "noosfero_chat" 76 And I select window "noosfero_chat"
77 - Then I should see "Chat - Colivre.net - Friends online (0)" 77 + Then I should see "Chat - Colivre.net - Friends in chat (0)"
78 78
79 @selenium 79 @selenium
80 Scenario: chat starts disconnected by default 80 Scenario: chat starts disconnected by default
@@ -137,4 +137,4 @@ Feature: chat @@ -137,4 +137,4 @@ Feature: chat
137 When I go to Autoramas's profile 137 When I go to Autoramas's profile
138 And I follow "Enter chat room" 138 And I follow "Enter chat room"
139 And I select window "noosfero_chat" 139 And I select window "noosfero_chat"
140 - Then I should see "Chat - Colivre.net - Friends online (0)" 140 + Then I should see "Chat - Colivre.net - Friends in chat (0)"