diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-12-10 00:50:07 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2015-12-10 00:50:07 +0300 |
| commit | ebced800c0184f5ce93663afab6b0337c3755cbb (patch) | |
| tree | fb26c2506d37586ff0d38fb902d63d17701bd883 /plugins/Insights | |
| parent | 3d26af780d8fe0e4f7c5824a88b95c4a0d0d25d7 (diff) | |
| parent | db36ca384809ea36457a465a3b6d1ecf951b0e26 (diff) | |
Merge master into "3.0"
Conflicts:
.travis.yml
CHANGELOG.md
core/Plugin/ControllerAdmin.php
core/Version.php
core/testMinimumPhpVersion.php
plugins/API/API.php
plugins/Actions/Reports/GetPageUrls.php
plugins/AnonymousPiwikUsageMeasurement
plugins/CoreHome/CoreHome.php
plugins/CoreHome/templates/_menu.twig
plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
plugins/Goals/Controller.php
tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
tests/PHPUnit/Integration/Plugin/ManagerTest.php
tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
tests/UI/expected-ui-screenshots
tests/UI/specs/Overlay_spec.js
tests/UI/specs/UIIntegration_spec.js
Diffstat (limited to 'plugins/Insights')
| -rw-r--r-- | plugins/Insights/Visualizations/Insight.php | 4 | ||||
| -rw-r--r-- | plugins/Insights/lang/cs.json | 2 | ||||
| -rw-r--r-- | plugins/Insights/lang/ja.json | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/plugins/Insights/Visualizations/Insight.php b/plugins/Insights/Visualizations/Insight.php index 7fe304e5be..91d2c90b63 100644 --- a/plugins/Insights/Visualizations/Insight.php +++ b/plugins/Insights/Visualizations/Insight.php @@ -40,6 +40,10 @@ class Insight extends Visualization $report = $this->requestConfig->apiMethodToRequestDataTable; $report = str_replace('.', '_', $report); + if (!empty($this->requestConfig->request_parameters_to_modify['reportUniqueId'])) { + $report = $this->requestConfig->request_parameters_to_modify['reportUniqueId']; + } + $this->requestConfig->apiMethodToRequestDataTable = 'Insights.getInsights'; $this->requestConfig->request_parameters_to_modify = array( diff --git a/plugins/Insights/lang/cs.json b/plugins/Insights/lang/cs.json index f389736692..7abc7c7112 100644 --- a/plugins/Insights/lang/cs.json +++ b/plugins/Insights/lang/cs.json @@ -8,7 +8,7 @@ "DayComparedToPreviousWeek": "Stejný den v minulém týdnu", "DayComparedToPreviousYear": "Stejný den v předchozím roce", "Filter": "Filtr", - "FilterIncreaserAndDecreaser": "Zvyšovač & snižovač", + "FilterIncreaserAndDecreaser": "Zvyšovač a snižovač", "FilterOnlyDecreaser": "Pouze snižovač", "FilterOnlyDisappeared": "Pouze ztracení", "FilterOnlyIncreaser": "Pouze zvyšovač", diff --git a/plugins/Insights/lang/ja.json b/plugins/Insights/lang/ja.json index 9695c7fa54..db9cce115b 100644 --- a/plugins/Insights/lang/ja.json +++ b/plugins/Insights/lang/ja.json @@ -1,5 +1,6 @@ { "Insights": { + "PluginDescription": "トラフィックについてのインサイトを提供しています。インサイトは、ダッシュボードウィジェットだけでなく、データの中で最も重要なトレンドを見るためのレポートで新しいアイコンとして使用できます。", "ControlComparedToDescription": "比較する実績値は", "ControlFilterByDescription": "すべて、変動のみ、新規のみ、削除のみを表示", "DatePeriodCombinationNotSupported": "この日付と期間の組み合わせに対するインサイトは作成できません。", |