diff options
Diffstat (limited to 'plugins/MultiSites')
| -rw-r--r-- | plugins/MultiSites/angularjs/dashboard/dashboard.controller.js | 2 | ||||
| -rw-r--r-- | plugins/MultiSites/angularjs/dashboard/dashboard.directive.html | 4 | ||||
| -rw-r--r-- | plugins/MultiSites/lang/tr.json | 9 | ||||
| -rw-r--r-- | plugins/MultiSites/lang/uk.json | 6 | ||||
| -rw-r--r-- | plugins/MultiSites/plugin.json | 8 | ||||
| -rw-r--r-- | plugins/MultiSites/tests/Integration/MultiSitesTest.php | 25 |
6 files changed, 42 insertions, 12 deletions
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js b/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js index 35cf26a5de..41fcb81d9f 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.controller.js @@ -19,7 +19,7 @@ $scope.idSite = piwik.broadcast.getValueFromUrl('idSite'); $scope.url = piwik.piwik_url; $scope.period = piwik.period; - $scope.arePiwikProAdsEnabled = piwik.config && piwik.config.are_ads_enabled; + $scope.areAdsForProfessionalServicesEnabled = piwik.config && piwik.config.are_ads_enabled; this.refresh = function (interval) { multisitesDashboardModel.refreshInterval = interval; diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html index 46bba85aad..a0354621b8 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html @@ -66,8 +66,8 @@ <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> – <a rel="noreferrer" target="_blank" href="http://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> - <span ng-show="arePiwikProAdsEnabled"> – </span> - <a ng-show="arePiwikProAdsEnabled" rel="noreferrer" target="_blank" href="https://piwik.pro/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Piwik_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>. + <span ng-show="areAdsForProfessionalServicesEnabled"> – </span> + <a ng-show="areAdsForProfessionalServicesEnabled" rel="noreferrer" target="_blank" href="https://piwik.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Piwik_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>. </div> </td> </tr> diff --git a/plugins/MultiSites/lang/tr.json b/plugins/MultiSites/lang/tr.json new file mode 100644 index 0000000000..a91f1ebf19 --- /dev/null +++ b/plugins/MultiSites/lang/tr.json @@ -0,0 +1,9 @@ +{ + "MultiSites": { + "Evolution": "Gelişme", + "LoadingWebsites": "Web siteleri yükleniyor", + "PluginDescription": "Tüm web sitesi ve uygulamalarınızı kullanışlı 'Tüm Web Siteleri' panosu ile görüp karşılaştırabilirsiniz.", + "TopLinkTooltip": "Tüm web sitelerinizin istatistiklerini karşılaştırın.", + "Pagination": "%1$s - %2$s of %3$s" + } +}
\ No newline at end of file diff --git a/plugins/MultiSites/lang/uk.json b/plugins/MultiSites/lang/uk.json index b6f687fd7c..e034de8c70 100644 --- a/plugins/MultiSites/lang/uk.json +++ b/plugins/MultiSites/lang/uk.json @@ -1,5 +1,9 @@ { "MultiSites": { - "Evolution": "Зміна" + "Evolution": "Еволюція", + "LoadingWebsites": "Завантаження сайтів", + "PluginDescription": "Подивитися і порівняти всі ваші веб-сайти і додатки в цій корисній 'Усі сайти' панелі приладів.", + "TopLinkTooltip": "Порівняйте веб-аналітику для всіх ваших сайтів.", + "Pagination": "%1$s - %2$s з %3$s" } }
\ No newline at end of file diff --git a/plugins/MultiSites/plugin.json b/plugins/MultiSites/plugin.json deleted file mode 100644 index 1bf22b2dbd..0000000000 --- a/plugins/MultiSites/plugin.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "authors": [ - { - "name": "Piwik PRO", - "homepage": "http://piwik.pro" - } - ] -}
\ No newline at end of file diff --git a/plugins/MultiSites/tests/Integration/MultiSitesTest.php b/plugins/MultiSites/tests/Integration/MultiSitesTest.php index 8b6d7924a7..b027bef0b7 100644 --- a/plugins/MultiSites/tests/Integration/MultiSitesTest.php +++ b/plugins/MultiSites/tests/Integration/MultiSitesTest.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\MultiSites\tests\Integration; use Piwik\Access; +use Piwik\FrontController; use Piwik\Plugins\MultiSites\API as APIMultiSites; use Piwik\Plugins\SitesManager\API as APISitesManager; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; @@ -49,4 +50,28 @@ class MultiSitesTest extends IntegrationTestCase // safety net $this->assertEquals(0, $dataTable->getFirstRow()->getColumn('nb_visits')); } + + /** + * Testing that getOne does not error out when format=rss, #10407 + * + * @group Plugins + */ + public function testWhenRssFormatGetOneDoesNotError() + { + $_GET = array( + 'method' => 'MultiSites.getOne', + 'idSite' => $this->idSiteAccess, + 'period' => 'month', + 'date' => 'last10', + 'format' => 'rss' + ); + + $output = FrontController::getInstance()->fetchDispatch('API'); + + $this->assertContains('<item>', $output); + $this->assertContains('</rss>', $output); + $this->assertNotContains('error', $output); + + $_GET = array(); + } } |