From 8d0ebef0d075981bd943e8256e2c81a3b1e92b4b Mon Sep 17 00:00:00 2001 From: Greg Roach Date: Sat, 17 Nov 2018 15:22:08 +0000 Subject: Prefer class-constants to global-constants --- app/I18N.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/I18N.php') diff --git a/app/I18N.php b/app/I18N.php index e17ca91f6a..9714815d6c 100644 --- a/app/I18N.php +++ b/app/I18N.php @@ -415,16 +415,16 @@ class I18N if (defined('GLOB_BRACE')) { $translation_files = array_merge( [WT_ROOT . 'language/' . self::$locale->languageTag() . '.mo'], - glob(WT_MODULES_DIR . '*/language/' . self::$locale->languageTag() . '.{csv,php,mo}', GLOB_BRACE) ?: [], + glob(Webtrees::MODULES_PATH . '*/language/' . self::$locale->languageTag() . '.{csv,php,mo}', GLOB_BRACE) ?: [], glob(WT_DATA_DIR . 'language/' . self::$locale->languageTag() . '.{csv,php,mo}', GLOB_BRACE) ?: [] ); } else { // Some servers do not have GLOB_BRACE - see http://php.net/manual/en/function.glob.php $translation_files = array_merge( [WT_ROOT . 'language/' . self::$locale->languageTag() . '.mo'], - glob(WT_MODULES_DIR . '*/language/' . self::$locale->languageTag() . '.csv') ?: [], - glob(WT_MODULES_DIR . '*/language/' . self::$locale->languageTag() . '.php') ?: [], - glob(WT_MODULES_DIR . '*/language/' . self::$locale->languageTag() . '.mo') ?: [], + glob(Webtrees::MODULES_PATH . '*/language/' . self::$locale->languageTag() . '.csv') ?: [], + glob(Webtrees::MODULES_PATH . '*/language/' . self::$locale->languageTag() . '.php') ?: [], + glob(Webtrees::MODULES_PATH . '*/language/' . self::$locale->languageTag() . '.mo') ?: [], glob(WT_DATA_DIR . 'language/' . self::$locale->languageTag() . '.csv') ?: [], glob(WT_DATA_DIR . 'language/' . self::$locale->languageTag() . '.php') ?: [], glob(WT_DATA_DIR . 'language/' . self::$locale->languageTag() . '.mo') ?: [] -- cgit v1.3