From 2487089dd3e5db332e81ebbe0c5c3bfd9da77987 Mon Sep 17 00:00:00 2001
From: Urban Rotnik <urban.rotnik@gmail.com>
Date: Tue, 26 Mar 2019 15:00:02 +0100
Subject: [PATCH] Rename dropdown labels for Activities, Users and Teams

---
 app/views/global_activities/_side_filters.html.erb | 6 +++---
 config/locales/global_activities/en.yml            | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/views/global_activities/_side_filters.html.erb b/app/views/global_activities/_side_filters.html.erb
index 215bc86dc..0e38ea3b0 100644
--- a/app/views/global_activities/_side_filters.html.erb
+++ b/app/views/global_activities/_side_filters.html.erb
@@ -3,7 +3,7 @@
   <h6 class="clear"><%= t('global_activities.index.clear') %></h6>
   <div class="select-container">
     <%= select_tag "team", options_from_collection_for_select(@teams, :id, :name, current_user.current_team_id),{
-        'data-select-all-button': t('global_activities.index.all_teams'),
+        'data-select-all-button': t('global_activities.index.all_teams_btn'),
         'data-select-multiple-name': t('global_activities.index.l_teams'),
         'data-select-multiple-all-selected': t('global_activities.index.all_teams'),
         'data-dropdown-position': 'left'
@@ -44,7 +44,7 @@
   <h6 class="clear"><%= t('global_activities.index.clear') %></h6>
   <div class="select-container">
     <%= select_tag "activity", grouped_options_for_select(@activity_types),{
-      'data-select-all-button': t('global_activities.index.all_activities'),
+      'data-select-all-button': t('global_activities.index.all_activities_btn'),
       'data-select-all': 'true',
       'data-select-multiple-name': t('global_activities.index.l_activities'),
       'data-select-multiple-all-selected': t('global_activities.index.all_activities'),
@@ -59,7 +59,7 @@
   <h6 class="clear"><%= t('global_activities.index.clear') %></h6>
   <div class="select-container">
     <%= select_tag "user", options_for_select(@user_list),{
-      'data-select-all-button': t('global_activities.index.all_users'),
+      'data-select-all-button': t('global_activities.index.all_users_btn'),
       'data-select-all': 'true',
       'data-select-multiple-name': t('global_activities.index.l_users'),
       'data-select-multiple-all-selected': t('global_activities.index.all_users'),
diff --git a/config/locales/global_activities/en.yml b/config/locales/global_activities/en.yml
index 7c751bbaa..49260e330 100644
--- a/config/locales/global_activities/en.yml
+++ b/config/locales/global_activities/en.yml
@@ -18,10 +18,13 @@ en:
       user: "User"
       object: "Object"
       all_teams: "All teams"
+      all_teams_btn: "Select All Teams"
       l_teams: "teams"
       all_users: "All users"
+      all_users_btn: "Select All Users"
       l_users: "users"
       all_activities: "All activities"
+      all_activities_btn: "Select All Activities"
       l_activities: "activities"
       clear_filters: "Clear filters"
     content: