diff --git a/core/TranslationWriter.php b/core/TranslationWriter.php index f7f8dfa1c0f829606dfd1aaf640ad695404de045..bf468cdbfaaa648b7dee2d65e65b3af78496c487 100644 --- a/core/TranslationWriter.php +++ b/core/TranslationWriter.php @@ -107,7 +107,10 @@ class TranslationWriter } } - return json_encode($cleanedTranslations, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT); + /* + * ToDo: Use JSON_UNESCAPED_UNICODE and JSON_PRETTY_PRINT for PHP >= 5.4 + */ + return json_encode($cleanedTranslations); } /** diff --git a/tests/PHPUnit/Core/TranslationWriterTest.php b/tests/PHPUnit/Core/TranslationWriterTest.php index 7a1dd2b0144d13dd5dcc90a9cf8d6a090eb9bd24..cb1d458aec778cdfcbf2ad3d1b9f2ac53b095a2c 100644 --- a/tests/PHPUnit/Core/TranslationWriterTest.php +++ b/tests/PHPUnit/Core/TranslationWriterTest.php @@ -179,17 +179,7 @@ class TranslationWriterTest extends PHPUnit_Framework_TestCase $this->assertNotEquals(false, $rc); $contents = file_get_contents($path); - $expected = <<<'EOD' -{ - "General": { - "Locale": "en_CA.UTF-8", - "Id": "Id" - }, - "Goals": { - "Goals": "Goals" - } -} -EOD; + $expected = '{"General":{"Locale":"en_CA.UTF-8","Id":"Id"},"Goals":{"Goals":"Goals"},"Plugin":{"Body":"Message\nBody"}}'; if (Common::isWindows()) $expected = str_replace("\r\n", "\n", $expected); $this->assertEquals($expected, $contents);