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 /plugins/Zeitgeist | |
| 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 'plugins/Zeitgeist')
| -rw-r--r-- | plugins/Zeitgeist/templates/admin.twig | 2 | ||||
| -rw-r--r-- | plugins/Zeitgeist/templates/dashboard.twig | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/plugins/Zeitgeist/templates/admin.twig b/plugins/Zeitgeist/templates/admin.twig index fd4c1c5e5f..515c10e6a3 100644 --- a/plugins/Zeitgeist/templates/admin.twig +++ b/plugins/Zeitgeist/templates/admin.twig @@ -10,8 +10,6 @@ <meta name="generator" content="Piwik - Open Source Web Analytics"/> <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> - {{ loadJavascriptTranslations(['CoreAdminHome','CoreHome'])|raw }} - {% include "_jsGlobalVariables.twig" %} {% include "_jsCssIncludes.twig" %} <!--[if IE]> diff --git a/plugins/Zeitgeist/templates/dashboard.twig b/plugins/Zeitgeist/templates/dashboard.twig index aaa516cda4..b90a53200b 100644 --- a/plugins/Zeitgeist/templates/dashboard.twig +++ b/plugins/Zeitgeist/templates/dashboard.twig @@ -12,7 +12,6 @@ <meta name="generator" content="Piwik - Open Source Web Analytics"/> <meta name="description" content="Web Analytics report for '{{ siteName }}' - Piwik"/> <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> - {{ loadJavascriptTranslations(['CoreHome','Annotations'])|raw }} {% include "_jsGlobalVariables.twig" %} <!--[if lt IE 9]> <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script> |