Download as
Browse Code »

Commit db309ec716a6cd1dc0b2149455eb055c4b6e1ff6

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent e28cdc7d
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Changing friends online to friends in chat (at right place) 

(ActionItem1959)
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/views/shared/logged_in/xmpp_chat.rhtml
  Diff comments   View file @db309ec
... ... @@ -6,6 +6,6 @@
6 6 </div>
7 7 </div>
8 8 <a href='#' id='chat-online-users-title' onclick='return false;'>
9   - <div class='header'><i class='icon-chat'></i><span><%= _("Online friends <span class='amount_of_friends'>(%{amount})</span>") %></span></div>
  9 + <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat <span class='amount_of_friends'>(%{amount})</span>") %></span></div>
10 10 </a>
11 11 </div>
... ...
features/chat.feature
  Diff comments   View file @db309ec
... ... @@ -23,7 +23,7 @@ Feature: chat
23 23 Scenario: provide the chat online users content
24 24 Given feature "xmpp_chat" is enabled on environment
25 25 And I am logged in as "tame"
26   - Then I should see "Online friends "
  26 + Then I should see "Friends in chat "
27 27  
28 28 @selenium
29 29 Scenario: provide the chat online users list
... ... @@ -46,7 +46,7 @@ Feature: chat
46 46 @selenium
47 47 Scenario: not provide the chat online users list when environment not support that
48 48 Given I am logged in as "tame"
49   - Then I should not see "Online friends "
  49 + Then I should not see "Friends in chat "
50 50  
51 51 Scenario: block access to chat when environment not support that
52 52 Given I am logged in as "tame"
... ...