diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-10-15 16:43:35 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2015-10-15 16:43:35 +0300 |
| commit | bb80b8f831e10f037c8d2722c9967943defef95e (patch) | |
| tree | 3ce0a28cb1d15148cd15d48b83a39e0c92bf38b8 /plugins/Contents/Contents.php | |
| parent | 713a124cc2c118697f3f2801679bc0e2bb5c5dc3 (diff) | |
| parent | 1e139be2c8c3c6f974e740dd1c9f905e8f673f98 (diff) | |
Merge branch 'master' into 3.0
Conflicts:
CHANGELOG.md
core/Plugin/Controller.php
core/Version.php
plugins/API/ProcessedReport.php
plugins/CoreHome/CoreHome.php
plugins/CoreHome/javascripts/corehome.js
plugins/CoreHome/javascripts/menu.js
plugins/CoreHome/javascripts/menu_init.js
plugins/CoreHome/lang/en.json
plugins/CoreHome/stylesheets/zen-mode.less
plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig
plugins/CoreHome/templates/_indexContent.twig
plugins/CoreHome/templates/getDefaultIndexView.twig
plugins/Dashboard/Menu.php
plugins/Dashboard/javascripts/dashboard.js
plugins/Dashboard/javascripts/dashboardObject.js
plugins/Goals/templates/_titleAndEvolutionGraph.twig
plugins/Goals/templates/getOverviewView.twig
plugins/Morpheus/javascripts/piwikHelper.js
plugins/Referrers/templates/index.twig
plugins/UserCountry/templates/index.twig
plugins/VisitFrequency/templates/_sparklines.twig
plugins/ZenMode/ZenMode.php
plugins/ZenMode/javascripts/zen-mode.js
tests/PHPUnit/Fixtures/UITestFixture.php
tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
tests/UI/expected-ui-screenshots
tests/UI/specs/Dashboard_spec.js
tests/UI/specs/Menus_spec.js
tests/UI/specs/UIIntegration_spec.js
Diffstat (limited to 'plugins/Contents/Contents.php')
| -rw-r--r-- | plugins/Contents/Contents.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/plugins/Contents/Contents.php b/plugins/Contents/Contents.php index 49df9a730b..df42522cb3 100644 --- a/plugins/Contents/Contents.php +++ b/plugins/Contents/Contents.php @@ -8,6 +8,8 @@ */ namespace Piwik\Plugins\Contents; +use Piwik\Piwik; + class Contents extends \Piwik\Plugin { /** @@ -17,6 +19,7 @@ class Contents extends \Piwik\Plugin { return array( 'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations', + 'Metrics.getDefaultMetricDocumentationTranslations' => 'addMetricDocumentationTranslations', 'AssetManager.getJavaScriptFiles' => 'getJsFiles', 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles' ); @@ -39,4 +42,9 @@ class Contents extends \Piwik\Plugin $stylesheets[] = "plugins/Contents/stylesheets/datatable.less"; } + public function addMetricDocumentationTranslations(&$translations) + { + $translations['nb_impressions'] = Piwik::translate('Contents_ImpressionsMetricDocumentation'); + $translations['nb_interactions'] = Piwik::translate('Contents_InteractionsMetricDocumentation'); + } } |