Commit 50308c0e authored by Jake Spurlock's avatar Jake Spurlock
Browse files

I18N: Merge similar "Installation failed" strings 

Fixes #50708.

Props ramiy, ocean90, audrasjb.

Built from https://develop.svn.wordpress.org/trunk@48568


git-svn-id: https://core.svn.wordpress.org/trunk@48330 1a063a9b-81f0-0310-95a4-ce76da25c4cd
parent 8a82d93b

wp-admin/includes/class-wp-automatic-updater.php

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ class WP_Automatic_Updater { 


			// Core doesn't output this, so let's append it so we don't get confused.

			if ( is_wp_error( $upgrade_result ) ) {

				$skin->error( __( 'Installation Failed' ), $upgrade_result );

				$skin->error( __( 'Installation failed' ), $upgrade_result );

			} else {

				$skin->feedback( __( 'WordPress updated successfully' ) );

			}

wp-admin/js/updates.js

+2 −2
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ 
					$button.data( 'name' )

				)

			)

			.text( __( 'Installation Failed!' ) );

			.text( __( 'Installation failed' ) );



		wp.a11y.speak( errorMessage, 'assertive' );
@@ -1364,7 +1364,7 @@ 
					$button.data( 'name' )

				)

			)

			.text( __( 'Installation Failed!' ) );

			.text( __( 'Installation failed' ) );



		wp.a11y.speak( errorMessage, 'assertive' );

wp-admin/js/updates.min.js

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

wp-admin/update-core.php

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ function do_core_upgrade( $reinstall = false ) { 
	if ( is_wp_error( $result ) ) {

		show_message( $result );

		if ( 'up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code() ) {

			show_message( __( 'Installation Failed' ) );

			show_message( __( 'Installation failed' ) );

		}

		echo '</div>';

		return;

wp-includes/version.php

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 *

 * @global string $wp_version

 */

$wp_version = '5.5-beta3-48567';

$wp_version = '5.5-beta3-48568';



/**

 * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.