Refs #4151, fix regression caused by refactoring hack.

matomo-org · Sep 13, 2013 · 330bde5 · 330bde5
1 parent aca4c43
commit 330bde5
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/core/Translate.php b/core/Translate.php
@@ -163,7 +163,11 @@ public function getLanguageDefault()
      */
     public function getJavascriptTranslations()
     {
-        $translations = $GLOBALS['Piwik_translations'];
+        $translations = &$GLOBALS['Piwik_translations'];
+
+        // Hack: common translations used in JS but not only, force them to be defined in JS
+        $translations['General']['Save_js'] = $translations['General']['Save'];
+        $translations['General']['OrCancel_js'] = $translations['General']['OrCancel'];
 
         $clientSideTranslations = array();
         foreach ($this->getClientSideTranslationKeys() as $key) {
@@ -188,8 +192,7 @@ private function getClientSideTranslationKeys()
     {
         $moduleRegex = '#^.*_js$#i';
 
-        // Hack: common translations used in JS but not only, force them to be defined in JS
-        $result = array('General_Save', 'General_OrCancel');
+        $result = array();
 
         Piwik_PostEvent(self::GET_CLIENT_SIDE_TRANSLATION_KEYS_EVENT, array(&$result));