From 9161d906a7b71eb83c8e32f677ecc842ab48c8f2 Mon Sep 17 00:00:00 2001 From: Taras Machyshyn Date: Thu, 6 Mar 2014 12:57:47 +0200 Subject: [PATCH] change defaultLanguage to language in config --- application/Espo/Core/Utils/I18n.php | 2 +- application/Espo/Core/defaults/config.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/Espo/Core/Utils/I18n.php b/application/Espo/Core/Utils/I18n.php index 634f66f9cb..e5577aaf9e 100644 --- a/application/Espo/Core/Utils/I18n.php +++ b/application/Espo/Core/Utils/I18n.php @@ -68,7 +68,7 @@ class I18n } if (empty($this->currentLanguage)) { - $this->currentLanguage = $this->getConfig()->get('defaultLanguage'); + $this->currentLanguage = $this->getConfig()->get('language'); } return $this->currentLanguage; diff --git a/application/Espo/Core/defaults/config.php b/application/Espo/Core/defaults/config.php index d932df503a..de81b83efc 100644 --- a/application/Espo/Core/defaults/config.php +++ b/application/Espo/Core/defaults/config.php @@ -24,7 +24,7 @@ return array ( 0 => 'USD', 1 => 'EUR', ), - 'defaultLanguage' => 'en_US', + 'language' => 'en_US', 'defaultCurrency' => 'USD', 'outboundEmailIsShared' => true, 'outboundEmailFromName' => 'EspoCRM',