Index: branches/unlabeled/unlabeled-1.6.2/core/install.php =================================================================== diff -u -r6999 -r7019 --- branches/unlabeled/unlabeled-1.6.2/core/install.php (.../install.php) (revision 6999) +++ branches/unlabeled/unlabeled-1.6.2/core/install.php (.../install.php) (revision 7019) @@ -326,6 +326,13 @@ // import base language for core (english) $this->ImportLanguage('/core/install/english'); + + // set imported language as primary + $lang =& $this->Application->recallObject('lang.-item', null, Array('skip_autoload' => true)); + /* @var $lang LanguagesItem */ + + $lang->Load(1); // fresh install => ID=1 + $lang->setPrimary(); break; case 'choose_modules': Index: branches/unlabeled/unlabeled-1.22.2/core/units/languages/import_xml.php =================================================================== diff -u -r6688 -r7019 --- branches/unlabeled/unlabeled-1.22.2/core/units/languages/import_xml.php (.../import_xml.php) (revision 6688) +++ branches/unlabeled/unlabeled-1.22.2/core/units/languages/import_xml.php (.../import_xml.php) (revision 7019) @@ -62,6 +62,11 @@ */ var $modules_allowed = Array(); + /** + * Current Language in import + * + * @var LanguagesItem + */ var $lang_object = null; var $tables = Array(); @@ -192,6 +197,7 @@ if( !getArrayValue($this->current_language,'LanguageId') ) { + $this->lang_object->SetDBField('Enabled', STATUS_ACTIVE); if( $this->lang_object->Create() ) $this->current_language['LanguageId'] = $this->lang_object->GetID(); } elseif($this->import_mode == LANG_OVERWRITE_EXISTING) Index: branches/unlabeled/unlabeled-1.19.2/core/units/languages/languages_config.php =================================================================== diff -u -r6785 -r7019 --- branches/unlabeled/unlabeled-1.19.2/core/units/languages/languages_config.php (.../languages_config.php) (revision 6785) +++ branches/unlabeled/unlabeled-1.19.2/core/units/languages/languages_config.php (.../languages_config.php) (revision 7019) @@ -134,13 +134,13 @@ 'LanguageId' => Array(), 'PackName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'LocalName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), - 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1', 'default' => '0'), + 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1', 'default' => 1), 'PrimaryLang' => Array('type' => 'int','not_null' => '1','default' => '0'), 'IconURL' => Array('type' => 'string','default' => ''), 'DateFormat' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'TimeFormat' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), 'InputDateFormat' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('m/d/Y' => 'm/d/Y'), 'not_null' => '1','default' => 'm/d/Y', 'required' => 1), - 'InputTimeFormat' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('g:i:s A' => 'g:i:s A'), 'not_null' => '1','default' => 'g:i:s A', 'required' => 1), + 'InputTimeFormat' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('g:i:s A' => 'g:i:s A'), 'not_null' => '1','default' => 'g:i:s A', 'required' => 1), 'DecimalPoint' => Array('type' => 'string','not_null' => '1','default' => ''), 'ThousandSep' => Array('type' => 'string','not_null' => '1','default' => ''), 'Charset' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),