Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@googlemail.com>2014-08-24 23:36:31 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-08-24 23:36:31 +0400
commitabf00e3d0dc938dbd399f745bf0481baec4c96d6 (patch)
tree6248dbd564d2171cd9318b343a9ef60d6fd3ca8e /tests/PHPUnit/Core
parent156e75dc10ddc83af1cab876cde5447767144d17 (diff)
refs #5863 fix more tests including installation UI tests
Diffstat (limited to 'tests/PHPUnit/Core')
-rw-r--r--tests/PHPUnit/Core/Period/DayTest.php3
-rw-r--r--tests/PHPUnit/Core/Period/MonthTest.php3
-rw-r--r--tests/PHPUnit/Core/Period/RangeTest.php3
-rw-r--r--tests/PHPUnit/Core/Period/WeekTest.php3
4 files changed, 4 insertions, 8 deletions
diff --git a/tests/PHPUnit/Core/Period/DayTest.php b/tests/PHPUnit/Core/Period/DayTest.php
index 93e3c40c56..eb653fcc5c 100644
--- a/tests/PHPUnit/Core/Period/DayTest.php
+++ b/tests/PHPUnit/Core/Period/DayTest.php
@@ -248,7 +248,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase
private function loadEnglishTranslation()
{
- Translate::loadEnglishTranslation();
- \Piwik\Plugin\Manager::getInstance()->loadPluginTranslations('en');
+ Translate::reloadLanguage('en');
}
} \ No newline at end of file
diff --git a/tests/PHPUnit/Core/Period/MonthTest.php b/tests/PHPUnit/Core/Period/MonthTest.php
index 2b2de451e1..5821aceee5 100644
--- a/tests/PHPUnit/Core/Period/MonthTest.php
+++ b/tests/PHPUnit/Core/Period/MonthTest.php
@@ -304,7 +304,6 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase
private function loadEnglishTranslation()
{
- Translate::loadEnglishTranslation();
- \Piwik\Plugin\Manager::getInstance()->loadPluginTranslations('en');
+ Translate::reloadLanguage('en');
}
} \ No newline at end of file
diff --git a/tests/PHPUnit/Core/Period/RangeTest.php b/tests/PHPUnit/Core/Period/RangeTest.php
index 17c9cb1ab6..380c69383d 100644
--- a/tests/PHPUnit/Core/Period/RangeTest.php
+++ b/tests/PHPUnit/Core/Period/RangeTest.php
@@ -1312,7 +1312,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase
private function loadEnglishTranslation()
{
- Translate::loadEnglishTranslation();
- \Piwik\Plugin\Manager::getInstance()->loadPluginTranslations('en');
+ Translate::reloadLanguage('en');
}
}
diff --git a/tests/PHPUnit/Core/Period/WeekTest.php b/tests/PHPUnit/Core/Period/WeekTest.php
index 1fb02b434d..2994f8e13d 100644
--- a/tests/PHPUnit/Core/Period/WeekTest.php
+++ b/tests/PHPUnit/Core/Period/WeekTest.php
@@ -153,7 +153,6 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase
private function loadEnglishTranslation()
{
- Translate::loadEnglishTranslation();
- \Piwik\Plugin\Manager::getInstance()->loadPluginTranslations('en');
+ Translate::reloadLanguage('en');
}
}