Merge pull request #6059 from piwik/5863_languageFilesInPlugin

fixes #5863 Move translations from core to plugins and cache all plugin translations for better performance

7 files changed, 52 insertions, 38 deletions

diff --git a/tests/PHPUnit/Core/Columns/DimensionTest.php b/tests/PHPUnit/Core/Columns/DimensionTest.php
index c9764fd1df..df694ee030 100644
--- a/tests/PHPUnit/Core/Columns/DimensionTest.php
+++ b/tests/PHPUnit/Core/Columns/DimensionTest.php
@@ -9,8 +9,6 @@
 namespace Piwik\Plugins\Test;
 // there is a test that requires the class to be defined in a plugin
 
-use Piwik\Cache\PersistentCache;
-use Piwik\Cache\StaticCache;
 use Piwik\Columns\Dimension;
 use Piwik\Config;
 use Piwik\Plugin\Segment;
diff --git a/tests/PHPUnit/Core/Period/DayTest.php b/tests/PHPUnit/Core/Period/DayTest.php
index 8321a3bddc..eb653fcc5c 100644
--- a/tests/PHPUnit/Core/Period/DayTest.php
+++ b/tests/PHPUnit/Core/Period/DayTest.php
@@ -215,7 +215,8 @@ class Period_DayTest extends PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedShortString()
     {
-        Translate::loadEnglishTranslation();
+        $this->loadEnglishTranslation();
+
         $month = new Day(Date::factory('2024-10-09'));
         $shouldBe = 'Wed 9 Oct';
         $this->assertEquals($shouldBe, $month->getLocalizedShortString());
@@ -226,7 +227,8 @@ class Period_DayTest extends PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedLongString()
     {
-        Translate::loadEnglishTranslation();
+        $this->loadEnglishTranslation();
+
         $month = new Day(Date::factory('2024-10-09'));
         $shouldBe = 'Wednesday 9 October 2024';
         $this->assertEquals($shouldBe, $month->getLocalizedLongString());
@@ -237,9 +239,15 @@ class Period_DayTest extends PHPUnit_Framework_TestCase
      */
     public function testGetPrettyString()
     {
-        Translate::loadEnglishTranslation();
+        $this->loadEnglishTranslation();
+
         $month = new Day(Date::factory('2024-10-09'));
         $shouldBe = '2024-10-09';
         $this->assertEquals($shouldBe, $month->getPrettyString());
     }
+
+    private function loadEnglishTranslation()
+    {
+        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 b22e209725..5821aceee5 100644
--- a/tests/PHPUnit/Core/Period/MonthTest.php
+++ b/tests/PHPUnit/Core/Period/MonthTest.php
@@ -271,7 +271,8 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedShortString()
     {
-        Translate::loadEnglishTranslation();
+        $this->loadEnglishTranslation();
+
         $month = new Month(Date::factory('2024-10-09'));
         $shouldBe = 'Oct 2024';
         $this->assertEquals($shouldBe, $month->getLocalizedShortString());
@@ -282,7 +283,8 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedLongString()
     {
-        Translate::loadEnglishTranslation();
+        $this->loadEnglishTranslation();
+
         $month = new Month(Date::factory('2024-10-09'));
         $shouldBe = '2024, October';
         $this->assertEquals($shouldBe, $month->getLocalizedLongString());
@@ -293,9 +295,15 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase
      */
     public function testGetPrettyString()
     {
-        Translate::loadEnglishTranslation();
+        $this->loadEnglishTranslation();
+
         $month = new Month(Date::factory('2024-10-09'));
         $shouldBe = '2024-10';
         $this->assertEquals($shouldBe, $month->getPrettyString());
     }
+
+    private function loadEnglishTranslation()
+    {
+        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 c99abfd3ef..380c69383d 100644
--- a/tests/PHPUnit/Core/Period/RangeTest.php
+++ b/tests/PHPUnit/Core/Period/RangeTest.php
@@ -1259,7 +1259,7 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedShortString()
     {
-        Translate::loadEnglishTranslation();
+        $this->loadEnglishTranslation();
         $month = new Range('range', '2000-12-09,2001-02-01');
         $shouldBe = '9 Dec 00 - 1 Feb 01';
         $this->assertEquals($shouldBe, $month->getLocalizedShortString());
@@ -1270,7 +1270,7 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedLongString()
     {
-        Translate::loadEnglishTranslation();
+        $this->loadEnglishTranslation();
         $month = new Range('range', '2023-05-09,2023-05-21');
         $shouldBe = '8 May 23 - 21 May 23';
         $this->assertEquals($shouldBe, $month->getLocalizedLongString());
@@ -1281,7 +1281,7 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase
      */
     public function testGetPrettyString()
     {
-        Translate::loadEnglishTranslation();
+        $this->loadEnglishTranslation();
         $month = new Range('range', '2007-02-09,2007-03-15');
         $shouldBe = 'From 2007-02-09 to 2007-03-15';
         $this->assertEquals($shouldBe, $month->getPrettyString());
@@ -1309,4 +1309,9 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase
         $range = new Range($period, 'last' . $lastN);
         $this->assertEquals($expectedLastN, $range->getNumberOfSubperiods());
     }
+
+    private function loadEnglishTranslation()
+    {
+        Translate::reloadLanguage('en');
+    }
 }
diff --git a/tests/PHPUnit/Core/Period/WeekTest.php b/tests/PHPUnit/Core/Period/WeekTest.php
index e0d1ae7dc7..2994f8e13d 100644
--- a/tests/PHPUnit/Core/Period/WeekTest.php
+++ b/tests/PHPUnit/Core/Period/WeekTest.php
@@ -123,7 +123,7 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedShortString()
     {
-        Translate::loadEnglishTranslation();
+        $this->loadEnglishTranslation();
         $week = new Week(Date::factory('2024-10-09'));
         $shouldBe = '7 Oct - 13 Oct 24';
         $this->assertEquals($shouldBe, $week->getLocalizedShortString());
@@ -134,7 +134,7 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase
      */
     public function testGetLocalizedLongString()
     {
-        Translate::loadEnglishTranslation();
+        $this->loadEnglishTranslation();
         $week = new Week(Date::factory('2024-10-09'));
         $shouldBe = 'Week 7 October - 13 October 2024';
         $this->assertEquals($shouldBe, $week->getLocalizedLongString());
@@ -145,9 +145,14 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase
      */
     public function testGetPrettyString()
     {
-        Translate::loadEnglishTranslation();
+        $this->loadEnglishTranslation();
         $week = new Week(Date::factory('2024-10-09'));
         $shouldBe = 'From 2024-10-07 to 2024-10-13';
         $this->assertEquals($shouldBe, $week->getPrettyString());
     }
+
+    private function loadEnglishTranslation()
+    {
+        Translate::reloadLanguage('en');
+    }
 }
diff --git a/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php b/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php
index 63efd407ce..3cde1e42c8 100644
--- a/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php
+++ b/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php
@@ -51,74 +51,66 @@ class CoreTranslationsTest extends PHPUnit_Framework_TestCase
                         'bla' => 'test text'
                     )
                 ),
-                CoreTranslations::ERRORSTATE_MINIMUMTRANSLATIONS
-            ),
-            array(
-                array(
-                    'General' => array_merge(array_fill(0, 251, 'test'), array(
-                        'bla' => 'test text'
-                    ))
-                ),
                 CoreTranslations::ERRORSTATE_LOCALEREQUIRED
             ),
             array(
                 array(
-                    'General' => array_merge(array_fill(0, 251, 'test'), array(
+                    'General' => array(
                         'Locale' => 'de_DE.UTF-8'
-                    ))
+                    )
                 ),
                 CoreTranslations::ERRORSTATE_TRANSLATORINFOREQUIRED
             ),
             array(
                 array(
-                    'General' => array_merge(array_fill(0, 251, 'test'), array(
+                    'General' => array(
                         'Locale' => 'de_DE.UTF-8',
                         'TranslatorName' => 'name',
-                    ))
+                    )
                 ),
                 CoreTranslations::ERRORSTATE_TRANSLATOREMAILREQUIRED
             ),
             array(
                 array(
-                    'General' => array_merge(array_fill(0, 251, 'test'), array(
+                    'General' => array(
                         'Locale' => 'de_DE.UTF-8',
                         'TranslatorName' => 'name',
                         'TranslatorEmail' => 'emails',
                         'LayoutDirection' => 'afd'
-                    ))
+                    )
                 ),
                 CoreTranslations::ERRORSTATE_LAYOUTDIRECTIONINVALID
             ),
             array(
                 array(
-                    'General' => array_merge(array_fill(0, 251, 'test'), array(
+                    'General' => array(
                         'Locale' => 'invalid',
                         'TranslatorName' => 'name',
                         'TranslatorEmail' => 'emails',
                         'LayoutDirection' => 'ltr'
-                    ))
+                    )
                 ),
                 CoreTranslations::ERRORSTATE_LOCALEINVALID
             ),
             array(
                 array(
-                    'General' => array_merge(array_fill(0, 251, 'test'), array(
+                    'General' => array(
                         'Locale' => 'xx_DE.UTF-8',
                         'TranslatorName' => 'name',
                         'TranslatorEmail' => 'emails',
                         'LayoutDirection' => 'ltr'
-                    ))
+                    )
                 ),
                 CoreTranslations::ERRORSTATE_LOCALEINVALIDLANGUAGE
             ),
             array(
                 array(
-                    'General' => array_merge(array_fill(0, 251, 'test'), array(
+                    'General' => array(
                         'Locale' => 'de_XX.UTF-8',
                         'TranslatorName' => 'name',
                         'TranslatorEmail' => 'emails',
                         'LayoutDirection' => 'ltr'
-                    ))
+                    )
                 ),
                 CoreTranslations::ERRORSTATE_LOCALEINVALIDCOUNTRY
             ),
diff --git a/tests/PHPUnit/Core/Translate/WriterTest.php b/tests/PHPUnit/Core/Translate/WriterTest.php
index c62ca6cb35..500009941a 100644
--- a/tests/PHPUnit/Core/Translate/WriterTest.php
+++ b/tests/PHPUnit/Core/Translate/WriterTest.php
@@ -102,7 +102,6 @@ class WriterTest extends PHPUnit_Framework_TestCase
     {
         $translations = json_decode(file_get_contents(PIWIK_INCLUDE_PATH.'/lang/de.json'), true);
         return array(
-            array(array('test' => array('test' => 'test')), CoreTranslations::ERRORSTATE_MINIMUMTRANSLATIONS),
             array(array('General' => array('Locale' => '')) + $translations, CoreTranslations::ERRORSTATE_LOCALEREQUIRED),
             array(array('General' => array('Locale' => 'de_DE.UTF-8')) + $translations, CoreTranslations::ERRORSTATE_TRANSLATORINFOREQUIRED),
             array(array('General' => array('Locale' => 'de_DE.UTF-8',
@@ -155,8 +154,7 @@ class WriterTest extends PHPUnit_Framework_TestCase
 
         $translationsToWrite = array();
         $translationsToWrite['General'] = $translations['General'];
-        $translationsToWrite['UserSettings'] = $translations['UserSettings'];
-        $translationsToWrite['UserCountry'] = $translations['UserCountry'];
+        $translationsToWrite['Mobile'] = $translations['Mobile'];
 
         $translationsToWrite['General']['Yes'] = 'string with %1$s';
         $translationsToWrite['Plugin'] = array(
@@ -175,7 +173,7 @@ class WriterTest extends PHPUnit_Framework_TestCase
 
         @unlink(PIWIK_INCLUDE_PATH.'/tmp/fr.json');
 
-        $this->assertGreaterThan(40000, $rc);
+        $this->assertGreaterThan(25000, $rc);
 
         $this->assertCount(4, $translationWriter->getFilterMessages());
     }