refs #4151 refactored last usages of _js hack

5 files changed, 103 insertions, 53 deletions

diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index 0bc3306914..9e80cf47d5 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -110,5 +110,55 @@ class CoreHome extends \Piwik\Plugin
         $translationKeys[] = 'Annotations_ViewAndAddAnnotations';
         $translationKeys[] = 'General_RowEvolutionRowActionTooltipTitle';
         $translationKeys[] = 'General_RowEvolutionRowActionTooltip';
+        $translationKeys[] = 'Annotations_IconDesc';
+        $translationKeys[] = 'Annotations_IconDescHideNotes';
+        $translationKeys[] = 'Annotations_HideAnnotationsFor';
+        $translationKeys[] = 'General_LoadingPopover';
+        $translationKeys[] = 'General_LoadingPopoverFor';
+        $translationKeys[] = 'General_MonthJanuary';
+        $translationKeys[] = 'General_MonthFebruary';
+        $translationKeys[] = 'General_MonthMarch';
+        $translationKeys[] = 'General_MonthApril';
+        $translationKeys[] = 'General_MonthMay';
+        $translationKeys[] = 'General_MonthJune';
+        $translationKeys[] = 'General_MonthJuly';
+        $translationKeys[] = 'General_MonthAugust';
+        $translationKeys[] = 'General_MonthSeptember';
+        $translationKeys[] = 'General_MonthOctober';
+        $translationKeys[] = 'General_MonthNovember';
+        $translationKeys[] = 'General_MonthDecember';
+        $translationKeys[] = 'General_ShortMonth_1';
+        $translationKeys[] = 'General_ShortMonth_2';
+        $translationKeys[] = 'General_ShortMonth_3';
+        $translationKeys[] = 'General_ShortMonth_4';
+        $translationKeys[] = 'General_ShortMonth_5';
+        $translationKeys[] = 'General_ShortMonth_6';
+        $translationKeys[] = 'General_ShortMonth_7';
+        $translationKeys[] = 'General_ShortMonth_8';
+        $translationKeys[] = 'General_ShortMonth_9';
+        $translationKeys[] = 'General_ShortMonth_10';
+        $translationKeys[] = 'General_ShortMonth_11';
+        $translationKeys[] = 'General_ShortMonth_12';
+        $translationKeys[] = 'General_ShortDay_1';
+        $translationKeys[] = 'General_ShortDay_2';
+        $translationKeys[] = 'General_ShortDay_3';
+        $translationKeys[] = 'General_ShortDay_4';
+        $translationKeys[] = 'General_ShortDay_5';
+        $translationKeys[] = 'General_ShortDay_6';
+        $translationKeys[] = 'General_ShortDay_7';
+        $translationKeys[] = 'General_LongDay_1';
+        $translationKeys[] = 'General_LongDay_2';
+        $translationKeys[] = 'General_LongDay_3';
+        $translationKeys[] = 'General_LongDay_4';
+        $translationKeys[] = 'General_LongDay_5';
+        $translationKeys[] = 'General_LongDay_6';
+        $translationKeys[] = 'General_LongDay_7';
+        $translationKeys[] = 'General_DayMo';
+        $translationKeys[] = 'General_DayTu';
+        $translationKeys[] = 'General_DayWe';
+        $translationKeys[] = 'General_DayTh';
+        $translationKeys[] = 'General_DayFr';
+        $translationKeys[] = 'General_DaySa';
+        $translationKeys[] = 'General_DaySu';
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreHome/javascripts/calendar.js b/plugins/CoreHome/javascripts/calendar.js
index db24108573..a7b7aca6e0 100644
--- a/plugins/CoreHome/javascripts/calendar.js
+++ b/plugins/CoreHome/javascripts/calendar.js
@@ -127,55 +127,55 @@
             stepMonths: 1,
             // jquery-ui-i18n 1.7.2 lacks some translations, so we use our own
             dayNamesMin: [
-                _pk_translate('General_DaySu_js'),
-                _pk_translate('General_DayMo_js'),
-                _pk_translate('General_DayTu_js'),
-                _pk_translate('General_DayWe_js'),
-                _pk_translate('General_DayTh_js'),
-                _pk_translate('General_DayFr_js'),
-                _pk_translate('General_DaySa_js')],
+                _pk_translate('General_DaySu'),
+                _pk_translate('General_DayMo'),
+                _pk_translate('General_DayTu'),
+                _pk_translate('General_DayWe'),
+                _pk_translate('General_DayTh'),
+                _pk_translate('General_DayFr'),
+                _pk_translate('General_DaySa')],
             dayNamesShort: [
-                _pk_translate('General_ShortDay_1_js'),
-                _pk_translate('General_ShortDay_2_js'),
-                _pk_translate('General_ShortDay_3_js'),
-                _pk_translate('General_ShortDay_4_js'),
-                _pk_translate('General_ShortDay_5_js'),
-                _pk_translate('General_ShortDay_6_js'),
-                _pk_translate('General_ShortDay_7_js')],
+                _pk_translate('General_ShortDay_7'), // start with sunday
+                _pk_translate('General_ShortDay_1'),
+                _pk_translate('General_ShortDay_2'),
+                _pk_translate('General_ShortDay_3'),
+                _pk_translate('General_ShortDay_4'),
+                _pk_translate('General_ShortDay_5'),
+                _pk_translate('General_ShortDay_6')],
             dayNames: [
-                _pk_translate('General_LongDay_1_js'),
-                _pk_translate('General_LongDay_2_js'),
-                _pk_translate('General_LongDay_3_js'),
-                _pk_translate('General_LongDay_4_js'),
-                _pk_translate('General_LongDay_5_js'),
-                _pk_translate('General_LongDay_6_js'),
-                _pk_translate('General_LongDay_7_js')],
+                _pk_translate('General_LongDay_7'), // start with sunday
+                _pk_translate('General_LongDay_1'),
+                _pk_translate('General_LongDay_2'),
+                _pk_translate('General_LongDay_3'),
+                _pk_translate('General_LongDay_4'),
+                _pk_translate('General_LongDay_5'),
+                _pk_translate('General_LongDay_6')],
             monthNamesShort: [
-                _pk_translate('General_ShortMonth_1_js'),
-                _pk_translate('General_ShortMonth_2_js'),
-                _pk_translate('General_ShortMonth_3_js'),
-                _pk_translate('General_ShortMonth_4_js'),
-                _pk_translate('General_ShortMonth_5_js'),
-                _pk_translate('General_ShortMonth_6_js'),
-                _pk_translate('General_ShortMonth_7_js'),
-                _pk_translate('General_ShortMonth_8_js'),
-                _pk_translate('General_ShortMonth_9_js'),
-                _pk_translate('General_ShortMonth_10_js'),
-                _pk_translate('General_ShortMonth_11_js'),
-                _pk_translate('General_ShortMonth_12_js')],
+                _pk_translate('General_ShortMonth_1'),
+                _pk_translate('General_ShortMonth_2'),
+                _pk_translate('General_ShortMonth_3'),
+                _pk_translate('General_ShortMonth_4'),
+                _pk_translate('General_ShortMonth_5'),
+                _pk_translate('General_ShortMonth_6'),
+                _pk_translate('General_ShortMonth_7'),
+                _pk_translate('General_ShortMonth_8'),
+                _pk_translate('General_ShortMonth_9'),
+                _pk_translate('General_ShortMonth_10'),
+                _pk_translate('General_ShortMonth_11'),
+                _pk_translate('General_ShortMonth_12')],
             monthNames: [
-                _pk_translate('General_MonthJanuary_js'),
-                _pk_translate('General_MonthFebruary_js'),
-                _pk_translate('General_MonthMarch_js'),
-                _pk_translate('General_MonthApril_js'),
-                _pk_translate('General_MonthMay_js'),
-                _pk_translate('General_MonthJune_js'),
-                _pk_translate('General_MonthJuly_js'),
-                _pk_translate('General_MonthAugust_js'),
-                _pk_translate('General_MonthSeptember_js'),
-                _pk_translate('General_MonthOctober_js'),
-                _pk_translate('General_MonthNovember_js'),
-                _pk_translate('General_MonthDecember_js')]
+                _pk_translate('General_MonthJanuary'),
+                _pk_translate('General_MonthFebruary'),
+                _pk_translate('General_MonthMarch'),
+                _pk_translate('General_MonthApril'),
+                _pk_translate('General_MonthMay'),
+                _pk_translate('General_MonthJune'),
+                _pk_translate('General_MonthJuly'),
+                _pk_translate('General_MonthAugust'),
+                _pk_translate('General_MonthSeptember'),
+                _pk_translate('General_MonthOctober'),
+                _pk_translate('General_MonthNovember'),
+                _pk_translate('General_MonthDecember')]
         };
     };
 
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index 30b1b7e421..df360e9fd8 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -582,10 +582,10 @@ dataTable.prototype =
                                 function (manager) {
                                     manager.attr('data-is-range', 0);
                                     $('.annotationView img', domElem)
-                                        .attr('title', _pk_translate('Annotations_IconDesc_js'));
+                                        .attr('title', _pk_translate('Annotations_IconDesc'));
 
                                     var viewAndAdd = _pk_translate('Annotations_ViewAndAddAnnotations'),
-                                        hideNotes = _pk_translate('Annotations_HideAnnotationsFor_js');
+                                        hideNotes = _pk_translate('Annotations_HideAnnotationsFor');
 
                                     // change the tooltip of the previously clicked evolution icon (if any)
                                     if (oldDate) {
@@ -663,11 +663,11 @@ dataTable.prototype =
                 && annotationManager.attr('data-is-range') == 1) {
                 if (annotationManager.is(':hidden')) {
                     annotationManager.slideDown('slow'); // showing
-                    $('img', this).attr('title', _pk_translate('Annotations_IconDescHideNotes_js'));
+                    $('img', this).attr('title', _pk_translate('Annotations_IconDescHideNotes'));
                 }
                 else {
                     annotationManager.slideUp('slow'); // hiding
-                    $('img', this).attr('title', _pk_translate('Annotations_IconDesc_js'));
+                    $('img', this).attr('title', _pk_translate('Annotations_IconDesc'));
                 }
             }
             else {
@@ -685,7 +685,7 @@ dataTable.prototype =
                 );
 
                 // change the tooltip of the view annotation icon
-                $('img', this).attr('title', _pk_translate('Annotations_IconDescHideNotes_js'));
+                $('img', this).attr('title', _pk_translate('Annotations_IconDescHideNotes'));
             }
         });
     },
