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
path: root/core
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 /core
parent3a2c5f41a41eb09de1a4595968e174cfdff56208 (diff)
Refs #4151, make sure translations JS is always regenerated when merged assets is disabled.
Diffstat (limited to 'core')
-rw-r--r--core/AssetManager.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/core/AssetManager.php b/core/AssetManager.php
index 449d992226..cf3e02c564 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -459,14 +459,22 @@ class AssetManager
$isGenerated = self::isGenerated(self::TRANSLATIONS_JS_FILE);
if (!$isGenerated) {
- $translationJs = Translate::getInstance()->getJavascriptTranslations();
- self::writeAssetToFile($translationJs, self::TRANSLATIONS_JS_FILE);
+ self::generateTranslationsJsFile();
}
return self::getAbsoluteMergedFileLocation(self::TRANSLATIONS_JS_FILE);
}
/**
+ * Generates the translations JS file.
+ */
+ public static function generateTranslationsJsFile()
+ {
+ $translationJs = Translate::getInstance()->getJavascriptTranslations();
+ self::writeAssetToFile($translationJs, self::TRANSLATIONS_JS_FILE);
+ }
+
+ /**
* Check if the provided merged file is generated
*
* @param string $filename filename of the merged asset