Merge pull request #889 from Cookiezaurs/next

bugfix. Column selector. Added "Select columns to display" to localization strings
Countly · Apr 24, 2019 · 20e7ee3 · 20e7ee3
2 parents 0f04262 + 4c6061b
commit 20e7ee3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/frontend/express/public/javascripts/countly/countly.helpers.js b/frontend/express/public/javascripts/countly/countly.helpers.js
@@ -1314,7 +1314,7 @@
             str += "<td></td></tr>";
         }
         dtable.CoultyColumnSel.maxCol = Math.min(maxCol, dtable.CoultyColumnSel.tableCol);
-        $(dtable[0]).parent().find(".select-column-table-data").first().after('<div class="data-table-column-selector" tabindex="1"><div class="title" ><span style="margin-left: 15px;">Select columns to display</span><span class="columncounter" style="margin-right: 15px;">' + selectedC + '/' + dtable.CoultyColumnSel.maxCol + '</span></div><div class="all_columns scrollable"><table>' + str + '</table></div></div>');
+        $(dtable[0]).parent().find(".select-column-table-data").first().after('<div class="data-table-column-selector" tabindex="1"><div class="title" ><span style="margin-left: 15px;">' + jQuery.i18n.map["common.select-columns-to-display"] + '</span><span class="columncounter" style="margin-right: 15px;">' + selectedC + '/' + dtable.CoultyColumnSel.maxCol + '</span></div><div class="all_columns scrollable"><table>' + str + '</table></div></div>');
         if (tableCols.length > 8) {
             $(dtable[0]).parent().find('.scrollable').slimScroll({
                 height: '100%',

diff --git a/frontend/express/public/localization/dashboard/dashboard.properties b/frontend/express/public/localization/dashboard/dashboard.properties
@@ -145,6 +145,7 @@ common.enable = Enable
 common.running = Running
 common.completed = Completed
 common.errored = Error
+common.select-columns-to-display = Select columns to display
 
 #taskmanager
 taskmanager.rerun = Rerun