From e05557e22271d98db207aaf0d43f2063c86f1f4b Mon Sep 17 00:00:00 2001 From: audrasjb Date: Sat, 15 Jan 2022 08:44:03 +0000 Subject: [PATCH] Administration: Replace "Current theme" with "Active theme" in user facing strings. This change replaces "Current theme" with "Active theme" in user-facing strings. It brings better consistency across the Administration. Props Presskopp, audrasjb, costdev. Fixes #54770. Built from https://develop.svn.wordpress.org/trunk@52580 git-svn-id: http://core.svn.wordpress.org/trunk@52170 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-custom-image-header.php | 6 +++--- wp-admin/includes/class-theme-installer-skin.php | 6 +++--- wp-admin/includes/class-theme-upgrader.php | 2 +- wp-admin/includes/class-walker-nav-menu-edit.php | 2 +- wp-admin/includes/class-wp-site-health.php | 4 ++-- wp-admin/includes/class-wp-themes-list-table.php | 2 +- wp-admin/includes/theme.php | 2 +- wp-admin/themes.php | 6 +++--- wp-includes/class-wp-recovery-mode-email-service.php | 2 +- .../customize/class-wp-customize-nav-menu-item-control.php | 2 +- wp-includes/version.php | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/wp-admin/includes/class-custom-image-header.php b/wp-admin/includes/class-custom-image-header.php index eff3501b2e..f0bf1a21a6 100644 --- a/wp-admin/includes/class-custom-image-header.php +++ b/wp-admin/includes/class-custom-image-header.php @@ -817,7 +817,7 @@ endif; if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) { wp_die( '

' . __( 'Something went wrong.' ) . '

' . - '

' . __( 'The current theme does not support uploading a custom header image.' ) . '

', + '

' . __( 'The active theme does not support uploading a custom header image.' ) . '

', 403 ); } @@ -1003,7 +1003,7 @@ endif; if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) { wp_die( '

' . __( 'Something went wrong.' ) . '

' . - '

' . __( 'The current theme does not support uploading a custom header image.' ) . '

', + '

' . __( 'The active theme does not support uploading a custom header image.' ) . '

', 403 ); } @@ -1014,7 +1014,7 @@ endif; ) { wp_die( '

' . __( 'Something went wrong.' ) . '

' . - '

' . __( 'The current theme does not support a flexible sized header image.' ) . '

', + '

' . __( 'The active theme does not support a flexible sized header image.' ) . '

