added defaultLanguage to config

2014-03-06 12:23:12 +02:00
parent 318708b68e
commit bb1890da93
3 changed files with 3 additions and 2 deletions
@@ -2,7 +2,7 @@ data/logs/*
 data/cache/*
 data/upload/*
 data/preferences/*
-application/config.php
+data/config.php
 application/Espo/Resources/metadata/scopes/CustomTest.json
 application/Espo/Modules/Crm/Resources/metadata/scopes/CustomTest.json
 application/Espo/Resources/layouts/CustomTest/*
@@ -68,7 +68,7 @@ class I18n
 		}
 		
 		if (empty($this->currentLanguage)) {
-			$this->currentLanguage = 'en_US';
+			$this->currentLanguage = $this->getConfig()->get('defaultLanguage');
 		}		

 		return $this->currentLanguage;
@@ -24,6 +24,7 @@ return array (
    0 => 'USD',
    1 => 'EUR',
  ),
+  'defaultLanguage' => 'en_US',
  'defaultCurrency' => 'USD',
  'outboundEmailIsShared' => true,
  'outboundEmailFromName' => 'EspoCRM',