Skip to:
Content

bbPress.org

Changeset 6491


Ignore:
Timestamp:
06/05/2017 08:26:58 PM (7 years ago)
Author:
johnjamesjacoby
Message:

Converter: Update some strings for improved clarity.

When a conversion is stopped, and later resumed, make sure the steps and verbiage are clear.

Also switch from "Completed" to "Finished" since it's likely some repair steps are still necessary, and the conversion isn't technically "complete" until those are done too.

Location:
trunk/src/includes/admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/includes/admin/classes/class-bbp-converter.php

    r6475 r6491  
    183183                // Import
    184184                'import_success'      => sprintf( esc_html__( 'Repair any missing information: %s', 'bbpress' ), '<a href="' . esc_url( $repair_url ) . '">' . esc_html__( 'Continue', 'bbpress' ) . '</a>' ),
    185                 'import_complete'     => esc_html__( 'Import Complete',            'bbpress' ),
     185                'import_complete'     => esc_html__( 'Import Finished',            'bbpress' ),
    186186                'import_stopped_user' => esc_html__( 'Import Stopped (by User)',   'bbpress' ),
    187187                'import_error_db'     => esc_html__( 'Database Connection Failed', 'bbpress' ),
     
    257257        // Save step and count so that it can be restarted.
    258258        if ( ! get_option( '_bbp_converter_step' ) || ! empty( $_POST['_bbp_converter_restart'] ) ) {
    259             update_option( '_bbp_converter_step',  1 );
     259            update_option( '_bbp_converter_step',  0 );
    260260            update_option( '_bbp_converter_start', 0 );
    261261
     
    629629            default :
    630630                $this->reset();
    631                 $this->converter_output( esc_html__( 'Import Complete', 'bbpress' ) );
     631                $this->converter_output( esc_html__( 'Import Finished', 'bbpress' ) );
    632632
    633633                break;
  • trunk/src/includes/admin/settings.php

    r6485 r6491  
    16611661
    16621662    // Status
    1663     $started = (bool) get_option( '_bbp_converter_query', false );
    1664     $step    = (int)  get_option( '_bbp_converter_step', 0 );
    1665     $max     = 17; // Filter?
     1663    $step = (int)  get_option( '_bbp_converter_step',  0     );
     1664    $max  = 17; // Filter?
    16661665
    16671666    // Starting or continuing?
    1668     $start_text = ( true === $started )
     1667    $start_text = ! empty( $step )
    16691668        ? esc_html__( 'Continue', 'bbpress' )
    16701669        : esc_html__( 'Start',    'bbpress' );
    16711670
    16721671    // Starting or continuing?
    1673     $status_text = ( true === $started )
    1674         ? sprintf( esc_html__( 'Stopped at step %d of %d', 'bbpress' ), $step, $max )
     1672    $status_text = ! empty( $step )
     1673        ? sprintf( esc_html__( 'Previously stopped at step %d of %d', 'bbpress' ), $step, $max )
    16751674        : esc_html__( 'Ready to go.', 'bbpress' ); ?>
    16761675
Note: See TracChangeset for help on using the changeset viewer.