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:
authorsgiehl <stefan@piwik.org>2013-09-14 02:38:28 +0400
committersgiehl <stefan@piwik.org>2013-09-14 02:39:09 +0400
commite0fd925e0d39fcf17c1e52b36c55812af7881297 (patch)
treef3dd2366aa048c1421eebd4bc601661d40cd36ef /plugins/Annotations
parentc7b7707222492f18b1ae2de72d2e856be2753271 (diff)
refs #4151 refactored some usages of _js hack
Diffstat (limited to 'plugins/Annotations')
-rwxr-xr-xplugins/Annotations/Annotations.php4
-rwxr-xr-xplugins/Annotations/templates/getAnnotationManager.twig2
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/Annotations/Annotations.php b/plugins/Annotations/Annotations.php
index 92609ecf16..fc60db2b91 100755
--- a/plugins/Annotations/Annotations.php
+++ b/plugins/Annotations/Annotations.php
@@ -24,8 +24,8 @@ class Annotations extends \Piwik\Plugin
public function getListHooksRegistered()
{
return array(
- 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
- 'AssetManager.getJsFiles' => 'getJsFiles'
+ 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles',
+ 'AssetManager.getJsFiles' => 'getJsFiles',
);
}
diff --git a/plugins/Annotations/templates/getAnnotationManager.twig b/plugins/Annotations/templates/getAnnotationManager.twig
index 41da86fa90..0cb594426e 100755
--- a/plugins/Annotations/templates/getAnnotationManager.twig
+++ b/plugins/Annotations/templates/getAnnotationManager.twig
@@ -12,7 +12,7 @@
<div class="annotation-list">
{% include "@Annotations/_annotationList.twig" %}
- <span class="loadingPiwik" style="display:none;"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_Loading_js'|translate }}</span>
+ <span class="loadingPiwik" style="display:none;"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_Loading'|translate }}</span>
</div>