Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

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

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

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


git-svn-id: http://core.svn.wordpress.org/trunk@48351 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-07-23 21:08:01 +00:00
parent 5950e15042
commit 3f04e3bf5c
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/ajax-actions.php
View File

@ -4210,7 +4210,7 @@ function wp_ajax_update_theme() {
} }
// An unhandled error occurred. // An unhandled error occurred.
$status['errorMessage'] = __( 'Update failed' ); $status['errorMessage'] = __( 'Theme update failed.' );
wp_send_json_error( $status ); wp_send_json_error( $status );
} }

4
wp-admin/includes/class-wp-automatic-updater.php
View File

@ -386,9 +386,9 @@ class WP_Automatic_Updater {
// Core doesn't output this, so let's append it so we don't get confused. // Core doesn't output this, so let's append it so we don't get confused.
if ( is_wp_error( $upgrade_result ) ) { if ( is_wp_error( $upgrade_result ) ) {
$skin->error( __( 'Installation failed' ), $upgrade_result ); $skin->error( __( 'Installation failed.' ), $upgrade_result );
} else { } else {
$skin->feedback( __( 'WordPress updated successfully' ) ); $skin->feedback( __( 'WordPress updated successfully.' ) );
} }
} }

2
wp-admin/includes/update-core.php
View File

@ -1429,7 +1429,7 @@ function _redirect_to_about_wordpress( $new_version ) {
load_default_textdomain(); load_default_textdomain();
// See do_core_upgrade(). // 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. // self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional.
show_message( show_message(

14
wp-admin/js/updates.js
View File

@ -486,7 +486,7 @@
errorMessage = sprintf( errorMessage = sprintf(
/* translators: %s: Error string for a failed update. */ /* translators: %s: Error string for a failed update. */
__( 'Update Failed: %s' ), __( 'Update failed: %s' ),
response.errorMessage response.errorMessage
); );
@ -520,7 +520,7 @@
} ) ); } ) );
$card.find( '.update-now' ) $card.find( '.update-now' )
.text( __( 'Update failed' ) ) .text( __( 'Update failed.' ) )
.removeClass( 'updating-message' ); .removeClass( 'updating-message' );
if ( response.pluginName ) { if ( response.pluginName ) {
@ -727,7 +727,7 @@
$button.data( 'name' ) $button.data( 'name' )
) )
) )
.text( __( 'Installation failed' ) ); .text( __( 'Installation failed.' ) );
wp.a11y.speak( errorMessage, 'assertive' ); wp.a11y.speak( errorMessage, 'assertive' );
@ -1143,7 +1143,7 @@
var $theme = $( '[data-slug="' + response.slug + '"]' ), var $theme = $( '[data-slug="' + response.slug + '"]' ),
errorMessage = sprintf( errorMessage = sprintf(
/* translators: %s: Error string for a failed update. */ /* translators: %s: Error string for a failed update. */
__( 'Update Failed: %s' ), __( 'Update failed: %s' ),
response.errorMessage response.errorMessage
), ),
$notice; $notice;
@ -1364,7 +1364,7 @@
$button.data( 'name' ) $button.data( 'name' )
) )
) )
.text( __( 'Installation failed' ) ); .text( __( 'Installation failed.' ) );
wp.a11y.speak( errorMessage, 'assertive' ); wp.a11y.speak( errorMessage, 'assertive' );
@ -1804,7 +1804,7 @@
switch ( action ) { switch ( action ) {
case 'update': case 'update':
/* translators: %s: Error string for a failed update. */ /* translators: %s: Error string for a failed update. */
errorMessage = __( 'Update Failed: %s' ); errorMessage = __( 'Update failed: %s' );
break; break;
case 'install': case 'install':
@ -1838,7 +1838,7 @@
.removeClass( 'updating-message' ) .removeClass( 'updating-message' )
.removeAttr( 'aria-label' ) .removeAttr( 'aria-label' )
.prop( 'disabled', true ) .prop( 'disabled', true )
.text( __( 'Update failed' ) ); .text( __( 'Update failed.' ) );
$( '.updating-message:not(.button):not(.thickbox)' ) $( '.updating-message:not(.button):not(.thickbox)' )
.removeClass( 'updating-message notice-warning' ) .removeClass( 'updating-message notice-warning' )

2
wp-admin/js/updates.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
wp-admin/update-core.php
View File

@ -646,13 +646,13 @@ function do_core_upgrade( $reinstall = false ) {
if ( is_wp_error( $result ) ) { if ( is_wp_error( $result ) ) {
show_message( $result ); show_message( $result );
if ( 'up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code() ) { if ( 'up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code() ) {
show_message( __( 'Installation failed' ) ); show_message( __( 'Installation failed.' ) );
} }
echo '</div>'; echo '</div>';
return; return;
} }
show_message( __( 'WordPress updated successfully' ) ); show_message( __( 'WordPress updated successfully.' ) );
show_message( show_message(
'<span class="hide-if-no-js">' . sprintf( '<span class="hide-if-no-js">' . sprintf(
/* translators: 1: WordPress version, 2: URL to About screen. */ /* translators: 1: WordPress version, 2: URL to About screen. */

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-beta3-48588'; $wp_version = '5.5-beta3-48589';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.