Changeset 6491

Timestamp:

06/05/2017 08:26:58 PM (3 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:

• classes/class-bbp-converter.php (modified) (3 diffs)
• settings.php (modified) (1 diff)

trunk/src/includes/admin/classes/class-bbp-converter.php

@@ -183 +183 @@
                 // Import
                 'import_success'      => sprintf( esc_html__( 'Repair any missing information: %s', 'bbpress' ), '<a href="' . esc_url( $repair_url ) . '">' . esc_html__( 'Continue', 'bbpress' ) . '</a>' ),
-                'import_complete'     => esc_html__( 'Import Complete',            'bbpress' ),
+                'import_complete'     => esc_html__( 'Import Finished',            'bbpress' ),
                 'import_stopped_user' => esc_html__( 'Import Stopped (by User)',   'bbpress' ),
                 'import_error_db'     => esc_html__( 'Database Connection Failed', 'bbpress' ),
@@ -257 +257 @@
         // Save step and count so that it can be restarted.
         if ( ! get_option( '_bbp_converter_step' ) || ! empty( $_POST['_bbp_converter_restart'] ) ) {
-            update_option( '_bbp_converter_step',  1 );
+            update_option( '_bbp_converter_step',  0 );
             update_option( '_bbp_converter_start', 0 );
 
@@ -629 +629 @@
             default :
                 $this->reset();
-                $this->converter_output( esc_html__( 'Import Complete', 'bbpress' ) );
+                $this->converter_output( esc_html__( 'Import Finished', 'bbpress' ) );
 
                 break;

trunk/src/includes/admin/settings.php

@@ -1661 +1661 @@
 
     // Status
-    $started = (bool) get_option( '_bbp_converter_query', false );
-    $step    = (int)  get_option( '_bbp_converter_step', 0 );
-    $max     = 17; // Filter?
+    $step = (int)  get_option( '_bbp_converter_step',  0     );
+    $max  = 17; // Filter?
 
     // Starting or continuing?
-    $start_text = ( true === $started )
+    $start_text = ! empty( $step )
         ? esc_html__( 'Continue', 'bbpress' )
         : esc_html__( 'Start',    'bbpress' );
 
     // Starting or continuing?
-    $status_text = ( true === $started )
-        ? sprintf( esc_html__( 'Stopped at step %d of %d', 'bbpress' ), $step, $max )
+    $status_text = ! empty( $step )
+        ? sprintf( esc_html__( 'Previously stopped at step %d of %d', 'bbpress' ), $step, $max )
         : esc_html__( 'Ready to go.', 'bbpress' ); ?>