Index: branches/5.0.x/core/units/languages/languages_config.php =================================================================== diff -u -r12734 -r13270 --- branches/5.0.x/core/units/languages/languages_config.php (.../languages_config.php) (revision 12734) +++ branches/5.0.x/core/units/languages/languages_config.php (.../languages_config.php) (revision 13270) @@ -1,6 +1,6 @@ 'lang', - 'ItemClass' => Array('class'=>'LanguagesItem','file'=>'languages_item.php','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'LanguagesEventHandler','file'=>'languages_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'LanguagesTagProcessor','file'=>'languages_tag_processor.php','build_event'=>'OnBuild'), + 'ItemClass' => Array('class' => 'LanguagesItem', 'file' => 'languages_item.php', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array('class' => 'LanguagesEventHandler', 'file' => 'languages_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array('class' => 'LanguagesTagProcessor', 'file' => 'languages_tag_processor.php', 'build_event' => 'OnBuild'), 'AutoLoad' => true, 'Hooks' => Array( @@ -61,7 +61,7 @@ 'Conditional' => false, 'HookToPrefix' => 'lang', 'HookToSpecial' => '*', - 'HookToEvent' => Array('OnSave','OnMassDelete'), + 'HookToEvent' => Array('OnSave', 'OnMassDelete'), 'DoPrefix' => '', 'DoSpecial' => '', 'DoEvent' => 'OnScheduleTopFrameReload', @@ -76,14 +76,14 @@ ), 'IDField' => 'LanguageId', - 'StatusField' => Array('Enabled','PrimaryLang'), // field, that is affected by Approve/Decline events + 'StatusField' => Array('Enabled', 'PrimaryLang'), // field, that is affected by Approve/Decline events 'TitleField' => 'PackName', // field, used in bluebar when editing existing item 'TitlePresets' => Array( - 'default' => Array( 'new_status_labels' => Array('lang'=>'!la_title_Adding_Language!'), - 'edit_status_labels' => Array('lang'=>'!la_title_Editing_Language!'), - 'new_titlefield' => Array('lang'=>''), + 'default' => Array( 'new_status_labels' => Array('lang' => '!la_title_Adding_Language!'), + 'edit_status_labels' => Array('lang' => '!la_title_Editing_Language!'), + 'new_titlefield' => Array('lang' => ''), ), 'languages_list' => Array( @@ -93,11 +93,11 @@ 'languages_edit_general' => Array( 'prefixes' => Array('lang'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_General!"), - 'phrases_list' => Array( 'prefixes' => Array('lang','phrases_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_Labels!"), + 'phrases_list' => Array( 'prefixes' => Array('lang', 'phrases_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_Labels!"), 'phrase_edit' => Array ( 'prefixes' => Array('phrases'), - 'new_status_labels' => Array('phrases'=>'!la_title_Adding_Phrase!'), + 'new_status_labels' => Array('phrases' => '!la_title_Adding_Phrase!'), 'edit_status_labels' => Array('phrases' => '!la_title_Editing_Phrase!'), 'format' => "#phrases_status# '#phrases_titlefield#'" ), @@ -110,13 +110,13 @@ 'export_language_results' => Array( 'prefixes' => Array(), 'format' => "!la_title_ExportLanguagePackResults!"), - 'events_list' => Array( 'prefixes' => Array('lang','emailevents_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EmailEvents!"), + 'events_list' => Array( 'prefixes' => Array('lang', 'emailevents_List'), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EmailEvents!"), 'event_edit' => Array( 'prefixes' => Array('emailevents'), 'edit_status_labels' => Array('emailevents' => '!la_title_Editing_EmailEvent!'), 'format' => '#emailevents_status# - #emailevents_titlefield#'), - 'email_messages_edit' => Array( 'prefixes' => Array('lang','emailmessages'), + 'email_messages_edit' => Array( 'prefixes' => Array('lang', 'emailmessages'), 'new_titlefield' => Array('emailmessages' => ''), 'format' => "#lang_status# '#lang_titlefield#' - !la_title_EditingEmailEvent! '#emailmessages_titlefield#'"), @@ -159,7 +159,7 @@ ), 'TableName' => TABLE_PREFIX.'Language', - 'SubItems' => Array('phrases','emailmessages'), + 'SubItems' => Array('phrases', 'emailmessages'), 'FilterMenu' => Array( 'Groups' => Array( @@ -176,9 +176,9 @@ 'AutoClone' => true, - 'ListSQLs' => Array( ''=>'SELECT * FROM %s', + 'ListSQLs' => Array( '' => 'SELECT * FROM %s', ), // key - special, value - list select sql - 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', + 'ItemSQLs' => Array( '' => 'SELECT * FROM %s', ), 'ListSortings' => Array ( '' => Array ( @@ -195,37 +195,42 @@ 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Language ORDER BY PackName', 'option_title_field' => 'PackName', 'option_key_field' => 'PackName', - 'not_null' => 1, 'required' => 1, 'default' => '' + 'not_null' => 1, 'required' => 1, 'default' => '', ), - - 'LocalName' => Array ( 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Language ORDER BY PackName', 'option_title_field' => 'LocalName', 'option_key_field' => 'LocalName', - 'not_null' => 1, 'required' => 1, 'default' => '' + 'not_null' => 1, 'required' => 1, 'default' => '', ), - - 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Active'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), + 'Enabled' => Array( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array( + 0 => 'la_Disabled', + 1 => 'la_Active', + ), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + ), 'PrimaryLang' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'AdminInterfaceLang' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'IconURL' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL), 'IconDisabledURL' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL), - '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' => 'mm/dd/yyyy', 'd/m/Y' => 'dd/mm/yyyy', 'm.d.Y' => 'mm.dd.yyyy', 'd.m.Y' => 'dd.mm.yyyy'), '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', 'g:i A' => 'g:i A', 'H:i:s' => 'H:i:s', 'H:i' => 'H:i' ), 'not_null' => '1','default' => 'g:i:s A', 'required' => 1), - 'DecimalPoint' => Array('type' => 'string','not_null' => 1, 'required' => 1, 'default' => ''), - 'ThousandSep' => Array('type' => 'string','not_null' => 1, 'default' => ''), - 'Charset' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1), - 'UnitSystem' => Array('type' => 'int','not_null' => 1, 'default' => 1, 'formatter' => 'kOptionsFormatter','options' => Array(1 => 'la_Metric', 2 => 'la_US_UK'),'use_phrases' => 1), + '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' => 'mm/dd/yyyy', 'd/m/Y' => 'dd/mm/yyyy', 'm.d.Y' => 'mm.dd.yyyy', 'd.m.Y' => 'dd.mm.yyyy'), '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', 'g:i A' => 'g:i A', 'H:i:s' => 'H:i:s', 'H:i' => 'H:i' ), 'not_null' => '1', 'default' => 'g:i:s A', 'required' => 1), + 'DecimalPoint' => Array('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''), + 'ThousandSep' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), + 'Charset' => Array('type' => 'string', 'not_null' => '1', 'default' => '', 'required'=>1), + 'UnitSystem' => Array('type' => 'int', 'not_null' => 1, 'default' => 1, 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Metric', 2 => 'la_US_UK'), 'use_phrases' => 1), 'FilenameReplacements' => Array ('type' => 'string', 'default' => NULL), - 'Locale' => Array('type' => 'string','not_null' => 1, 'default' => 'en-US', 'formatter' => 'kOptionsFormatter', + 'Locale' => Array('type' => 'string', 'not_null' => 1, 'default' => 'en-US', 'formatter' => 'kOptionsFormatter', 'options' => Array('' => ''), - 'options_sql' => "SELECT CONCAT(LocaleName, ' ' ,'\/',Locale,'\/') AS name, Locale FROM ".TABLE_PREFIX."LocalesList ORDER BY LocaleId", 'option_title_field' => "name", 'option_key_field' => 'Locale', + 'options_sql' => "SELECT CONCAT(LocaleName, ' ' , '\/',Locale, '\/') AS name, Locale FROM ".TABLE_PREFIX."LocalesList ORDER BY LocaleId", 'option_title_field' => "name", 'option_key_field' => 'Locale', ), 'UserDocsUrl' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''), ), @@ -252,8 +257,6 @@ 'Charset' => Array ('title' => 'la_col_Charset', 'filter_block' => 'grid_like_filter', 'width' => 100, ), 'Priority' => Array ('title' => 'la_col_Priority', 'filter_block' => 'grid_like_filter', 'width' => 60, ), 'Enabled' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 60, ), - - ), ),