From 43aed27058b6366d8ff31b054d076d8171d00773 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 31 Jan 2017 09:58:49 +0000 Subject: [PATCH] Update/Install: Give context to "Deleted! string to allow for differentiation between theme and plugin translations. Props swissspidy. See #39747. See #37290. git-svn-id: https://develop.svn.wordpress.org/trunk@40035 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/js/updates.js | 4 ++-- src/wp-includes/script-loader.php | 3 ++- tests/qunit/fixtures/updates.js | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/wp-admin/js/updates.js b/src/wp-admin/js/updates.js index 1ae4486e69..cfe832de3e 100644 --- a/src/wp-admin/js/updates.js +++ b/src/wp-admin/js/updates.js @@ -841,7 +841,7 @@ } } ); - wp.a11y.speak( wp.updates.l10n.deleted, 'polite' ); + wp.a11y.speak( wp.updates.l10n.pluginDeleted, 'polite' ); $document.trigger( 'wp-plugin-delete-success', response ); }; @@ -1273,7 +1273,7 @@ } ); } - wp.a11y.speak( wp.updates.l10n.deleted, 'polite' ); + wp.a11y.speak( wp.updates.l10n.themeDeleted, 'polite' ); $document.trigger( 'wp-theme-delete-success', response ); }; diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 4fa8047bf0..b2e24d6fed 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -693,7 +693,8 @@ function wp_default_scripts( &$scripts ) { 'deleting' => __( 'Deleting...' ), /* translators: %s: Error string for a failed deletion */ 'deleteFailed' => __( 'Deletion failed: %s' ), - 'deleted' => __( 'Deleted!' ), + 'pluginDeleted' => _x( 'Deleted!', 'plugin' ), + 'themeDeleted' => _x( 'Deleted!', 'theme' ), 'livePreview' => __( 'Live Preview' ), 'activatePlugin' => is_network_admin() ? __( 'Network Activate' ) : __( 'Activate' ), 'activateTheme' => is_network_admin() ? __( 'Network Enable' ) : __( 'Activate' ), diff --git a/tests/qunit/fixtures/updates.js b/tests/qunit/fixtures/updates.js index 9e137c4e72..b90bb6cd53 100644 --- a/tests/qunit/fixtures/updates.js +++ b/tests/qunit/fixtures/updates.js @@ -42,7 +42,8 @@ window._wpUpdatesSettings = { 'aysBulkDeleteThemes': 'Caution: These themes may be active on other sites in the network. Are you sure you want to proceed?', 'deleting': 'Deleting...', 'deleteFailed': 'Deletion failed: %s', - 'deleted': 'Deleted!', + 'pluginDeleted': 'Deleted!', + 'themeDeleted': 'Deleted!', 'livePreview': 'Live Preview', 'activatePlugin': 'Activate', 'activateTheme': 'Activate',