Index: bug_report_page.php =================================================================== --- bug_report_page.php (revision 5475) +++ bug_report_page.php (working copy) @@ -215,16 +215,31 @@ + + + +> + + + + + + + + + - + - > Index: core/helper_api.php =================================================================== --- core/helper_api.php (revision 5475) +++ core/helper_api.php (working copy) @@ -94,11 +94,12 @@ # Given a enum string and num, return the appropriate string function get_enum_element( $p_enum_name, $p_val ) { $config_var = config_get( $p_enum_name.'_enum_string' ); + return get_enum_to_string ( $config_var, $p_val ); $string_var = lang_get( $p_enum_name.'_enum_string' ); # use the global enum string to search - $t_arr = explode_enum_string( $config_var ); - $t_arr_count = count( $t_arr ); + $t_arr = explode_enum_string( $config_var ); + $t_arr_coun = count( $t_arr ); for ( $i=0; $i < $t_arr_count ;$i++ ) { $elem_arr = explode_enum_arr( $t_arr[$i] ); if ( $elem_arr[0] == $p_val ) { @@ -505,4 +506,4 @@ return (int)$t_min; } -?> \ No newline at end of file +?> Index: manage_config_workflow_page.php =================================================================== --- manage_config_workflow_page.php (revision 5475) +++ manage_config_workflow_page.php (working copy) @@ -67,7 +67,7 @@ # prepopulate new bug state (bugs go from nothing to here) $t_submit_status_array = config_get( 'bug_submit_status' ); - $t_new_label = get_enum_to_string( lang_get( 'status_enum_string' ), NEW_ ); + $t_new_label = get_enum_to_string( config_get( 'status_enum_string' ), NEW_ ); if ( is_array( $t_submit_status_array ) ) { # @@@ (thraxisp) this is not implemented in bug_api.php foreach ($t_submit_status_array as $t_access => $t_status ) { @@ -167,7 +167,7 @@ echo "\n"; foreach( $t_enum_status as $t_status ) { $t_entry_array = explode_enum_arr( $t_status ); - echo ' ' . string_no_break( get_enum_to_string( lang_get( 'status_enum_string' ), $t_entry_array[0] ) ) . ' '; + echo ' ' . string_no_break( get_enum_to_string( config_get( 'status_enum_string' ), $t_entry_array[0] ) ) . ' '; } echo '' . lang_get( 'custom_field_default_value' ) . ''; echo '' . "\n"; @@ -176,7 +176,7 @@ function capability_row( $p_from_status ) { global $t_file_workflow, $t_global_workflow, $t_project_workflow, $t_colour_global, $t_colour_project, $t_can_change_workflow; $t_enum_status = get_enum_to_array( config_get( 'status_enum_string' ) ); - echo '' . string_no_break( get_enum_to_string( lang_get( 'status_enum_string' ), $p_from_status ) ) . ''; + echo '' . string_no_break( get_enum_to_string( config_get( 'status_enum_string' ), $p_from_status ) ) . ''; foreach ( $t_enum_status as $t_to_status_id => $t_to_status_label ) { echo show_flag( $p_from_status, $t_to_status_id ); } @@ -204,7 +204,7 @@ print_enum_string_option_list( 'status', $t_project ); echo ''; } else { - echo get_enum_to_string( lang_get( 'status_enum_string' ), $t_project ); + echo get_enum_to_string( config_get( 'status_enum_string' ), $t_project ); } echo ' '; echo '' . "\n"; @@ -254,7 +254,7 @@ echo ' '; $t_can_change_flags = true; } else { - echo '' . get_enum_to_string( lang_get( 'status_enum_string' ), $t_project ) . ' '; + echo '' . get_enum_to_string( config_get( 'status_enum_string' ), $t_project ) . ' '; echo '' . get_enum_to_string( lang_get( 'access_levels_enum_string' ), config_get_access( $p_threshold ) ) . ' '; } @@ -304,7 +304,7 @@ } foreach ( $t_enum_status as $t_status => $t_status_label) { - echo '' . string_no_break( get_enum_to_string( lang_get( 'status_enum_string' ), $t_status ) ) . ''; + echo '' . string_no_break( get_enum_to_string( config_get( 'status_enum_string' ), $t_status ) ) . ''; if ( NEW_ == $t_status ) { $t_level = $t_project_new; $t_can_change = ( $t_access >= config_get_access( 'report_bug_threshold' ) ); @@ -359,7 +359,7 @@ $t_status_arr = get_enum_to_array( $t_enum_status ); $t_extra_enum_status = '0:non-existent,' . $t_enum_status; - $t_lang_enum_status = '0:' . lang_get( 'non_existent' ) . ',' . lang_get( 'status_enum_string' ); + $t_lang_enum_status = '0:' . lang_get( 'non_existent' ) . ',' . config_get( 'status_enum_string' ); $t_all_status = explode( ',', $t_extra_enum_status); # gather all versions of the workflow