From 46db2355d4706b75dcfa0a6d900be2e7c31f0716 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 30 Dec 2014 17:54:01 +1300
Subject: [PATCH] Moved `Piwik\Translate\Writer` and its subclasses to the
LanguagesManager plugin
These classes are only used in that plugin, so it doesn't make sense to keep then in Core.
---
.../Commands/FetchFromOTrance.php | 4 ++++
.../Commands/SetTranslations.php | 20 +++++++++----------
plugins/LanguagesManager/Commands/Update.php | 4 ++++
.../Integration/LanguagesManagerTest.php | 19 ++++++++++--------
.../Filter/ByBaseTranslationsTest.php | 6 +++---
.../Filter/ByParameterCountTest.php | 6 +++---
.../Filter/EmptyTranslationsTest.php | 6 +++---
.../Filter/EncodedEntitiesTest.php | 6 +++---
.../Filter/UnnecassaryWhitespacesTest.php | 6 +++---
.../Validate/CoreTranslationsTest.php | 6 +++---
.../Validate/NoScriptsTest.php | 6 +++---
.../Unit/TranslationWriter}/WriterTest.php | 16 +++++++--------
.../Filter/ByBaseTranslations.php | 4 +---
.../Filter/ByParameterCount.php | 4 +---
.../Filter/EmptyTranslations.php | 4 +---
.../Filter/EncodedEntities.php | 4 +---
.../Filter/FilterAbstract.php | 4 +---
.../Filter/UnnecassaryWhitespaces.php | 4 +---
.../Validate/CoreTranslations.php | 4 +---
.../TranslationWriter}/Validate/NoScripts.php | 4 +---
.../Validate/ValidateAbstract.php | 4 +---
.../TranslationWriter}/Writer.php | 14 ++++++-------
22 files changed, 73 insertions(+), 82 deletions(-)
rename plugins/LanguagesManager/{tests => Test}/Integration/LanguagesManagerTest.php (90%)
rename {tests/PHPUnit/Unit/Translate => plugins/LanguagesManager/Test/Unit/TranslationWriter}/Filter/ByBaseTranslationsTest.php (95%)
rename {tests/PHPUnit/Unit/Translate => plugins/LanguagesManager/Test/Unit/TranslationWriter}/Filter/ByParameterCountTest.php (94%)
rename {tests/PHPUnit/Unit/Translate => plugins/LanguagesManager/Test/Unit/TranslationWriter}/Filter/EmptyTranslationsTest.php (93%)
rename {tests/PHPUnit/Unit/Translate => plugins/LanguagesManager/Test/Unit/TranslationWriter}/Filter/EncodedEntitiesTest.php (94%)
rename {tests/PHPUnit/Unit/Translate => plugins/LanguagesManager/Test/Unit/TranslationWriter}/Filter/UnnecassaryWhitespacesTest.php (95%)
rename {tests/PHPUnit/Unit/Translate => plugins/LanguagesManager/Test/Unit/TranslationWriter}/Validate/CoreTranslationsTest.php (95%)
rename {tests/PHPUnit/Unit/Translate => plugins/LanguagesManager/Test/Unit/TranslationWriter}/Validate/NoScriptsTest.php (93%)
rename {tests/PHPUnit/Unit/Translate => plugins/LanguagesManager/Test/Unit/TranslationWriter}/WriterTest.php (93%)
rename {core/Translate => plugins/LanguagesManager/TranslationWriter}/Filter/ByBaseTranslations.php (96%)
rename {core/Translate => plugins/LanguagesManager/TranslationWriter}/Filter/ByParameterCount.php (97%)
rename {core/Translate => plugins/LanguagesManager/TranslationWriter}/Filter/EmptyTranslations.php (94%)
rename {core/Translate => plugins/LanguagesManager/TranslationWriter}/Filter/EncodedEntities.php (93%)
rename {core/Translate => plugins/LanguagesManager/TranslationWriter}/Filter/FilterAbstract.php (90%)
rename {core/Translate => plugins/LanguagesManager/TranslationWriter}/Filter/UnnecassaryWhitespaces.php (97%)
rename {core/Translate => plugins/LanguagesManager/TranslationWriter}/Validate/CoreTranslations.php (97%)
rename {core/Translate => plugins/LanguagesManager/TranslationWriter}/Validate/NoScripts.php (93%)
rename {core/Translate => plugins/LanguagesManager/TranslationWriter}/Validate/ValidateAbstract.php (90%)
rename {core/Translate => plugins/LanguagesManager/TranslationWriter}/Writer.php (96%)
diff --git a/plugins/LanguagesManager/Commands/FetchFromOTrance.php b/plugins/LanguagesManager/Commands/FetchFromOTrance.php
index a28f62df23..ae130b0bc6 100644
--- a/plugins/LanguagesManager/Commands/FetchFromOTrance.php
+++ b/plugins/LanguagesManager/Commands/FetchFromOTrance.php
@@ -11,6 +11,8 @@ namespace Piwik\Plugins\LanguagesManager\Commands;
use Piwik\Container\StaticContainer;
use Piwik\Unzip;
+use Symfony\Component\Console\Helper\DialogHelper;
+use Symfony\Component\Console\Helper\ProgressHelper;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
@@ -36,6 +38,7 @@ class FetchFromOTrance extends TranslationBase
{
$output->writeln("Starting to fetch latest language pack");
+ /** @var DialogHelper $dialog */
$dialog = $this->getHelperSet()->get('dialog');
$cookieFile = self::getDownloadPath() . DIRECTORY_SEPARATOR . 'cookie.txt';
@@ -139,6 +142,7 @@ class FetchFromOTrance extends TranslationBase
$output->writeln("Converting downloaded php files to json");
+ /** @var ProgressHelper $progress */
$progress = $this->getHelperSet()->get('progress');
$progress->start($output, count($filesToConvert));
diff --git a/plugins/LanguagesManager/Commands/SetTranslations.php b/plugins/LanguagesManager/Commands/SetTranslations.php
index 89a4994670..ef4ebdc22a 100644
--- a/plugins/LanguagesManager/Commands/SetTranslations.php
+++ b/plugins/LanguagesManager/Commands/SetTranslations.php
@@ -10,20 +10,19 @@
namespace Piwik\Plugins\LanguagesManager\Commands;
use Piwik\Plugins\LanguagesManager\API;
-use Piwik\Translate\Filter\ByBaseTranslations;
-use Piwik\Translate\Filter\ByParameterCount;
-use Piwik\Translate\Filter\EmptyTranslations;
-use Piwik\Translate\Filter\EncodedEntities;
-use Piwik\Translate\Filter\UnnecassaryWhitespaces;
-use Piwik\Translate\Validate\CoreTranslations;
-use Piwik\Translate\Validate\NoScripts;
-use Piwik\Translate\Writer;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByBaseTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByParameterCount;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\EmptyTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\EncodedEntities;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\UnnecassaryWhitespaces;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\CoreTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\NoScripts;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Writer;
+use Symfony\Component\Console\Helper\DialogHelper;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
-/**
- */
class SetTranslations extends TranslationBase
{
protected function configure()
@@ -37,6 +36,7 @@ class SetTranslations extends TranslationBase
protected function execute(InputInterface $input, OutputInterface $output)
{
+ /** @var DialogHelper $dialog */
$dialog = $this->getHelperSet()->get('dialog');
$languageCode = $input->getOption('code');
diff --git a/plugins/LanguagesManager/Commands/Update.php b/plugins/LanguagesManager/Commands/Update.php
index 7014ab7241..4d0c28bd76 100644
--- a/plugins/LanguagesManager/Commands/Update.php
+++ b/plugins/LanguagesManager/Commands/Update.php
@@ -10,6 +10,8 @@
namespace Piwik\Plugins\LanguagesManager\Commands;
use Piwik\Plugins\LanguagesManager\API;
+use Symfony\Component\Console\Helper\DialogHelper;
+use Symfony\Component\Console\Helper\ProgressHelper;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
@@ -31,6 +33,7 @@ class Update extends TranslationBase
protected function execute(InputInterface $input, OutputInterface $output)
{
+ /** @var DialogHelper $dialog */
$dialog = $this->getHelperSet()->get('dialog');
$command = $this->getApplication()->find('translations:fetch');
@@ -60,6 +63,7 @@ class Update extends TranslationBase
$output->writeln("(!) Non interactive mode: New languages will be skipped");
}
+ /** @var ProgressHelper $progress */
$progress = $this->getHelperSet()->get('progress');
$progress->start($output, count($files));
diff --git a/plugins/LanguagesManager/tests/Integration/LanguagesManagerTest.php b/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php
similarity index 90%
rename from plugins/LanguagesManager/tests/Integration/LanguagesManagerTest.php
rename to plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php
index 7b41c3f55e..4ea84a0362 100755
--- a/plugins/LanguagesManager/tests/Integration/LanguagesManagerTest.php
+++ b/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php
@@ -6,21 +6,24 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-namespace Piwik\Plugins\LanguagesManager\tests;
+namespace Piwik\Plugins\LanguagesManager\Test\Integration;
use Piwik\Common;
use Piwik\Plugins\LanguagesManager\API;
-use Piwik\Translate\Filter\ByParameterCount;
-use Piwik\Translate\Filter\EmptyTranslations;
-use Piwik\Translate\Filter\EncodedEntities;
-use Piwik\Translate\Filter\UnnecassaryWhitespaces;
-use Piwik\Translate\Validate\CoreTranslations;
-use Piwik\Translate\Validate\NoScripts;
-use Piwik\Translate\Writer;
use \Exception;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByParameterCount;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\EmptyTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\EncodedEntities;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\UnnecassaryWhitespaces;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\CoreTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\NoScripts;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Writer;
require_once PIWIK_INCLUDE_PATH . '/plugins/LanguagesManager/API.php';
+/**
+ * @group LanguagesManager
+ */
class LanguagesManagerTest extends \PHPUnit_Framework_TestCase
{
public function setUp()
diff --git a/tests/PHPUnit/Unit/Translate/Filter/ByBaseTranslationsTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/ByBaseTranslationsTest.php
similarity index 95%
rename from tests/PHPUnit/Unit/Translate/Filter/ByBaseTranslationsTest.php
rename to plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/ByBaseTranslationsTest.php
index adf3035a7b..aba41991b6 100644
--- a/tests/PHPUnit/Unit/Translate/Filter/ByBaseTranslationsTest.php
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/ByBaseTranslationsTest.php
@@ -6,12 +6,12 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-namespace Piwik\Tests\Unit\Translate\Filter;
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Filter;
-use Piwik\Translate\Filter\ByBaseTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByBaseTranslations;
/**
- * @group Translation
+ * @group LanguagesManager
*/
class ByBaseTranslationsTest extends \PHPUnit_Framework_TestCase
{
diff --git a/tests/PHPUnit/Unit/Translate/Filter/ByParameterCountTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/ByParameterCountTest.php
similarity index 94%
rename from tests/PHPUnit/Unit/Translate/Filter/ByParameterCountTest.php
rename to plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/ByParameterCountTest.php
index 3d35a5e2f5..f8b57e9106 100644
--- a/tests/PHPUnit/Unit/Translate/Filter/ByParameterCountTest.php
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/ByParameterCountTest.php
@@ -6,12 +6,12 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-namespace Piwik\Tests\Unit\Translate\Filter;
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Filter;
-use Piwik\Translate\Filter\ByParameterCount;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByParameterCount;
/**
- * @group Translation
+ * @group LanguagesManager
*/
class ByParameterCountTest extends \PHPUnit_Framework_TestCase
{
diff --git a/tests/PHPUnit/Unit/Translate/Filter/EmptyTranslationsTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/EmptyTranslationsTest.php
similarity index 93%
rename from tests/PHPUnit/Unit/Translate/Filter/EmptyTranslationsTest.php
rename to plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/EmptyTranslationsTest.php
index 7ac00dfde8..da250c0d79 100644
--- a/tests/PHPUnit/Unit/Translate/Filter/EmptyTranslationsTest.php
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/EmptyTranslationsTest.php
@@ -6,12 +6,12 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-namespace Piwik\Tests\Unit\Translate\Filter;
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Filter;
-use Piwik\Translate\Filter\EmptyTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\EmptyTranslations;
/**
- * @group Translation
+ * @group LanguagesManager
*/
class EmptyTranslationsTest extends \PHPUnit_Framework_TestCase
{
diff --git a/tests/PHPUnit/Unit/Translate/Filter/EncodedEntitiesTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/EncodedEntitiesTest.php
similarity index 94%
rename from tests/PHPUnit/Unit/Translate/Filter/EncodedEntitiesTest.php
rename to plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/EncodedEntitiesTest.php
index cccd19c811..9411a65124 100644
--- a/tests/PHPUnit/Unit/Translate/Filter/EncodedEntitiesTest.php
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/EncodedEntitiesTest.php
@@ -6,12 +6,12 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-namespace Piwik\Tests\Unit\Translate\Filter;
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Filter;
-use Piwik\Translate\Filter\EncodedEntities;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\EncodedEntities;
/**
- * @group Translation
+ * @group LanguagesManager
*/
class EncodedEntitiesTest extends \PHPUnit_Framework_TestCase
{
diff --git a/tests/PHPUnit/Unit/Translate/Filter/UnnecassaryWhitespacesTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/UnnecassaryWhitespacesTest.php
similarity index 95%
rename from tests/PHPUnit/Unit/Translate/Filter/UnnecassaryWhitespacesTest.php
rename to plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/UnnecassaryWhitespacesTest.php
index dba819e7ab..701df50144 100644
--- a/tests/PHPUnit/Unit/Translate/Filter/UnnecassaryWhitespacesTest.php
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Filter/UnnecassaryWhitespacesTest.php
@@ -6,12 +6,12 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-namespace Piwik\Tests\Unit\Translate\Filter;
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Filter;
-use Piwik\Translate\Filter\UnnecassaryWhitespaces;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\UnnecassaryWhitespaces;
/**
- * @group Translation
+ * @group LanguagesManager
*/
class UnnecassaryWhitepsacesTest extends \PHPUnit_Framework_TestCase
{
diff --git a/tests/PHPUnit/Unit/Translate/Validate/CoreTranslationsTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/CoreTranslationsTest.php
similarity index 95%
rename from tests/PHPUnit/Unit/Translate/Validate/CoreTranslationsTest.php
rename to plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/CoreTranslationsTest.php
index c5c7477278..2a82991fcd 100644
--- a/tests/PHPUnit/Unit/Translate/Validate/CoreTranslationsTest.php
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/CoreTranslationsTest.php
@@ -6,12 +6,12 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-namespace Piwik\Tests\Unit\Translate\Validate;
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Validate;
-use Piwik\Translate\Validate\CoreTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\CoreTranslations;
/**
- * @group Translation
+ * @group LanguagesManager
*/
class CoreTranslationsTest extends \PHPUnit_Framework_TestCase
{
diff --git a/tests/PHPUnit/Unit/Translate/Validate/NoScriptsTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/NoScriptsTest.php
similarity index 93%
rename from tests/PHPUnit/Unit/Translate/Validate/NoScriptsTest.php
rename to plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/NoScriptsTest.php
index fc221b1eef..fcf5201d76 100644
--- a/tests/PHPUnit/Unit/Translate/Validate/NoScriptsTest.php
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/Validate/NoScriptsTest.php
@@ -6,12 +6,12 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-namespace Piwik\Tests\Unit\Translate\Validate;
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter\Validate;
-use Piwik\Translate\Validate\NoScripts;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\NoScripts;
/**
- * @group Translation
+ * @group LanguagesManager
*/
class NoScriptsTest extends \PHPUnit_Framework_TestCase
{
diff --git a/tests/PHPUnit/Unit/Translate/WriterTest.php b/plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php
similarity index 93%
rename from tests/PHPUnit/Unit/Translate/WriterTest.php
rename to plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php
index d393d3f700..41b754f55b 100644
--- a/tests/PHPUnit/Unit/Translate/WriterTest.php
+++ b/plugins/LanguagesManager/Test/Unit/TranslationWriter/WriterTest.php
@@ -6,18 +6,18 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-namespace Piwik\Tests\Unit\Translate;
+namespace Piwik\Plugins\LanguagesManager\Test\Unit\TranslationWriter;
use Piwik\Container\StaticContainer;
-use Piwik\Translate\Filter\ByBaseTranslations;
-use Piwik\Translate\Filter\ByParameterCount;
-use Piwik\Translate\Filter\UnnecassaryWhitespaces;
-use Piwik\Translate\Validate\CoreTranslations;
-use Piwik\Translate\Validate\NoScripts;
-use Piwik\Translate\Writer;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByBaseTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\ByParameterCount;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\UnnecassaryWhitespaces;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\CoreTranslations;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\NoScripts;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Writer;
/**
- * @group Translation
+ * @group LanguagesManager
*/
class WriterTest extends \PHPUnit_Framework_TestCase
{
diff --git a/core/Translate/Filter/ByBaseTranslations.php b/plugins/LanguagesManager/TranslationWriter/Filter/ByBaseTranslations.php
similarity index 96%
rename from core/Translate/Filter/ByBaseTranslations.php
rename to plugins/LanguagesManager/TranslationWriter/Filter/ByBaseTranslations.php
index 8a2e095d95..1504f49e0d 100644
--- a/core/Translate/Filter/ByBaseTranslations.php
+++ b/plugins/LanguagesManager/TranslationWriter/Filter/ByBaseTranslations.php
@@ -7,10 +7,8 @@
*
*/
-namespace Piwik\Translate\Filter;
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Filter;
-/**
- */
class ByBaseTranslations extends FilterAbstract
{
protected $baseTranslations = array();
diff --git a/core/Translate/Filter/ByParameterCount.php b/plugins/LanguagesManager/TranslationWriter/Filter/ByParameterCount.php
similarity index 97%
rename from core/Translate/Filter/ByParameterCount.php
rename to plugins/LanguagesManager/TranslationWriter/Filter/ByParameterCount.php
index 357ab5ba33..0d8a3cd482 100644
--- a/core/Translate/Filter/ByParameterCount.php
+++ b/plugins/LanguagesManager/TranslationWriter/Filter/ByParameterCount.php
@@ -7,10 +7,8 @@
*
*/
-namespace Piwik\Translate\Filter;
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Filter;
-/**
- */
class ByParameterCount extends FilterAbstract
{
protected $baseTranslations = array();
diff --git a/core/Translate/Filter/EmptyTranslations.php b/plugins/LanguagesManager/TranslationWriter/Filter/EmptyTranslations.php
similarity index 94%
rename from core/Translate/Filter/EmptyTranslations.php
rename to plugins/LanguagesManager/TranslationWriter/Filter/EmptyTranslations.php
index 75e3e6536f..15e17b2cc9 100644
--- a/core/Translate/Filter/EmptyTranslations.php
+++ b/plugins/LanguagesManager/TranslationWriter/Filter/EmptyTranslations.php
@@ -7,10 +7,8 @@
*
*/
-namespace Piwik\Translate\Filter;
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Filter;
-/**
- */
class EmptyTranslations extends FilterAbstract
{
/**
diff --git a/core/Translate/Filter/EncodedEntities.php b/plugins/LanguagesManager/TranslationWriter/Filter/EncodedEntities.php
similarity index 93%
rename from core/Translate/Filter/EncodedEntities.php
rename to plugins/LanguagesManager/TranslationWriter/Filter/EncodedEntities.php
index b7e3d6a54e..492ad6953a 100644
--- a/core/Translate/Filter/EncodedEntities.php
+++ b/plugins/LanguagesManager/TranslationWriter/Filter/EncodedEntities.php
@@ -7,12 +7,10 @@
*
*/
-namespace Piwik\Translate\Filter;
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Filter;
use Piwik\Translate;
-/**
- */
class EncodedEntities extends FilterAbstract
{
/**
diff --git a/core/Translate/Filter/FilterAbstract.php b/plugins/LanguagesManager/TranslationWriter/Filter/FilterAbstract.php
similarity index 90%
rename from core/Translate/Filter/FilterAbstract.php
rename to plugins/LanguagesManager/TranslationWriter/Filter/FilterAbstract.php
index 4e7ecc064d..0f157fa5cc 100644
--- a/core/Translate/Filter/FilterAbstract.php
+++ b/plugins/LanguagesManager/TranslationWriter/Filter/FilterAbstract.php
@@ -7,10 +7,8 @@
*
*/
-namespace Piwik\Translate\Filter;
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Filter;
-/**
- */
abstract class FilterAbstract
{
protected $filteredData = array();
diff --git a/core/Translate/Filter/UnnecassaryWhitespaces.php b/plugins/LanguagesManager/TranslationWriter/Filter/UnnecassaryWhitespaces.php
similarity index 97%
rename from core/Translate/Filter/UnnecassaryWhitespaces.php
rename to plugins/LanguagesManager/TranslationWriter/Filter/UnnecassaryWhitespaces.php
index 61211fc8ab..ce665b165a 100644
--- a/core/Translate/Filter/UnnecassaryWhitespaces.php
+++ b/plugins/LanguagesManager/TranslationWriter/Filter/UnnecassaryWhitespaces.php
@@ -7,10 +7,8 @@
*
*/
-namespace Piwik\Translate\Filter;
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Filter;
-/**
- */
class UnnecassaryWhitespaces extends FilterAbstract
{
protected $baseTranslations = array();
diff --git a/core/Translate/Validate/CoreTranslations.php b/plugins/LanguagesManager/TranslationWriter/Validate/CoreTranslations.php
similarity index 97%
rename from core/Translate/Validate/CoreTranslations.php
rename to plugins/LanguagesManager/TranslationWriter/Validate/CoreTranslations.php
index bb52dc1ec8..eb888bf434 100644
--- a/core/Translate/Validate/CoreTranslations.php
+++ b/plugins/LanguagesManager/TranslationWriter/Validate/CoreTranslations.php
@@ -7,12 +7,10 @@
*
*/
-namespace Piwik\Translate\Validate;
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Validate;
use Piwik\Common;
-/**
- */
class CoreTranslations extends ValidateAbstract
{
/**
diff --git a/core/Translate/Validate/NoScripts.php b/plugins/LanguagesManager/TranslationWriter/Validate/NoScripts.php
similarity index 93%
rename from core/Translate/Validate/NoScripts.php
rename to plugins/LanguagesManager/TranslationWriter/Validate/NoScripts.php
index e7f032ff55..7705cd02d7 100644
--- a/core/Translate/Validate/NoScripts.php
+++ b/plugins/LanguagesManager/TranslationWriter/Validate/NoScripts.php
@@ -7,10 +7,8 @@
*
*/
-namespace Piwik\Translate\Validate;
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Validate;
-/**
- */
class NoScripts extends ValidateAbstract
{
/**
diff --git a/core/Translate/Validate/ValidateAbstract.php b/plugins/LanguagesManager/TranslationWriter/Validate/ValidateAbstract.php
similarity index 90%
rename from core/Translate/Validate/ValidateAbstract.php
rename to plugins/LanguagesManager/TranslationWriter/Validate/ValidateAbstract.php
index c732d31d25..df36123839 100644
--- a/core/Translate/Validate/ValidateAbstract.php
+++ b/plugins/LanguagesManager/TranslationWriter/Validate/ValidateAbstract.php
@@ -7,10 +7,8 @@
*
*/
-namespace Piwik\Translate\Validate;
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter\Validate;
-/**
- */
abstract class ValidateAbstract
{
protected $message = null;
diff --git a/core/Translate/Writer.php b/plugins/LanguagesManager/TranslationWriter/Writer.php
similarity index 96%
rename from core/Translate/Writer.php
rename to plugins/LanguagesManager/TranslationWriter/Writer.php
index 5ea57a7003..a4f0f06a23 100644
--- a/core/Translate/Writer.php
+++ b/plugins/LanguagesManager/TranslationWriter/Writer.php
@@ -4,21 +4,19 @@
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- *
- *
*/
-namespace Piwik\Translate;
+
+namespace Piwik\Plugins\LanguagesManager\TranslationWriter;
use Exception;
use Piwik\Container\StaticContainer;
use Piwik\Filesystem;
use Piwik\Piwik;
-use Piwik\Translate\Filter\FilterAbstract;
-use Piwik\Translate\Validate\ValidateAbstract;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Filter\FilterAbstract;
+use Piwik\Plugins\LanguagesManager\TranslationWriter\Validate\ValidateAbstract;
/**
- * Writes clean translations to file
- *
+ * Writes translations to file.
*/
class Writer
{
@@ -30,7 +28,7 @@ class Writer
protected $language = '';
/**
- * Name of a plugin (if set in contructor)
+ * Name of a plugin (if set in constructor)
*
* @var string|null
*/
--
GitLab