Issue 5873 - Show original subscription title in languages table

desktop-options.js

Index: desktop-options.js
===================================================================
--- a/desktop-options.js
+++ b/desktop-options.js
@@ -90,9 +90,12 @@
   Collection.prototype._getItemTitle = function(item, i)
   {
     if (this.details[i].useSpecialization && item.specialization)
-      return item.specialization;
-    if (this.details[i].useOriginalTitle && item.originalTitle)
-      return item.originalTitle;
+    {

[ire, 2018/01/04 08:32:52]

NIT: I think this was cleaner without the nested `if`s

[saroyanm, 2018/01/04 21:28:52]

Yes, previously logic was bit different:
Previously, we were defining which attribute value to use, while with new
requirements we have an exceptional case, so I implemented:
if useSpacialization then use it and add English if aplicable.
While previously it was along the lines:
If useSpacialization then use it, if useOriginalTitle then use it.

I think you are right and my approach in general is wrong that why it doesn't
feel to be correct. I should have separated special case handling from core
"collection" functionality.

I did create a special case separate function, so we can specify custom function
for every special "_getItemTitle" case, so it will still fit into the logic of
collections.

I hope this implementation is more clear.

[ire, 2018/01/05 09:23:45]

Ack. Yes it is more clear, thanks!

+      let title = item.specialization;
+      if (item.originalTitle && item.originalTitle.indexOf("+EasyList") >= 0)

[ire, 2018/01/04 08:32:52]

NIT: I don't know if it actually makes a difference, but I always prefer
checking for `> -1` rather than `>= 0`. 

[saroyanm, 2018/01/04 21:28:52]

Done.

+        title += " + " + getMessage("options_english");
+      return title;
+    }
     return item.title || item.url || item.text;
   };
 
@@ -223,9 +226,14 @@
         continue;
 
       let title = this._getItemTitle(item, i);
-      let displays = element.querySelectorAll(".display");
+      let displays = element.querySelectorAll("[data-display]");
       for (let j = 0; j < displays.length; j++)
-        displays[j].textContent = title;
+      {
+        if (item[displays[j].dataset.display])
+          displays[j].textContent = item[displays[j].dataset.display];
+        else
+          displays[j].textContent = title;
+      }
 
       element.setAttribute("aria-label", title);
       if (this.details[i].searchable)
@@ -377,8 +385,7 @@
   collections.filterLists = new Collection([
     {
       id: "all-filter-lists-table",
-      emptyTexts: ["options_filterList_empty"],
-      useOriginalTitle: true
+      emptyTexts: ["options_filterList_empty"]
     }
   ]);