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 19:04:14 +0400
committersgiehl <stefan@piwik.org>2013-09-14 19:04:14 +0400
commit4cdb9571814fb40173d81ef4ed2ce4341e01aee7 (patch)
tree24769e451baa37ba89905ff1684ba9abed2e703b /plugins/Overlay
parent2fa88c207c1f626a933873feec27cc3089f7b610 (diff)
refs #4151 refactored more _js hack uses
Diffstat (limited to 'plugins/Overlay')
-rw-r--r--plugins/Overlay/Overlay.php9
-rw-r--r--plugins/Overlay/javascripts/rowaction.js4
-rw-r--r--plugins/Overlay/templates/index.twig4
3 files changed, 12 insertions, 5 deletions
diff --git a/plugins/Overlay/Overlay.php b/plugins/Overlay/Overlay.php
index 6800faf262..10673003ae 100644
--- a/plugins/Overlay/Overlay.php
+++ b/plugins/Overlay/Overlay.php
@@ -28,7 +28,8 @@ class Overlay extends \Piwik\Plugin
function getListHooksRegistered()
{
return array(
- 'AssetManager.getJsFiles' => 'getJsFiles',
+ 'AssetManager.getJsFiles' => 'getJsFiles',
+ 'Translate.getClientSideTranslationKeys' => 'getClientSideTranslationKeys'
);
}
@@ -41,4 +42,10 @@ class Overlay extends \Piwik\Plugin
$jsFiles[] = 'plugins/Overlay/javascripts/rowaction.js';
$jsFiles[] = 'plugins/Overlay/javascripts/Overlay_Helper.js';
}
+
+ public function getClientSideTranslationKeys(&$translationKeys)
+ {
+ $translationKeys[] = 'General_OverlayRowActionTooltipTitle';
+ $translationKeys[] = 'General_OverlayRowActionTooltip';
+ }
}
diff --git a/plugins/Overlay/javascripts/rowaction.js b/plugins/Overlay/javascripts/rowaction.js
index caa1f10a8b..a452b1dc7a 100644
--- a/plugins/Overlay/javascripts/rowaction.js
+++ b/plugins/Overlay/javascripts/rowaction.js
@@ -41,8 +41,8 @@ DataTable_RowActions_Registry.register({
order: 30,
dataTableIconTooltip: [
- _pk_translate('General_OverlayRowActionTooltipTitle_js'),
- _pk_translate('General_OverlayRowActionTooltip_js')
+ _pk_translate('General_OverlayRowActionTooltipTitle'),
+ _pk_translate('General_OverlayRowActionTooltip')
],
createInstance: function (dataTable) {
diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig
index 9697f90024..ce377ef0a4 100644
--- a/plugins/Overlay/templates/index.twig
+++ b/plugins/Overlay/templates/index.twig
@@ -48,8 +48,8 @@
<div id="Overlay_Sidebar"></div>
- <a id="Overlay_RowEvolution">{{ 'General_RowEvolutionRowActionTooltipTitle_js'|translate }}</a>
- <a id="Overlay_Transitions">{{ 'General_TransitionsRowActionTooltipTitle_js'|translate }}</a>
+ <a id="Overlay_RowEvolution">{{ 'General_RowEvolutionRowActionTooltipTitle'|translate }}</a>
+ <a id="Overlay_Transitions">{{ 'General_TransitionsRowActionTooltipTitle'|translate }}</a>
<!-- TODO: rethink the way the sidebar works -->
<!-- <a id="Overlay_FullScreen" href="#">