Index: branches/5.1.x/core/units/phrases/phrases_config.php =================================================================== diff -u -N -r13453 -r13545 --- branches/5.1.x/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 13453) +++ branches/5.1.x/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 13545) @@ -1,6 +1,6 @@ Array ( 'type' => 'string', 'required' => 1, 'unique' => Array (), - 'not_null' => 1, 'default' => '' + 'not_null' => 1, 'default' => '', ), 'PhraseKey' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), 'Translation' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'required' => 1, 'using_fck' => 1, 'default' => NULL, 'db_type' => 'text'), 'PhraseType' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_PhraseType_Front', 1 => 'la_PhraseType_Admin', 2 => 'la_PhraseType_Both'), 'use_phrases' => 1, - 'not_null' => 1, 'required' => 1, 'default' => 0 + 'not_null' => 1, 'required' => 1, 'default' => 0, ), 'LastChanged' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'LastChangeIP' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), @@ -146,13 +146,21 @@ ), 'ImportOverwrite' => Array ( 'type' => 'int', - 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, - 'default' => 0 + 'formatter' => 'kOptionsFormatter', + 'options' => Array( + 0 => 'la_No', + 1 => 'la_Yes', + ), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, ), 'DoNotEncode' => Array ( 'type' => 'int', - 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, - 'default' => 0 + 'formatter' => 'kOptionsFormatter', + 'options' => Array( + 0 => 'la_No', + 1 => 'la_Yes', + ), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, ), 'ExportPhrases' => Array ('type' => 'string', 'default' => ''), 'ExportEmailEvents' => Array ('type' => 'string', 'default' => ''),