1
Download as
Browse Code »

Commit bf661b69c99feebc5616149ae6a29052c12fef60

Authored by Rodrigo Souto
Committed by Daniela Feitosa
1 parent 14a27a70
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

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 26 </head>
27 27 <body id='chat'>
28 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 30 </div>
31 31 <div id='buddy-list'>
32 32 <div id='environment-logo'>
... ...
features/chat.feature
  Diff comments   View file @bf661b6
... ... @@ -63,7 +63,7 @@ Feature: chat
63 63 And I am logged in as "tame"
64 64 When I follow "Open chat"
65 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 68 @selenium
69 69 Scenario: open chat with an online user in a new window
... ... @@ -74,7 +74,7 @@ Feature: chat
74 74 When I click "#chat-online-users-title"
75 75 And I follow "Maria Silva"
76 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 79 @selenium
80 80 Scenario: chat starts disconnected by default
... ... @@ -137,4 +137,4 @@ Feature: chat
137 137 When I go to Autoramas's profile
138 138 And I follow "Enter chat room"
139 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)"
... ...