Commit bf661b69c99feebc5616149ae6a29052c12fef60
Committed by
Daniela Feitosa
1 parent
14a27a70
Exists in
master
and in
29 other branches
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
@@ -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
@@ -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)" |