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>2015-06-06 01:12:03 +0300
committersgiehl <stefan@piwik.org>2015-06-06 01:12:03 +0300
commitcc57e579f58b016768c77d30a6506783ca98e42a (patch)
tree642b48a0471bde86925e5a515dbfffe28a5e0ab2 /plugins/Annotations
parenteb1abd5a120f15fb8fc11ee083a7def0ef61b37b (diff)
use new translations from Intl plugin
Diffstat (limited to 'plugins/Annotations')
-rwxr-xr-xplugins/Annotations/Annotations.php2
-rwxr-xr-xplugins/Annotations/javascripts/annotations.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Annotations/Annotations.php b/plugins/Annotations/Annotations.php
index daf89e93a6..c560f56b9f 100755
--- a/plugins/Annotations/Annotations.php
+++ b/plugins/Annotations/Annotations.php
@@ -29,7 +29,7 @@ class Annotations extends \Piwik\Plugin
public function getClientSideTranslationKeys(&$translationKeys)
{
- $translationKeys[] = 'General_Today';
+ $translationKeys[] = 'Intl_Today';
}
/**
diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js
index 4f8d21de6a..28adbc126b 100755
--- a/plugins/Annotations/javascripts/annotations.js
+++ b/plugins/Annotations/javascripts/annotations.js
@@ -127,7 +127,7 @@
var result = piwik.getBaseDatePickerOptions(annotationDate);
result.showButtonPanel = true;
- result.currentText = _pk_translate('General_Today');
+ result.currentText = _pk_translate('Intl_Today');
// make sure days before site start & after today cannot be selected
var piwikMinDate = result.minDate;