diff options
author | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-02-02 07:19:34 +0300 |
---|---|---|
committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-02-02 07:19:34 +0300 |
commit | e3faf18f9ed0368861f542e80f3dbaeb92fdeb8a (patch) | |
tree | b3aae26dfe73e967a05c9cefb8ebf704093b62fb /plugins/VisitsSummary | |
parent | 383cccc8fd4e1c250283b64cfd6367ac20ba9cc9 (diff) | |
parent | fe291eaf10001aac67351d7f9f622c3f96484852 (diff) |
Merge branch 'di-controllers'
Conflicts:
plugins/MobileMessaging/Controller.php
Diffstat (limited to 'plugins/VisitsSummary')
-rw-r--r-- | plugins/VisitsSummary/Controller.php | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index 84916cf057..825a5f5bba 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -15,6 +15,7 @@ use Piwik\DataTable\Row; use Piwik\Piwik; use Piwik\Plugins\Actions\API as APIActions; use Piwik\Site; +use Piwik\Translation\Translator; use Piwik\View; /** @@ -22,6 +23,18 @@ use Piwik\View; */ class Controller extends \Piwik\Plugin\Controller { + /** + * @var Translator + */ + private $translator; + + public function __construct(Translator $translator) + { + $this->translator = $translator; + + parent::__construct(); + } + public function index() { $view = new View('@VisitsSummary/index'); @@ -48,23 +61,23 @@ class Controller extends \Piwik\Plugin\Controller } } - $documentation = Piwik::translate('VisitsSummary_VisitsSummaryDocumentation') . '<br />' - . Piwik::translate('General_BrokenDownReportDocumentation') . '<br /><br />' + $documentation = $this->translator->translate('VisitsSummary_VisitsSummaryDocumentation') . '<br />' + . $this->translator->translate('General_BrokenDownReportDocumentation') . '<br /><br />' - . '<b>' . Piwik::translate('General_ColumnNbVisits') . ':</b> ' - . Piwik::translate('General_ColumnNbVisitsDocumentation') . '<br />' + . '<b>' . $this->translator->translate('General_ColumnNbVisits') . ':</b> ' + . $this->translator->translate('General_ColumnNbVisitsDocumentation') . '<br />' - . '<b>' . Piwik::translate('General_ColumnNbUniqVisitors') . ':</b> ' - . Piwik::translate('General_ColumnNbUniqVisitorsDocumentation') . '<br />' + . '<b>' . $this->translator->translate('General_ColumnNbUniqVisitors') . ':</b> ' + . $this->translator->translate('General_ColumnNbUniqVisitorsDocumentation') . '<br />' - . '<b>' . Piwik::translate('General_ColumnNbActions') . ':</b> ' - . Piwik::translate('General_ColumnNbActionsDocumentation') . '<br />' + . '<b>' . $this->translator->translate('General_ColumnNbActions') . ':</b> ' + . $this->translator->translate('General_ColumnNbActionsDocumentation') . '<br />' - . '<b>' . Piwik::translate('General_ColumnNbUsers') . ':</b> ' - . Piwik::translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/user-id/">User ID</a>)<br />' + . '<b>' . $this->translator->translate('General_ColumnNbUsers') . ':</b> ' + . $this->translator->translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/user-id/">User ID</a>)<br />' - . '<b>' . Piwik::translate('General_ColumnActionsPerVisit') . ':</b> ' - . Piwik::translate('General_ColumnActionsPerVisitDocumentation'); + . '<b>' . $this->translator->translate('General_ColumnActionsPerVisit') . ':</b> ' + . $this->translator->translate('General_ColumnActionsPerVisitDocumentation'); $selectableColumns = array( // columns from VisitsSummary.get |