Index: branches/5.2.x/core/units/languages/languages_config.php =================================================================== diff -u -N -r14585 -r14629 --- branches/5.2.x/core/units/languages/languages_config.php (.../languages_config.php) (revision 14585) +++ branches/5.2.x/core/units/languages/languages_config.php (.../languages_config.php) (revision 14629) @@ -1,6 +1,6 @@ Array ('m/d/Y' => 'mm/dd/yyyy', 'd/m/Y' => 'dd/mm/yyyy', 'm.d.Y' => 'mm.dd.yyyy', 'd.m.Y' => 'dd.mm.yyyy'), 'not_null' => 1, 'required' => 1, 'default' => 'm/d/Y' ), - 'InputTimeFormat' => Array ( - 'type' => 'string', + 'InputTimeFormat' => Array ( + 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ('g:i:s A' => 'g:i:s A', 'g:i A' => 'g:i A', 'H:i:s' => 'H:i:s', 'H:i' => 'H:i'), 'not_null' => '1', 'required' => 1, 'default' => 'g:i:s A', @@ -207,6 +207,11 @@ 'not_null' => 1, 'default' => 'en-US', ), 'UserDocsUrl' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), + 'SynchronizationModes' => Array ( + 'type' => 'string', 'max_len' => 255, + 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_opt_SynchronizeToOthers', 2 => 'la_opt_SynchronizeFromOthers'), 'use_phrases' => 1, 'multiple' => 1, + 'not_null' => 1, 'default' => '' + ), ), 'VirtualFields' => Array ( @@ -234,7 +239,8 @@ 'AdminInterfaceLang' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ), 'Charset' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ), 'Priority' => Array ('filter_block' => 'grid_like_filter', 'width' => 60, ), - 'Enabled' => Array ('filter_block' => 'grid_options_filter', 'width' => 60, ), + 'Enabled' => Array ('filter_block' => 'grid_options_filter', 'width' => 80, ), + 'SynchronizationModes' => Array ('filter_block' => 'grid_picker_filter', 'width' => 120, 'format' => ', ', 'hidden' => 1), ), ),