Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenaka Moorthi <benaka.moorthi@gmail.com>2013-09-12 22:09:23 +0400
committerBenaka Moorthi <benaka.moorthi@gmail.com>2013-09-12 22:10:17 +0400
commit807336d4e664947e972d1641821dd878e1e21532 (patch)
tree8eec205b9d24f692237fcd6afae377911d2e0416 /plugins/Proxy
parent3a2c5f41a41eb09de1a4595968e174cfdff56208 (diff)
Refs #4151, make sure translations JS is always regenerated when merged assets is disabled.
Diffstat (limited to 'plugins/Proxy')
-rw-r--r--plugins/Proxy/Controller.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php
index 3283e08909..8c6f4338bb 100644
--- a/plugins/Proxy/Controller.php
+++ b/plugins/Proxy/Controller.php
@@ -54,10 +54,15 @@ class Controller extends \Piwik\Controller
* This method is called when the asset manager is disabled (otherwise it would be part
* of the merged JS file.)
*
+ * Note: This method always regenerates the file since not doing so would make development
+ * painful.
+ *
* @see core/AssetManager.php
*/
public function getTranslationJs()
{
+ AssetManager::generateTranslationsJsFile();
+
$translationsJsFile = AssetManager::getTranslationsJsFileLocation();
Piwik::serveStaticFile($translationsJsFile, self::JS_MIME_TYPE);
}