From bf3a2dd66bcf2c8f54fb35bcc477e4f3f75de3c4 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Fri, 12 May 2017 16:52:50 +0200 Subject: The method "getLanguage" has been restructured. --- core/namespace/Application.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'core/namespace') diff --git a/core/namespace/Application.php b/core/namespace/Application.php index e5afb85..b4796c6 100644 --- a/core/namespace/Application.php +++ b/core/namespace/Application.php @@ -56,8 +56,11 @@ class Application { #=============================================================================== public static function getLanguage($force = FALSE): Language { if(!self::$Language instanceof Language OR $force === TRUE) { + $template_name = self::get('TEMPLATE.NAME'); + $template_lang = self::get('TEMPLATE.LANG'); + $Language = new Language(self::get('CORE.LANGUAGE')); - $Language->loadLanguage(ROOT.'template/'.self::get('TEMPLATE.NAME').'/lang/'.self::get('TEMPLATE.LANG').'.php'); + $Language->loadLanguage(sprintf(ROOT.'template/%s/lang/%s.php', $template_name, $template_lang)); self::$Language = $Language; } -- cgit v1.2.3