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 21:38:03 +0400
committerBenaka Moorthi <benaka.moorthi@gmail.com>2013-09-12 22:10:16 +0400
commita5ab907fe3d09ad1aacd1a0718566aad9768889b (patch)
tree6bd50b5c3583b912671f2220f96d96666115ddd3 /plugins/SitesManager
parent9cd4cd3dd0a68e43fc9e6b9a9826c9a09fde5114 (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 'plugins/SitesManager')
-rw-r--r--plugins/SitesManager/templates/displayJavascriptCode.twig1
-rw-r--r--plugins/SitesManager/templates/index.twig1
2 files changed, 0 insertions, 2 deletions
diff --git a/plugins/SitesManager/templates/displayJavascriptCode.twig b/plugins/SitesManager/templates/displayJavascriptCode.twig
index 34ef90e10e..0a35d298cf 100644
--- a/plugins/SitesManager/templates/displayJavascriptCode.twig
+++ b/plugins/SitesManager/templates/displayJavascriptCode.twig
@@ -1,7 +1,6 @@
{% extends 'admin.twig' %}
{% block content %}
-{{ loadJavascriptTranslations(['SitesManager']) }}
{% raw %}
{% include "@SitesManager/_displayJavascriptCode.twig" %}
diff --git a/plugins/SitesManager/templates/index.twig b/plugins/SitesManager/templates/index.twig
index 902dc03e25..b0fc0decfa 100644
--- a/plugins/SitesManager/templates/index.twig
+++ b/plugins/SitesManager/templates/index.twig
@@ -3,7 +3,6 @@
{% block content %}
{% import 'macros.twig' as piwik %}
{% import 'ajaxMacros.twig' as ajax %}
- {{ loadJavascriptTranslations(['SitesManager']) }}
{% set excludedIpHelpPlain %}
{{ 'SitesManager_HelpExcludedIps'|translate("1.2.3.*","1.2.*.*") }}