refs #4151 refactored some more usages of _js hack

5 files changed, 17 insertions, 9 deletions

diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index 13591bd21a..f6f1a5a3a3 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -95,5 +95,13 @@ class CoreHome extends \Piwik\Plugin
     {
         $translationKeys[] = 'General_InvalidDateRange';
         $translationKeys[] = 'General_Loading';
+        $translationKeys[] = 'General_Show';
+        $translationKeys[] = 'General_Hide';
+        $translationKeys[] = 'General_YearShort';
+        $translationKeys[] = 'CoreHome_YouAreUsingTheLatestVersion';
+        $translationKeys[] = 'CoreHome_IncludeRowsWithLowPopulation';
+        $translationKeys[] = 'CoreHome_ExcludeRowsWithLowPopulation';
+        $translationKeys[] = 'CoreHome_DataTableIncludeAggregateRows';
+        $translationKeys[] = 'CoreHome_DataTableExcludeAggregateRows';
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreHome/javascripts/corehome.js b/plugins/CoreHome/javascripts/corehome.js
index b80b54e57a..bfc7d79b78 100755
--- a/plugins/CoreHome/javascripts/corehome.js
+++ b/plugins/CoreHome/javascripts/corehome.js
@@ -36,7 +36,7 @@
                         headerMessage.replaceWith(response);
                     }
                     else {
-                        headerMessage.html(_pk_translate('CoreHome_YouAreUsingTheLatestVersion_js')).show();
+                        headerMessage.html(_pk_translate('CoreHome_YouAreUsingTheLatestVersion')).show();
                         setTimeout(function () {
                             headerMessage.fadeOut('slow', function () {
                                 headerMessage.replaceWith(response);
@@ -65,8 +65,8 @@
         var handleSectionToggle = function (self, showType, doHide) {
             var sectionId = $(self).attr('data-section-id'),
                 section = $('#' + sectionId),
-                showText = _pk_translate('General_Show_js'),
-                hideText = _pk_translate('General_Hide_js');
+                showText = _pk_translate('General_Show'),
+                hideText = _pk_translate('General_Hide');
 
             if (typeof(doHide) == 'undefined') {
                 doHide = section.is(':visible');
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index bdbaccb8e2..3bcae5609f 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -988,12 +988,12 @@ dataTable.prototype =
                     self.param.enable_filter_excludelowpop = 0;
                 }
                 if (Number(self.param.enable_filter_excludelowpop) != 0) {
-                    var string = getText('CoreHome_IncludeRowsWithLowPopulation_js', true);
+                    var string = getText('CoreHome_IncludeRowsWithLowPopulation', true);
                     self.param.enable_filter_excludelowpop = 1;
                     iconHighlighted = true;
                 }
                 else {
-                    var string = getText('CoreHome_ExcludeRowsWithLowPopulation_js');
+                    var string = getText('CoreHome_ExcludeRowsWithLowPopulation');
                     self.param.enable_filter_excludelowpop = 0;
                 }
                 $(this).html(string);
@@ -1009,8 +1009,8 @@ dataTable.prototype =
 
         $('.dataTableIncludeAggregateRows', domElem)
             .each(function () {
-                setText(this, 'include_aggregate_rows', 'CoreHome_DataTableExcludeAggregateRows_js',
-                    'CoreHome_DataTableIncludeAggregateRows_js');
+                setText(this, 'include_aggregate_rows', 'CoreHome_DataTableExcludeAggregateRows',
+                    'CoreHome_DataTableIncludeAggregateRows');
             })
             .click(generateClickCallback('include_aggregate_rows', function () {
                 if (self.param.include_aggregate_rows == 1) {
diff --git a/plugins/CoreHome/javascripts/donate.js b/plugins/CoreHome/javascripts/donate.js
index bd540109da..5d5fdeb33f 100755
--- a/plugins/CoreHome/javascripts/donate.js
+++ b/plugins/CoreHome/javascripts/donate.js
@@ -24,7 +24,7 @@
         // set's the correct amount text & smiley face image based on the position of the slider
         var setSmileyFaceAndAmount = function (slider, pos) {
             // set text yearly amount
-            $('.slider-donate-amount', slider).text('$' + donateAmounts[pos] + '/' + _pk_translate('General_YearShort_js'));
+            $('.slider-donate-amount', slider).text('$' + donateAmounts[pos] + '/' + _pk_translate('General_YearShort'));
 
             // set the right smiley face
             $('.slider-smiley-face').attr('src', 'plugins/Zeitgeist/images/smileyprog_' + pos + '.png');
diff --git a/plugins/CoreHome/templates/_donate.twig b/plugins/CoreHome/templates/_donate.twig
index 5209a579fc..3140999fed 100755
--- a/plugins/CoreHome/templates/_donate.twig
+++ b/plugins/CoreHome/templates/_donate.twig
@@ -24,7 +24,7 @@
                 <div class="slider-position"></div>
             </div>
             <div style="display:inline-block;">
-                <div class="slider-donate-amount">$30/{{ 'General_YearShort_js'|translate }}</div>
+                <div class="slider-donate-amount">$30/{{ 'General_YearShort'|translate }}</div>
 
                 <img class="slider-smiley-face" width="40" height="40" src="plugins/Zeitgeist/images/smileyprog_1.png"/>
             </div>