diff options
author | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-09-12 21:38:03 +0400 |
---|---|---|
committer | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-09-12 22:10:16 +0400 |
commit | a5ab907fe3d09ad1aacd1a0718566aad9768889b (patch) | |
tree | 6bd50b5c3583b912671f2220f96d96666115ddd3 /core/Twig.php | |
parent | 9cd4cd3dd0a68e43fc9e6b9a9826c9a09fde5114 (diff) |
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.
Diffstat (limited to 'core/Twig.php')
-rw-r--r-- | core/Twig.php | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/core/Twig.php b/core/Twig.php index 5f6550512e..09dbe27940 100644 --- a/core/Twig.php +++ b/core/Twig.php @@ -71,7 +71,6 @@ class Twig $this->addFunction_includeAssets(); $this->addFunction_linkTo(); - $this->addFunction_loadJavascriptTranslations(); $this->addFunction_sparkline(); $this->addFunction_postEvent(); $this->addFunction_isPluginLoaded(); @@ -125,28 +124,6 @@ class Twig $this->twig->addFunction($sparklineFunction); } - protected function addFunction_loadJavascriptTranslations() - { - $loadJsTranslationsFunction = new Twig_SimpleFunction('loadJavascriptTranslations', function (array $plugins, $disableScriptTag = false) { - static $pluginTranslationsAlreadyLoaded = array(); - if (in_array($plugins, $pluginTranslationsAlreadyLoaded)) { - return; - } - $pluginTranslationsAlreadyLoaded[] = $plugins; - $jsTranslations = Translate::getInstance()->getJavascriptTranslations($plugins); - $jsCode = ''; - if ($disableScriptTag) { - $jsCode .= $jsTranslations; - } else { - $jsCode .= '<script type="text/javascript">'; - $jsCode .= $jsTranslations; - $jsCode .= '</script>'; - } - return $jsCode; - }, array('is_safe' => array('html'))); - $this->twig->addFunction($loadJsTranslationsFunction); - } - protected function addFunction_linkTo() { $urlFunction = new Twig_SimpleFunction('linkTo', function ($params) { |