Commit 6a854456 authored by Sergey Biryukov's avatar Sergey Biryukov
Browse files

I18N: Further adjust some update/install strings for consistency. 

Follow-up to [48568], [48569].

See #50708, #50714.
Built from https://develop.svn.wordpress.org/trunk@48589


git-svn-id: https://core.svn.wordpress.org/trunk@48351 1a063a9b-81f0-0310-95a4-ce76da25c4cd
parent 77c1490e

wp-admin/includes/ajax-actions.php

+1 −1
Original line number Diff line number Diff line
@@ -4210,7 +4210,7 @@ function wp_ajax_update_theme() { 
	}



	// An unhandled error occurred.

	$status['errorMessage'] = __( 'Update failed' );

	$status['errorMessage'] = __( 'Theme update failed.' );

	wp_send_json_error( $status );

}

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

+2 −2
Original line number Diff line number Diff line
@@ -386,9 +386,9 @@ 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' ) );

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

			}

		}

wp-admin/includes/update-core.php

+1 −1
Original line number Diff line number Diff line
@@ -1429,7 +1429,7 @@ function _redirect_to_about_wordpress( $new_version ) { 
	load_default_textdomain();



	// See do_core_upgrade().

	show_message( __( 'WordPress updated successfully' ) );

	show_message( __( 'WordPress updated successfully.' ) );



	// self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional.

	show_message(

wp-admin/js/updates.js

+7 −7
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ 


		errorMessage = sprintf(

			/* translators: %s: Error string for a failed update. */

			__( 'Update Failed: %s' ),

			__( 'Update failed: %s' ),

			response.errorMessage

		);
@@ -520,7 +520,7 @@ 
				} ) );



			$card.find( '.update-now' )

				.text(  __( 'Update failed' ) )

				.text(  __( 'Update failed.' ) )

				.removeClass( 'updating-message' );



			if ( response.pluginName ) {
@@ -727,7 +727,7 @@ 
					$button.data( 'name' )

				)

			)

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

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



		wp.a11y.speak( errorMessage, 'assertive' );
@@ -1143,7 +1143,7 @@ 
		var $theme       = $( '[data-slug="' + response.slug + '"]' ),

			errorMessage = sprintf(

				/* translators: %s: Error string for a failed update. */

				 __( 'Update Failed: %s' ),

				 __( 'Update failed: %s' ),

				response.errorMessage

			),

			$notice;
@@ -1364,7 +1364,7 @@ 
					$button.data( 'name' )

				)

			)

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

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



		wp.a11y.speak( errorMessage, 'assertive' );
@@ -1804,7 +1804,7 @@ 
		switch ( action ) {

			case 'update':

				/* translators: %s: Error string for a failed update. */

				errorMessage = __( 'Update Failed: %s' );

				errorMessage = __( 'Update failed: %s' );

				break;



			case 'install':
@@ -1838,7 +1838,7 @@ 
			.removeClass( 'updating-message' )

			.removeAttr( 'aria-label' )

			.prop( 'disabled', true )

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

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



		$( '.updating-message:not(.button):not(.thickbox)' )

			.removeClass( 'updating-message notice-warning' )

wp-admin/js/updates.min.js

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.