diff --git a/plugins/CoreHome/javascripts/popover.js b/plugins/CoreHome/javascripts/popover.js
index 22b23eab38..ea8c5c0374 100644
--- a/plugins/CoreHome/javascripts/popover.js
+++ b/plugins/CoreHome/javascripts/popover.js
@@ -82,8 +82,8 @@ var Piwik_Popover = (function () {
         showLoading: function (popoverName, popoverSubject, height, dialogClass) {
             var loading = $(document.createElement('div')).addClass('Piwik_Popover_Loading');
 
-            var loadingMessage = popoverSubject ? translations.General_LoadingPopoverFor_js :
-                translations.General_LoadingPopover_js;
+            var loadingMessage = popoverSubject ? translations.General_LoadingPopoverFor :
+                translations.General_LoadingPopover;
 
             loadingMessage = loadingMessage.replace(/%s/, popoverName);
 
diff --git a/plugins/CoreHome/templates/_dataTableFooter.twig b/plugins/CoreHome/templates/_dataTableFooter.twig
index 3fb4f0f3ce..99eaf7e496 100644
--- a/plugins/CoreHome/templates/_dataTableFooter.twig
+++ b/plugins/CoreHome/templates/_dataTableFooter.twig
@@ -97,7 +97,7 @@
                 </ul>
             </div>
             {% if isPluginLoaded('Annotations') and not properties.hide_annotations_view %}
-                <div class="annotationView" title="{{ 'Annotations_IconDesc_js'|translate }}">
+                <div class="annotationView" title="{{ 'Annotations_IconDesc'|translate }}">
                     <a class="tableIcon">
                         <img width="16" height="16" src="plugins/Zeitgeist/images/grey_marker.png"/>
                     </a>