From c641cadea9c6806ae6e4149999aeb27296b285e5 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Sun, 10 Sep 2017 13:02:04 -0400
Subject: [PATCH] rename "Social" filter list category to "Annoyances"

---
 src/_locales/en/messages.json |  6 +++---
 src/js/3p-filters.js          | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 08df70990..6de18b12c 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -319,9 +319,9 @@
     "message":"Malware domains",
     "description":"English: Malware domains"
   },
-  "3pGroupSocial":{
-    "message":"Social",
-    "description":"English: Social"
+  "3pGroupAnnoyances":{
+    "message":"Annoyances",
+    "description":"The header identifying the filter lists in the category 'annoyances'"
   },
   "3pGroupMultipurpose":{
     "message":"Multipurpose",
diff --git a/src/js/3p-filters.js b/src/js/3p-filters.js
index 4739aadfa..7da055c19 100644
--- a/src/js/3p-filters.js
+++ b/src/js/3p-filters.js
@@ -69,7 +69,8 @@ var renderFilterLists = function(soft) {
         listEntryTemplate = uDom('#templates .listEntry'),
         listStatsTemplate = vAPI.i18n('3pListsOfBlockedHostsPerListStats'),
         renderElapsedTimeToString = vAPI.i18n.renderElapsedTimeToString,
-        hideUnusedLists = document.body.classList.contains('hideUnused');
+        hideUnusedLists = document.body.classList.contains('hideUnused'),
+        groupNames = new Map();
 
     // Assemble a pretty list name if possible
     var listNameFromListKey = function(listKey) {
@@ -170,7 +171,17 @@ var renderFilterLists = function(soft) {
         var liGroup = document.querySelector('#lists > .groupEntry[data-groupkey="' + groupKey + '"]');
         if ( liGroup === null ) {
             liGroup = listGroupTemplate.clone().nodeAt(0);
-            var groupName = vAPI.i18n('3pGroup' + groupKey.charAt(0).toUpperCase() + groupKey.slice(1));
+            var groupName = groupNames.get(groupKey);
+            if ( groupName === undefined ) {
+                groupName = vAPI.i18n('3pGroup' + groupKey.charAt(0).toUpperCase() + groupKey.slice(1));
+                // Category "Social" is being renamed "Annoyances": ensure
+                // smooth transition.
+                // TODO: remove when majority of users are post-1.14.8 uBO.
+                if ( groupName === '' && groupKey === 'social' ) {
+                    groupName = vAPI.i18n('3pGroupAnnoyances');
+                }
+                groupNames.set(groupKey, groupName);
+            }
             if ( groupName !== '' ) {
                 liGroup.querySelector('.geName').textContent = groupName;
             }