diff options
author | diosmosis <diosmosis@users.noreply.github.com> | 2018-05-24 07:32:40 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-24 07:32:40 +0300 |
commit | 623bbf6fc331e5588e88666d0040857ae493f985 (patch) | |
tree | e9a6be0a51357a783b059e15c2f43707b8d9f742 /plugins | |
parent | 617de25752c965ca7a8ff1979419a43b2e90c7a1 (diff) |
Rename Actions category to Behavior + Referrers category to Acquisition (#12950)
* Rename Actions category to Behavior + Referrers category to Acquisition while retaining category ID.
* quick fix
* Update expected system test files.
* Updating screenshots & fixing test.
* fix dashboard test
* Update screenshots again.
Diffstat (limited to 'plugins')
11 files changed, 29 insertions, 15 deletions
diff --git a/plugins/API/WidgetMetadata.php b/plugins/API/WidgetMetadata.php index f03d3d7828..0bbb823f14 100644 --- a/plugins/API/WidgetMetadata.php +++ b/plugins/API/WidgetMetadata.php @@ -188,7 +188,7 @@ class WidgetMetadata return array( 'id' => (string) $category->getId(), - 'name' => Piwik::translate($category->getId()), + 'name' => $category->getDisplayName(), 'order' => $category->getOrder(), 'icon' => $category->getIcon(), ); diff --git a/plugins/Actions/lang/en.json b/plugins/Actions/lang/en.json index 4d4d6c6626..5eedd41b32 100644 --- a/plugins/Actions/lang/en.json +++ b/plugins/Actions/lang/en.json @@ -75,6 +75,7 @@ "WidgetSearchKeywords": "Site Search Keywords", "WidgetSearchNoResultKeywords": "Search Keywords with No Results", "ActionType": "Action Type", - "ActionTypes": "Action Types" + "ActionTypes": "Action Types", + "Behaviour": "Behaviour" } }
\ No newline at end of file diff --git a/plugins/CoreHome/Categories/ActionsCategory.php b/plugins/CoreHome/Categories/ActionsCategory.php index a7f1c57276..d7e604d06c 100644 --- a/plugins/CoreHome/Categories/ActionsCategory.php +++ b/plugins/CoreHome/Categories/ActionsCategory.php @@ -9,10 +9,16 @@ namespace Piwik\Plugins\CoreHome\Categories; use Piwik\Category\Category; +use Piwik\Piwik; class ActionsCategory extends Category { protected $id = 'General_Actions'; protected $order = 10; protected $icon = 'icon-reporting-actions'; + + public function getDisplayName() + { + return Piwik::translate('Actions_Behaviour'); + } } diff --git a/plugins/Dashboard/tests/UI/Dashboard_spec.js b/plugins/Dashboard/tests/UI/Dashboard_spec.js index 54abbb4469..c929f6783e 100644 --- a/plugins/Dashboard/tests/UI/Dashboard_spec.js +++ b/plugins/Dashboard/tests/UI/Dashboard_spec.js @@ -123,8 +123,8 @@ describe("Dashboard", function () { page.mouseMove('.widgetpreview-categorylist>li:contains(Live!)'); // have to mouse move twice... otherwise Live! will just be highlighted page.click('.widgetpreview-categorylist>li:contains(Live!)'); - page.mouseMove('.widgetpreview-categorylist>li:contains(Actions):first'); - page.click('.widgetpreview-categorylist>li:contains(Actions):first'); + page.mouseMove('.widgetpreview-categorylist>li:contains(Behaviour):first'); + page.click('.widgetpreview-categorylist>li:contains(Behaviour):first'); page.mouseMove('.widgetpreview-widgetlist>li:contains(Pages):first'); page.click('.widgetpreview-widgetlist>li:contains(Pages):first'); diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png index d0904cfbdd..8f7faf0096 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56b0d0e663df96757f0bb3c217b66ff44f753e5479f38f6ec03fe4a850197343 -size 47432 +oid sha256:6a314f325c391de019c3fc6e042ed34b88126852d6531b032ef702d918321c8f +size 47826 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png index eeba9a1a02..5f26293303 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_expanded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88d1b341a1ab60c44965f7b37950ac47719373746d2e5261db5000be17b3c14a -size 46124 +oid sha256:4fd2c5c78884be0cfd6c7bf620dc2f7aa5f82bea9de34a65fae33ef0ddadc5d8 +size 46904 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png index 8dc33916f5..02625b9b35 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:065b18201fd11391cddd01c8d4d640abf8ccc021501a488728e0c1e2ab89ebda -size 431103 +oid sha256:0fdef330ba8710fdae3ad0c445c58848b77496efb6cb4f0beaf431ad89990100 +size 431522 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png index 9d094640d7..e015fafe22 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_list_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f31d7be01e702ede6e40d5afe514a4ab7f418637ea1dbe10a9508b75151add1b -size 56214 +oid sha256:2692f5b18e1643264b616159b4a8043fd4b33cfee9abeb89bfcaef19290677b7 +size 57021 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png index 7a77142bba..40665bf6a7 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_widget_preview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25e8f7cd2d71036932f6ed932741360b5f802b818dd2e4ff98137e66abe5ca8f -size 67941 +oid sha256:22a795cbcbbe4600add04a010b32d8bf6fc4ae353bc31e643b474a2e68ba327e +size 68744 diff --git a/plugins/Referrers/Categories/ReferrersCategory.php b/plugins/Referrers/Categories/ReferrersCategory.php index bde0c76699..a9dcc5d0aa 100644 --- a/plugins/Referrers/Categories/ReferrersCategory.php +++ b/plugins/Referrers/Categories/ReferrersCategory.php @@ -9,10 +9,16 @@ namespace Piwik\Plugins\Referrers\Categories; use Piwik\Category\Category; +use Piwik\Piwik; class ReferrersCategory extends Category { protected $id = 'Referrers_Referrers'; protected $order = 15; protected $icon = 'icon-reporting-referer'; + + public function getDisplayName() + { + return Piwik::translate('Referrers_Acquisition'); + } } diff --git a/plugins/Referrers/lang/en.json b/plugins/Referrers/lang/en.json index b2c0d7eda2..456e1cfb3b 100644 --- a/plugins/Referrers/lang/en.json +++ b/plugins/Referrers/lang/en.json @@ -53,6 +53,7 @@ "WidgetGetAll": "All Referrers", "WidgetSocials": "List of social networks", "WidgetTopKeywordsForPages": "Top Keywords for Page URL", - "XPercentOfVisits": "%s of visits" + "XPercentOfVisits": "%s of visits", + "Acquisition": "Acquisition" } } |