From 33d78ab1bd06187507bc28140e193d2484518e6a Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 24 Mar 2015 00:56:49 +0100 Subject: [PATCH 1/1] Language base path is now optional. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../main/language/class_LanguageSystem.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/inc/classes/main/language/class_LanguageSystem.php b/inc/classes/main/language/class_LanguageSystem.php index c621c57c..ec094c9e 100644 --- a/inc/classes/main/language/class_LanguageSystem.php +++ b/inc/classes/main/language/class_LanguageSystem.php @@ -56,7 +56,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage, /** * Creates an instance of the class LanguageSystem and prepares it for usage * - * @param $languageBasePath The local base path for all language strings + * @param $languageBasePath The local base path for all language strings or emty for auto-detection * @return $langInstance An instance of LanguageSystem * @throws LanguagePathIsEmptyException If the provided $languageBasePath is empty * @throws InvalidLanguagePathStringException If $languageBasePath is no string @@ -65,10 +65,23 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage, * @throws LanguagePathReadProtectedException If $languageBasePath is * read-protected */ - public static final function createLanguageSystem ($languageBasePath) { + public static final function createLanguageSystem ($languageBasePath = '') { // Get a new instance $langInstance = new LanguageSystem(); + // Is the base path set? + if (empty($languageBasePath)) { + // No, then attempt "auto-dection": + // 1) Get application + $applicationInstance = Registry::getRegistry()->getInstance('app'); + + // 2) Try to build it + $languageBasePath = sprintf('%sapplication/%s/language/', + $langInstance->getConfigInstance()->getConfigEntry('base_path'), + $applicationInstance->getAppShortName() + ); + } // END - if + // Is the base path valid? if (empty($languageBasePath)) { // Language path is empty -- 2.30.2