Refs #4151, remove loadJavascriptTranslations twig function and automatically generate translation JS for all plugins. Translation JS is now treated as an asset and is included in merged JS.

Note:
  - Includes tweaks to capture.js: on webpage error stop capture program.

1 files changed, 15 insertions, 1 deletions

diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php
index d358908805..3283e08909 100644
--- a/plugins/Proxy/Controller.php
+++ b/plugins/Proxy/Controller.php
@@ -23,6 +23,7 @@ use Piwik\Url;
 class Controller extends \Piwik\Controller
 {
     const TRANSPARENT_PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACnej3aAAAAAXRSTlMAQObYZgAAAApJREFUCNdjYAAAAAIAAeIhvDMAAAAASUVORK5CYII=';
+    const JS_MIME_TYPE = "application/javascript; charset=UTF-8";
 
     /**
      * Output the merged CSS file.
@@ -45,7 +46,20 @@ class Controller extends \Piwik\Controller
     public function getJs()
     {
         $jsMergedFile = AssetManager::getMergedJsFileLocation();
-        Piwik::serveStaticFile($jsMergedFile, "application/javascript; charset=UTF-8");
+        Piwik::serveStaticFile($jsMergedFile, self::JS_MIME_TYPE);
+    }
+
+    /**
+     * Output the translations JavaScript file.
+     * This method is called when the asset manager is disabled (otherwise it would be part
+     * of the merged JS file.)
+     * 
+     * @see core/AssetManager.php
+     */
+    public function getTranslationJs()
+    {
+        $translationsJsFile = AssetManager::getTranslationsJsFileLocation();
+        Piwik::serveStaticFile($translationsJsFile, self::JS_MIME_TYPE);
     }
 
     /**