From 05b1901fcdbb051077d12f776980484d3b782970 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <aledeg@users.noreply.github.com>
Date: Sat, 4 Nov 2017 21:17:08 +0100
Subject: [PATCH] Move translation tools into the cli folder (#1673)

Translation tools must be used on cli. It is better to have them in the cli folder.
---
 .travis.yml                                     |  2 +-
 {tools => cli}/check.translation.php            | 12 ++++++------
 {tools => cli/i18n}/I18nCompletionValidator.php |  0
 {tools => cli/i18n}/I18nData.php                |  0
 {tools => cli/i18n}/I18nFile.php                |  2 +-
 {tools => cli/i18n}/I18nUsageValidator.php      |  0
 {tools => cli/i18n}/I18nValidatorInterface.php  |  0
 {tools => cli/i18n}/ignore/en.php               |  0
 {tools => cli/i18n}/ignore/fr.php               |  0
 {tools => cli}/manipulate.translation.php       |  2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename {tools => cli}/check.translation.php (86%)
 rename {tools => cli/i18n}/I18nCompletionValidator.php (100%)
 rename {tools => cli/i18n}/I18nData.php (100%)
 rename {tools => cli/i18n}/I18nFile.php (97%)
 rename {tools => cli/i18n}/I18nUsageValidator.php (100%)
 rename {tools => cli/i18n}/I18nValidatorInterface.php (100%)
 rename {tools => cli/i18n}/ignore/en.php (100%)
 rename {tools => cli/i18n}/ignore/fr.php (100%)
 rename {tools => cli}/manipulate.translation.php (96%)

diff --git a/.travis.yml b/.travis.yml
index 945e77a74..7bfefd8ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ script:
     fi
   - |
     if [[ $CHECK_TRANSLATION == yes ]]; then
-      php tools/check.translation.php -r
+      php cli/check.translation.php -r
     fi
 
 env:
diff --git a/tools/check.translation.php b/cli/check.translation.php
similarity index 86%
rename from tools/check.translation.php
rename to cli/check.translation.php
index 1a0b36129..6ebd12973 100644
--- a/tools/check.translation.php
+++ b/cli/check.translation.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once __DIR__ . '/I18nFile.php';
-require_once __DIR__ . '/I18nCompletionValidator.php';
-require_once __DIR__ . '/I18nUsageValidator.php';
+require_once __DIR__ . '/i18n/I18nFile.php';
+require_once __DIR__ . '/i18n/I18nCompletionValidator.php';
+require_once __DIR__ . '/i18n/I18nUsageValidator.php';
 
 $i18nFile = new I18nFile();
 $i18nData = $i18nFile->load();
@@ -27,11 +27,11 @@ $report = array();
 foreach ($languages as $language) {
 	if ($language === $i18nData::REFERENCE_LANGUAGE) {
 		$i18nValidator = new I18nUsageValidator($i18nData->getReferenceLanguage(), findUsedTranslations());
-		$isValidated = $i18nValidator->validate(include __DIR__ . '/ignore/' . $language . '.php') && $isValidated;
+		$isValidated = $i18nValidator->validate(include __DIR__ . '/i18n/ignore/' . $language . '.php') && $isValidated;
 	} else {
 		$i18nValidator = new I18nCompletionValidator($i18nData->getReferenceLanguage(), $i18nData->getLanguage($language));
-		if (file_exists(__DIR__ . '/ignore/' . $language . '.php')) {
-			$isValidated = $i18nValidator->validate(include __DIR__ . '/ignore/' . $language . '.php') && $isValidated;
+		if (file_exists(__DIR__ . '/i18n/ignore/' . $language . '.php')) {
+			$isValidated = $i18nValidator->validate(include __DIR__ . '/i18n/ignore/' . $language . '.php') && $isValidated;
 		} else {
 			$isValidated = $i18nValidator->validate(null) && $isValidated;
 		}
diff --git a/tools/I18nCompletionValidator.php b/cli/i18n/I18nCompletionValidator.php
similarity index 100%
rename from tools/I18nCompletionValidator.php
rename to cli/i18n/I18nCompletionValidator.php
diff --git a/tools/I18nData.php b/cli/i18n/I18nData.php
similarity index 100%
rename from tools/I18nData.php
rename to cli/i18n/I18nData.php
diff --git a/tools/I18nFile.php b/cli/i18n/I18nFile.php
similarity index 97%
rename from tools/I18nFile.php
rename to cli/i18n/I18nFile.php
index d8c16a6eb..d6489ee21 100644
--- a/tools/I18nFile.php
+++ b/cli/i18n/I18nFile.php
@@ -7,7 +7,7 @@ class i18nFile {
 	private $i18nPath;
 
 	public function __construct() {
-		$this->i18nPath = __DIR__ . '/../app/i18n';
+		$this->i18nPath = __DIR__ . '/../../app/i18n';
 	}
 
 	public function load() {
diff --git a/tools/I18nUsageValidator.php b/cli/i18n/I18nUsageValidator.php
similarity index 100%
rename from tools/I18nUsageValidator.php
rename to cli/i18n/I18nUsageValidator.php
diff --git a/tools/I18nValidatorInterface.php b/cli/i18n/I18nValidatorInterface.php
similarity index 100%
rename from tools/I18nValidatorInterface.php
rename to cli/i18n/I18nValidatorInterface.php
diff --git a/tools/ignore/en.php b/cli/i18n/ignore/en.php
similarity index 100%
rename from tools/ignore/en.php
rename to cli/i18n/ignore/en.php
diff --git a/tools/ignore/fr.php b/cli/i18n/ignore/fr.php
similarity index 100%
rename from tools/ignore/fr.php
rename to cli/i18n/ignore/fr.php
diff --git a/tools/manipulate.translation.php b/cli/manipulate.translation.php
similarity index 96%
rename from tools/manipulate.translation.php
rename to cli/manipulate.translation.php
index ab5740001..aace5723a 100644
--- a/tools/manipulate.translation.php
+++ b/cli/manipulate.translation.php
@@ -10,7 +10,7 @@ if (1 === $argc || 4 < $argc) {
 	help();
 }
 
-require_once __DIR__ . '/I18nFile.php';
+require_once __DIR__ . '/i18n/I18nFile.php';
 
 $i18nFile = new I18nFile();
 $i18nData = $i18nFile->load();