From 61b949c46488c03e19cdfcf71731e21434581ee8 Mon Sep 17 00:00:00 2001 From: Sebastian Meyer Date: Sat, 16 Mar 2019 21:03:32 +0100 Subject: [PATCH] Move ISO files to Resource/Private/Data/ --- Classes/Common/Helper.php | 4 ++-- Resources/Private/{ISO-639 => Data}/iso-639-1.xml | 0 Resources/Private/{ISO-639 => Data}/iso-639-2b.xml | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename Resources/Private/{ISO-639 => Data}/iso-639-1.xml (100%) rename Resources/Private/{ISO-639 => Data}/iso-639-2b.xml (100%) diff --git a/Classes/Common/Helper.php b/Classes/Common/Helper.php index 1056f6fd..06ad0c31 100644 --- a/Classes/Common/Helper.php +++ b/Classes/Common/Helper.php @@ -381,9 +381,9 @@ class Helper { // Analyze code and set appropriate ISO table. $isoCode = strtolower(trim($code)); if (preg_match('/^[a-z]{3}$/', $isoCode)) { - $file = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(self::$extKey).'Resources/Private/ISO-639/iso-639-2b.xml'; + $file = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(self::$extKey).'Resources/Private/Data/iso-639-2b.xml'; } elseif (preg_match('/^[a-z]{2}$/', $isoCode)) { - $file = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(self::$extKey).'Resources/Private/ISO-639/iso-639-1.xml'; + $file = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(self::$extKey).'Resources/Private/Data/iso-639-1.xml'; } else { // No ISO code, return unchanged. return $code; diff --git a/Resources/Private/ISO-639/iso-639-1.xml b/Resources/Private/Data/iso-639-1.xml similarity index 100% rename from Resources/Private/ISO-639/iso-639-1.xml rename to Resources/Private/Data/iso-639-1.xml diff --git a/Resources/Private/ISO-639/iso-639-2b.xml b/Resources/Private/Data/iso-639-2b.xml similarity index 100% rename from Resources/Private/ISO-639/iso-639-2b.xml rename to Resources/Private/Data/iso-639-2b.xml