refs #4151 refacoted some more usages of _js hack

3 files changed, 8 insertions, 5 deletions

diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php
index b7bee31970..4f30172753 100644
--- a/plugins/Live/Live.php
+++ b/plugins/Live/Live.php
@@ -79,6 +79,9 @@ class Live extends \Piwik\Plugin
     public function getClientSideTranslationKeys(&$translationKeys)
     {
         $translationKeys[] = "Live_VisitorProfile";
+        $translationKeys[] = "Live_NoMoreVisits";
+        $translationKeys[] = "Live_ShowMap";
+        $translationKeys[] = "Live_HideMap";
     }
 
     public function getReportDisplayProperties(&$properties)
diff --git a/plugins/Live/javascripts/visitorProfile.js b/plugins/Live/javascripts/visitorProfile.js
index 6d5f5c5ed8..dbac72498a 100644
--- a/plugins/Live/javascripts/visitorProfile.js
+++ b/plugins/Live/javascripts/visitorProfile.js
@@ -149,12 +149,12 @@
                 }
 
                 $map.slideDown('slow');
-                var newLabel = 'Live_HideMap_js';
+                var newLabel = 'Live_HideMap';
 
                 piwikHelper.lazyScrollTo($('.visitor-profile-location', $element)[0], 400);
             } else { // hide the map if it is shown
                 $map.slideUp('slow');
-                var newLabel = 'Live_ShowMap_js';
+                var newLabel = 'Live_ShowMap';
             }
 
             newLabel = _pk_translate(newLabel).replace(' ', '\xA0');
@@ -211,7 +211,7 @@
         },
 
         _showNoMoreVisitsSpan: function () {
-            var noMoreSpan = $('<span/>').text(_pk_translate('Live_NoMoreVisits_js')).addClass('visitor-profile-no-visits');
+            var noMoreSpan = $('<span/>').text(_pk_translate('Live_NoMoreVisits')).addClass('visitor-profile-no-visits');
             $('.visitor-profile-more-info', this.$element).html(noMoreSpan);
         },
 
diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig
index f1f58a0c27..50ea1c92c1 100644
--- a/plugins/Live/templates/getVisitorProfilePopup.twig
+++ b/plugins/Live/templates/getVisitorProfilePopup.twig
@@ -75,7 +75,7 @@
                             {% set entryCountry %}<img src="{{ entry.flag }}" title="{{ entry.prettyName }}"/>&nbsp;{{ entry.prettyName }}{% endset %}
                             {{- 'General_XFromY'|translate(entryVisits, entryCountry)|raw -}}{% if not loop.last %}, {% endif %}
                             {%- endfor %}
-                            <a class="visitor-profile-show-map" href="#" {% if userCountryMapUrl|default('') is empty %}style="display:none"{% endif %}>({{ 'Live_ShowMap_js'|translate|replace({' ': '&nbsp;'})|raw }})</a> <img class="loadingPiwik" style="display:none;" src="plugins/Zeitgeist/images/loading-blue.gif"/>
+                            <a class="visitor-profile-show-map" href="#" {% if userCountryMapUrl|default('') is empty %}style="display:none"{% endif %}>({{ 'Live_ShowMap'|translate|replace({' ': '&nbsp;'})|raw }})</a> <img class="loadingPiwik" style="display:none;" src="plugins/Zeitgeist/images/loading-blue.gif"/>
                         </p>
                         <div class="visitor-profile-map" style="display:none" data-href="{{ userCountryMapUrl|default('') }}">
                         </div>
@@ -95,7 +95,7 @@
                     {% if visitorData.lastVisits.getRowsCount() >= constant("Piwik\\Plugins\\Live\\API::VISITOR_PROFILE_MAX_VISITS_TO_SHOW") %}
                     <a href="#">{{ 'Live_LoadMoreVisits'|translate }}</a> <img class="loadingPiwik" style="display:none;" src="plugins/Zeitgeist/images/loading-blue.gif"/>
                     {% else %}
-                    <span class="visitor-profile-no-visits">{{ 'Live_NoMoreVisits_js'|translate }}</span>
+                    <span class="visitor-profile-no-visits">{{ 'Live_NoMoreVisits'|translate }}</span>
                     {% endif %}
                 </div>
             </div>