', 403 ); } diff --git a/wp-admin/includes/class-theme-installer-skin.php b/wp-admin/includes/class-theme-installer-skin.php index 46d4c22d8c..fbcc7ccd83 100644 --- a/wp-admin/includes/class-theme-installer-skin.php +++ b/wp-admin/includes/class-theme-installer-skin.php @@ -245,7 +245,7 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { ); $table = ''; - $table .= ''; + $table .= ''; $is_same_theme = true; // Let's consider only these rows. @@ -327,7 +327,7 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { if ( $this->is_downgrading ) { $warning = sprintf( /* translators: %s: Documentation URL. */ - __( 'You are uploading an older version of a current theme. You can continue to install the older version, but be sure to back up your database and files first.' ), + __( 'You are uploading an older version of the active theme. You can continue to install the older version, but be sure to back up your database and files first.' ), __( 'https://wordpress.org/support/article/wordpress-backups/' ) ); } else { @@ -345,7 +345,7 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { $install_actions['overwrite_theme'] = sprintf( '%s', wp_nonce_url( add_query_arg( 'overwrite', $overwrite, $this->url ), 'theme-upload' ), - _x( 'Replace current with uploaded', 'theme' ) + _x( 'Replace active with uploaded', 'theme' ) ); } else { echo $blocked_message; diff --git a/wp-admin/includes/class-theme-upgrader.php b/wp-admin/includes/class-theme-upgrader.php index c550314c5d..0a80209386 100644 --- a/wp-admin/includes/class-theme-upgrader.php +++ b/wp-admin/includes/class-theme-upgrader.php @@ -92,7 +92,7 @@ class Theme_Upgrader extends WP_Upgrader { /* translators: %s: Theme name. */ $this->strings['parent_theme_not_found'] = sprintf( __( 'The parent theme could not be found. You will need to install the parent theme, %s, before you can use this child theme.' ), '%s' ); /* translators: %s: Theme error. */ - $this->strings['current_theme_has_errors'] = __( 'The current theme has the following error: "%s".' ); + $this->strings['current_theme_has_errors'] = __( 'The active theme has the following error: "%s".' ); if ( ! empty( $this->skin->overwrite ) ) { if ( 'update-theme' === $this->skin->overwrite ) { diff --git a/wp-admin/includes/class-walker-nav-menu-edit.php b/wp-admin/includes/class-walker-nav-menu-edit.php index a3c1124edb..ac8e36b85f 100644 --- a/wp-admin/includes/class-walker-nav-menu-edit.php +++ b/wp-admin/includes/class-walker-nav-menu-edit.php @@ -232,7 +232,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {

diff --git a/wp-admin/includes/class-wp-site-health.php b/wp-admin/includes/class-wp-site-health.php index a79de8e8cf..cd72670ff7 100644 --- a/wp-admin/includes/class-wp-site-health.php +++ b/wp-admin/includes/class-wp-site-health.php @@ -634,7 +634,7 @@ class WP_Site_Health { ), sprintf( /* translators: 1: The currently active theme. 2: The active theme's parent theme. */ - __( 'To enhance your site’s security, you should consider removing any themes you’re not using. You should keep your current theme, %1$s, and %2$s, its parent theme.' ), + __( 'To enhance your site’s security, you should consider removing any themes you’re not using. You should keep your active theme, %1$s, and %2$s, its parent theme.' ), $active_theme->name, $active_theme->parent()->name ) @@ -653,7 +653,7 @@ class WP_Site_Health { ), sprintf( /* translators: 1: The default theme for WordPress. 2: The currently active theme. 3: The active theme's parent theme. */ - __( 'To enhance your site’s security, you should consider removing any themes you’re not using. You should keep %1$s, the default WordPress theme, %2$s, your current theme, and %3$s, its parent theme.' ), + __( 'To enhance your site’s security, you should consider removing any themes you’re not using. You should keep %1$s, the default WordPress theme, %2$s, your active theme, and %3$s, its parent theme.' ), $default_theme ? $default_theme->name : WP_DEFAULT_THEME, $active_theme->name, $active_theme->parent()->name diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-themes-list-table.php index 095267c06d..233dc8c6d5 100644 --- a/wp-admin/includes/class-wp-themes-list-table.php +++ b/wp-admin/includes/class-wp-themes-list-table.php @@ -129,7 +129,7 @@ class WP_Themes_List_Table extends WP_List_Table { // Fallthrough. printf( /* translators: %s: Network title. */ - __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), + __( 'Only the active theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) ); } diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php index b39d778aea..d7d7d18eaf 100644 --- a/wp-admin/includes/theme.php +++ b/wp-admin/includes/theme.php @@ -831,7 +831,7 @@ function customize_themes_print_templates() {
<# if ( data.active ) { #> - + <# } #>

{{{ data.name }}} ' . __( 'From this screen you can:' ) . '

' . '
  • ' . __( 'Hover or tap to see Activate and Live Preview buttons' ) . '
    • ' . '
  • ' . __( 'Click on the theme to see the theme name, version, author, description, tags, and the Delete link' ) . '
    • ' . - '
  • ' . __( 'Click Customize for the current theme or Live Preview for any other theme to see a live preview' ) . '
' . - '

' . __( 'The current theme is displayed highlighted as the first theme.' ) . '

' . + '
  • ' . __( 'Click Customize for the active theme or Live Preview for any other theme to see a live preview' ) . '
    • ' . + '

    ' . __( 'The active theme is displayed highlighted as the first theme.' ) . '

    ' . '

    ' . __( 'The search for installed themes will search for terms in their name, description, author, or tag.' ) . ' ' . __( 'The search results will be updated as you type.' ) . '

    '; get_current_screen()->add_help_tab( @@ -955,7 +955,7 @@ function wp_theme_auto_update_setting_template() {
    <# if ( data.active ) { #> - + <# } #>

    {{{ data.name }}} sprintf( /* translators: 1: Current active theme name. 2: Current active theme version. */ - __( 'Current theme: %1$s (version %2$s)' ), + __( 'Active theme: %1$s (version %2$s)' ), $theme->get( 'Name' ), $theme->get( 'Version' ) ), diff --git a/wp-includes/customize/class-wp-customize-nav-menu-item-control.php b/wp-includes/customize/class-wp-customize-nav-menu-item-control.php index b842cab15d..d6cae27b95 100644 --- a/wp-includes/customize/class-wp-customize-nav-menu-item-control.php +++ b/wp-includes/customize/class-wp-customize-nav-menu-item-control.php @@ -130,7 +130,7 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {

    diff --git a/wp-includes/version.php b/wp-includes/version.php index 01a36e2ba9..54c8f73fea 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-alpha-52578'; +$wp_version = '6.0-alpha-52580'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

    ' . esc_html_x( 'Current', 'theme' ) . '' . esc_html_x( 'Uploaded', 'theme' ) . '
    ' . esc_html_x( 'Active', 'theme' ) . '' . esc_html_x( 'Uploaded', 'theme' ) . '