Index: trunk/core/units/languages/languages_event_handler.php =================================================================== diff -u -N -r4674 -r4712 --- trunk/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 4674) +++ trunk/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 4712) @@ -28,7 +28,7 @@ function OnReflectMultiLingualFields($event) { $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); - + $unit_config_reader =& $this->Application->recallObject('kUnitConfigReader'); foreach ($unit_config_reader->configData as $prefix => $config_data) { $ml_helper->createFields($prefix); @@ -51,7 +51,7 @@ $object->setPrimary(); } } - + /** * [HOOK] Reset primary status of other languages if we are saving primary language * @@ -61,29 +61,29 @@ { $object =& $event->getObject( Array('skip_autoload' => true) ); $object->SwitchToLive(); - + // set primary for each languages, that have this checkbox checked $ids = explode(',', $event->MasterEvent->getEventParam('ids')); foreach ($ids as $id) { $object->Load($id); if ($object->GetDBField('PrimaryLang')) { $object->setPrimary(); } - + } - + // if no primary language left, then set primary last language (not to load again) from edited list $sql = 'SELECT '.$object->IDField.' FROM '.$object->TableName.' WHERE PrimaryLang = 1'; $primary_language = $this->Conn->GetOne($sql); - + if (!$primary_language) { $object->setPrimary(false); } } - - + + /** * Occurse before updating item * @@ -99,7 +99,7 @@ $object->SetDBField($status_field, 1); } } - + /** * Shows only enabled languages on front * @@ -278,7 +278,7 @@ { $done_percent = 100; } - + $block_params = Array( 'name' => $template_name, 'title' => $import_titles[$import_source], 'percent_done' => $done_percent, @@ -390,6 +390,9 @@ $filename = EXPORT_PATH.'/'.$field_values['LangFile']; $lang_xml =& $this->Application->recallObject('LangXML'); + if ($object->GetDBField('DoNotEncode')) { + $lang_xml->SetEncoding('plain'); + } $lang_xml->Create($filename, $field_values['PhraseType'], $lang_ids, $field_values['Module']); }