diff --git a/config/global.ini.php b/config/global.ini.php index f1e6f0b2faea36a55a5aca02f7383ee6906360dc..d6f630b77e381728f48b866e75e668f9a9214483 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -307,7 +307,7 @@ enable_trusted_host_check = 1 ; The release server is an essential part of the Piwik infrastructure/ecosystem ; to provide the latest software version. -latest_version_url = http://piwik.org/latest.zip +latest_version_url = http://builds.piwik.org/latest.zip ; The API server is an essential part of the Piwik infrastructure/ecosystem to ; provide services to Piwik installations, e.g., getLatestVersion and diff --git a/lang/en.php b/lang/en.php index 37efd65a8242b108c1790fc8dd80b41c55753c12..7c9f62bb2007ad2bb65ee6ea0bedf0026c718331 100644 --- a/lang/en.php +++ b/lang/en.php @@ -470,7 +470,7 @@ $translations = array( 'CoreHome_MakeADifference' => 'Make a difference: %1$sDonate now%2$s to fund Piwik 2.0!', 'CoreHome_DonateCall1' => 'Piwik will always cost you nothing to use, but that doesn\'t mean it costs us nothing to make.', 'CoreHome_DonateCall2' => 'Piwik needs your continued support to grow and thrive.', - 'CoreHome_DonateCall3' => 'If you feel that Piwik has added significant value to your business or endeavour, %1$splease consider donating%2$s', + 'CoreHome_DonateCall3' => 'If you feel that Piwik has added significant value to your business or endeavour, %1$splease consider donating!%2$s', 'CoreHome_HowMuchIsPiwikWorth' => 'How much is Piwik worth to you?', 'CoreHome_SupportPiwik' => 'Support Piwik!', 'CoreHome_OnlyForAdmin' => 'This is only displayed to you, the superuser.', @@ -780,7 +780,7 @@ $translations = array( 'Feedback_ExceptionBodyLength' => 'Message must be at least %s characters long.', 'Feedback_ExceptionNoUrls' => 'The message cannot contain a URL, to avoid spam messages.', 'Feedback_TopLinkTooltip' => 'Tell us what you think, or request Professional Support.', - 'Feedback_WantToThankConsiderDonating' => 'Do you think Piwik is awesome and want to thank us? Consider donating:', + 'Feedback_WantToThankConsiderDonating' => 'Do you think Piwik is awesome and want to thank us? Consider donating', 'Goals_Goals' => 'Goals', 'Goals_EcommerceAndGoalsMenu' => 'Ecommerce & Goals', 'Goals_Ecommerce' => 'Ecommerce', diff --git a/plugins/CoreHome/templates/donate.tpl b/plugins/CoreHome/templates/donate.tpl index 87477bf12593e372c0a028d147aca838b73f1146..9356f278b0a9f0431ce52742ba753908e6d65547 100755 --- a/plugins/CoreHome/templates/donate.tpl +++ b/plugins/CoreHome/templates/donate.tpl @@ -5,7 +5,7 @@ {else} <p>{'CoreHome_DonateCall1'|translate}</p> <p><strong><em>{'CoreHome_DonateCall2'|translate}</em></strong></p> - <p>{'CoreHome_DonateCall3'|translate:'<em><strong>':'</strong></em>'}:</p> + <p>{'CoreHome_DonateCall3'|translate:'<em><strong>':'</strong></em>'}</p> {/if} </div> diff --git a/tests/PHPUnit/Core/HttpTest.php b/tests/PHPUnit/Core/HttpTest.php index d5977f51536b8a8ddfe79dc789c9d9513a7e86fe..f90f58df277c982028e9e81e37a72143f89f9ffe 100644 --- a/tests/PHPUnit/Core/HttpTest.php +++ b/tests/PHPUnit/Core/HttpTest.php @@ -51,7 +51,7 @@ class HttpTest extends PHPUnit_Framework_TestCase public function testFetchLatestZip() { $destinationPath = PIWIK_USER_PATH . '/tmp/latest/latest.zip'; - Piwik_Http::fetchRemoteFile('http://piwik.org/latest.zip', $destinationPath, 3); + Piwik_Http::fetchRemoteFile('http://builds.piwik.org/latest.zip', $destinationPath, 3); $this->assertFileExists($destinationPath); $this->assertGreaterThan( 0, filesize($destinationPath) ); } diff --git a/tests/webtest/testcases/modules/macros.xml b/tests/webtest/testcases/modules/macros.xml index 8f3f4715773243edd6eb298ca3d71069ee45bc7b..88c60af20e6b1bc63eb596ab2e29863eaa1b7cd6 100644 --- a/tests/webtest/testcases/modules/macros.xml +++ b/tests/webtest/testcases/modules/macros.xml @@ -67,7 +67,7 @@ <replace file="${env.WORKSPACE}/build/config/global.ini.php"> <replacefilter - token="latest_version_url = http://piwik.org/latest.zip" + token="latest_version_url = http://builds.piwik.org/latest.zip" value="latest_version_url = http://${env.HTTP_HOST}/jenkins.private/jobs/Piwik/workspace/latest.zip" /> <replacefilter token="api_service_url = http://api.piwik.org"