From 0aa0c763e2001585b8dc0755cc1a3940521e708e Mon Sep 17 00:00:00 2001 From: joedolson Date: Tue, 5 Sep 2023 19:26:26 +0000 Subject: [PATCH] Administration: Add improved context for `add new` links. Consistently expand `Add New` links to include the type of content to add. Improve consistency of text casing to use initial caps throughout. Props afercia, gonzomir, alexstine, swissspidy, joedolson. Fixes #47125. Built from https://develop.svn.wordpress.org/trunk@56515 git-svn-id: http://core.svn.wordpress.org/trunk@56027 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit-link-form.php | 2 +- wp-admin/includes/template.php | 2 +- wp-admin/link-manager.php | 2 +- wp-admin/menu.php | 13 +++++-------- wp-admin/my-sites.php | 2 +- wp-admin/network/menu.php | 8 ++++---- wp-admin/network/sites.php | 2 +- wp-admin/network/themes.php | 2 +- wp-admin/network/users.php | 2 +- wp-admin/plugins.php | 4 ++-- wp-admin/themes.php | 4 ++-- wp-admin/upload.php | 4 ++-- wp-admin/user-edit.php | 4 ++-- wp-admin/users.php | 4 ++-- wp-includes/class-wp-post-type.php | 2 +- ...class-wp-customize-header-image-control.php | 10 +++++----- wp-includes/post.php | 18 +++++++++--------- wp-includes/version.php | 2 +- 18 files changed, 42 insertions(+), 45 deletions(-) diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php index d205a38f31..f63f1a39b0 100644 --- a/wp-admin/edit-link-form.php +++ b/wp-admin/edit-link-form.php @@ -87,7 +87,7 @@ echo esc_html( $title ); ?> - +
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 2394fbb6f2..e794e4dda8 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -461,7 +461,7 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $ - +
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index 5f56ac7983..27389ac2fd 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -101,7 +101,7 @@ echo esc_html( $title ); ?> - + show_ui || ! $tax->show_in_menu ) { @@ -79,8 +78,7 @@ foreach ( get_taxonomies_for_attachments( 'objects' ) as $tax ) { $menu[15] = array( __( 'Links' ), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links' ); $submenu['link-manager.php'][5] = array( _x( 'All Links', 'admin menu' ), 'manage_links', 'link-manager.php' ); - /* translators: Add new links. */ - $submenu['link-manager.php'][10] = array( _x( 'Add New', 'link' ), 'manage_links', 'link-add.php' ); + $submenu['link-manager.php'][10] = array( __( 'Add New Link' ), 'manage_links', 'link-add.php' ); $submenu['link-manager.php'][15] = array( __( 'Link Categories' ), 'manage_categories', 'edit-tags.php?taxonomy=link_category' ); // $menu[20] = Pages. @@ -304,8 +302,7 @@ $menu[65] = array( sprintf( __( 'Plugins %s' ), $count ), 'activate_plugins', 'p $submenu['plugins.php'][5] = array( __( 'Installed Plugins' ), 'activate_plugins', 'plugins.php' ); if ( ! is_multisite() ) { - /* translators: Add new plugin. */ - $submenu['plugins.php'][10] = array( _x( 'Add New', 'plugin' ), 'install_plugins', 'plugin-install.php' ); + $submenu['plugins.php'][10] = array( __( 'Add New Plugin' ), 'install_plugins', 'plugin-install.php' ); if ( wp_is_block_theme() ) { // Place the menu item below the Theme File Editor menu item. add_action( 'admin_menu', '_add_plugin_file_editor_to_tools', 101 ); @@ -326,9 +323,9 @@ if ( current_user_can( 'list_users' ) ) { $_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php. $submenu['users.php'][5] = array( __( 'All Users' ), 'list_users', 'users.php' ); if ( current_user_can( 'create_users' ) ) { - $submenu['users.php'][10] = array( _x( 'Add New', 'user' ), 'create_users', 'user-new.php' ); + $submenu['users.php'][10] = array( __( 'Add New User' ), 'create_users', 'user-new.php' ); } elseif ( is_multisite() ) { - $submenu['users.php'][10] = array( _x( 'Add New', 'user' ), 'promote_users', 'user-new.php' ); + $submenu['users.php'][10] = array( __( 'Add New User' ), 'promote_users', 'user-new.php' ); } $submenu['users.php'][15] = array( __( 'Profile' ), 'read', 'profile.php' ); diff --git a/wp-admin/my-sites.php b/wp-admin/my-sites.php index 51dc1bdd26..be7f63bb76 100644 --- a/wp-admin/my-sites.php +++ b/wp-admin/my-sites.php @@ -78,7 +78,7 @@ echo esc_html( $title ); if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ), true ) ) { /** This filter is documented in wp-login.php */ $sign_up_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ); - printf( ' %s', esc_url( $sign_up_url ), esc_html_x( 'Add New', 'site' ) ); + printf( ' %s', esc_url( $sign_up_url ), esc_html__( 'Add New Site' ) ); } if ( empty( $blogs ) ) : diff --git a/wp-admin/network/menu.php b/wp-admin/network/menu.php index 99cfb20e25..73cc86b234 100644 --- a/wp-admin/network/menu.php +++ b/wp-admin/network/menu.php @@ -50,11 +50,11 @@ $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' ); /* translators: Sites menu item. */ $menu[5] = array( __( 'Sites' ), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'dashicons-admin-multisite' ); $submenu['sites.php'][5] = array( __( 'All Sites' ), 'manage_sites', 'sites.php' ); -$submenu['sites.php'][10] = array( _x( 'Add New', 'site' ), 'create_sites', 'site-new.php' ); +$submenu['sites.php'][10] = array( __( 'Add New Site' ), 'create_sites', 'site-new.php' ); $menu[10] = array( __( 'Users' ), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' ); $submenu['users.php'][5] = array( __( 'All Users' ), 'manage_network_users', 'users.php' ); -$submenu['users.php'][10] = array( _x( 'Add New', 'user' ), 'create_users', 'user-new.php' ); +$submenu['users.php'][10] = array( __( 'Add New User' ), 'create_users', 'user-new.php' ); if ( current_user_can( 'update_themes' ) && $update_data['counts']['themes'] ) { $menu[15] = array( @@ -78,7 +78,7 @@ if ( current_user_can( 'update_themes' ) && $update_data['counts']['themes'] ) { $menu[15] = array( __( 'Themes' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' ); } $submenu['themes.php'][5] = array( __( 'Installed Themes' ), 'manage_network_themes', 'themes.php' ); -$submenu['themes.php'][10] = array( _x( 'Add New', 'theme' ), 'install_themes', 'theme-install.php' ); +$submenu['themes.php'][10] = array( __( 'Add New Theme' ), 'install_themes', 'theme-install.php' ); $submenu['themes.php'][15] = array( __( 'Theme File Editor' ), 'edit_themes', 'theme-editor.php' ); if ( current_user_can( 'update_plugins' ) && $update_data['counts']['plugins'] ) { @@ -103,7 +103,7 @@ if ( current_user_can( 'update_plugins' ) && $update_data['counts']['plugins'] ) $menu[20] = array( __( 'Plugins' ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' ); } $submenu['plugins.php'][5] = array( __( 'Installed Plugins' ), 'manage_network_plugins', 'plugins.php' ); -$submenu['plugins.php'][10] = array( _x( 'Add New', 'plugin' ), 'install_plugins', 'plugin-install.php' ); +$submenu['plugins.php'][10] = array( __( 'Add New Plugin' ), 'install_plugins', 'plugin-install.php' ); $submenu['plugins.php'][15] = array( __( 'Plugin File Editor' ), 'edit_plugins', 'plugin-editor.php' ); $menu[25] = array( __( 'Settings' ), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' ); diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php index 7ba3ec55ff..402c047312 100644 --- a/wp-admin/network/sites.php +++ b/wp-admin/network/sites.php @@ -378,7 +378,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php';

- + - + - + add_help_tab( '

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

' . '

' . sprintf( /* translators: %s: WordPress Plugin Directory URL. */ - __( 'If you would like to see more plugins to choose from, click on the “Add New” button and you will be able to browse or search for additional plugins from the WordPress Plugin Directory. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ), + __( 'If you would like to see more plugins to choose from, click on the “Add New Plugin” button and you will be able to browse or search for additional plugins from the WordPress Plugin Directory. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ), __( 'https://wordpress.org/plugins/' ) ) . '

', ) @@ -726,7 +726,7 @@ echo esc_html( $title ); - + ' . sprintf( /* translators: %s: https://wordpress.org/themes/ */ - __( 'If you would like to see more themes to choose from, click on the “Add New” button and you will be able to browse or search for additional themes from the WordPress Theme Directory. Themes in the WordPress Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ), + __( 'If you would like to see more themes to choose from, click on the “Add New Theme” button and you will be able to browse or search for additional themes from the WordPress Theme Directory. Themes in the WordPress Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ), __( 'https://wordpress.org/themes/' ) ) . '

'; } @@ -252,7 +252,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php'; - +
diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 29a8c4de8d..13b54c5840 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -211,7 +211,7 @@ if ( 'grid' === $mode ) { - + @@ -409,7 +409,7 @@ require_once ABSPATH . 'wp-admin/admin-header.php'; - + - + - + diff --git a/wp-admin/users.php b/wp-admin/users.php index 2c635c543a..ec8886b61b 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -694,13 +694,13 @@ switch ( $wp_list_table->current_action() ) { printf( '%2$s', esc_url( admin_url( 'user-new.php' ) ), - esc_html_x( 'Add New', 'user' ) + esc_html__( 'Add New User' ) ); } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { printf( '%2$s', esc_url( admin_url( 'user-new.php' ) ), - esc_html_x( 'Add Existing', 'user' ) + esc_html__( 'Add Existing User' ) ); } diff --git a/wp-includes/class-wp-post-type.php b/wp-includes/class-wp-post-type.php index 42b413254c..ce6d9d348b 100644 --- a/wp-includes/class-wp-post-type.php +++ b/wp-includes/class-wp-post-type.php @@ -831,7 +831,7 @@ final class WP_Post_Type { self::$default_labels = array( 'name' => array( _x( 'Posts', 'post type general name' ), _x( 'Pages', 'post type general name' ) ), 'singular_name' => array( _x( 'Post', 'post type singular name' ), _x( 'Page', 'post type singular name' ) ), - 'add_new' => array( _x( 'Add New', 'post' ), _x( 'Add New', 'page' ) ), + 'add_new' => array( __( 'Add New Post' ), __( 'Add New Page' ) ), 'add_new_item' => array( __( 'Add New Post' ), __( 'Add New Page' ) ), 'edit_item' => array( __( 'Edit Post' ), __( 'Edit Page' ) ), 'new_item' => array( __( 'New Post' ), __( 'New Page' ) ), diff --git a/wp-includes/customize/class-wp-customize-header-image-control.php b/wp-includes/customize/class-wp-customize-header-image-control.php index 0ea73d5a0b..0c8cc0e21e 100644 --- a/wp-includes/customize/class-wp-customize-header-image-control.php +++ b/wp-includes/customize/class-wp-customize-header-image-control.php @@ -213,23 +213,23 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {

%s × %s', $width, $height ) ); } elseif ( $width ) { printf( /* translators: %s: Header width in pixels. */ - __( 'Click “Add new image” to upload an image file from your computer. Your theme works best with an image with a header width of %s pixels — you’ll be able to crop your image once you upload it for a perfect fit.' ), + __( 'Click “Add New Image” to upload an image file from your computer. Your theme works best with an image with a header width of %s pixels — you’ll be able to crop your image once you upload it for a perfect fit.' ), sprintf( '%s', $width ) ); } else { printf( /* translators: %s: Header height in pixels. */ - __( 'Click “Add new image” to upload an image file from your computer. Your theme works best with an image with a header height of %s pixels — you’ll be able to crop your image once you upload it for a perfect fit.' ), + __( 'Click “Add New Image” to upload an image file from your computer. Your theme works best with an image with a header height of %s pixels — you’ll be able to crop your image once you upload it for a perfect fit.' ), sprintf( '%s', $height ) ); } @@ -247,7 +247,7 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {

- +
diff --git a/wp-includes/post.php b/wp-includes/post.php index f71a0a061d..34caabea0a 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -75,7 +75,7 @@ function create_initial_post_types() { 'labels' => array( 'name' => _x( 'Media', 'post type general name' ), 'name_admin_bar' => _x( 'Media', 'add new from admin bar' ), - 'add_new' => _x( 'Add New', 'file' ), + 'add_new' => __( 'Add New Media File' ), 'edit_item' => __( 'Edit Media' ), 'view_item' => __( 'View Attachment Page' ), 'attributes' => __( 'Attachment Attributes' ), @@ -202,7 +202,7 @@ function create_initial_post_types() { 'labels' => array( 'name' => _x( 'Changesets', 'post type general name' ), 'singular_name' => _x( 'Changeset', 'post type singular name' ), - 'add_new' => _x( 'Add New', 'Customize Changeset' ), + 'add_new' => __( 'Add New Changeset' ), 'add_new_item' => __( 'Add New Changeset' ), 'new_item' => __( 'New Changeset' ), 'edit_item' => __( 'Edit Changeset' ), @@ -284,8 +284,8 @@ function create_initial_post_types() { 'labels' => array( 'name' => _x( 'Patterns', 'post type general name' ), 'singular_name' => _x( 'Pattern', 'post type singular name' ), - 'add_new' => _x( 'Add New', 'Pattern' ), - 'add_new_item' => __( 'Add new Pattern' ), + 'add_new' => __( 'Add New Pattern' ), + 'add_new_item' => __( 'Add New Pattern' ), 'new_item' => __( 'New Pattern' ), 'edit_item' => __( 'Edit Block Pattern' ), 'view_item' => __( 'View Pattern' ), @@ -347,7 +347,7 @@ function create_initial_post_types() { 'labels' => array( 'name' => _x( 'Templates', 'post type general name' ), 'singular_name' => _x( 'Template', 'post type singular name' ), - 'add_new' => _x( 'Add New', 'Template' ), + 'add_new' => __( 'Add New Template' ), 'add_new_item' => __( 'Add New Template' ), 'new_item' => __( 'New Template' ), 'edit_item' => __( 'Edit Template' ), @@ -408,7 +408,7 @@ function create_initial_post_types() { 'labels' => array( 'name' => _x( 'Template Parts', 'post type general name' ), 'singular_name' => _x( 'Template Part', 'post type singular name' ), - 'add_new' => _x( 'Add New', 'Template Part' ), + 'add_new' => __( 'Add New Template Part' ), 'add_new_item' => __( 'Add New Template Part' ), 'new_item' => __( 'New Template Part' ), 'edit_item' => __( 'Edit Template Part' ), @@ -505,7 +505,7 @@ function create_initial_post_types() { 'labels' => array( 'name' => _x( 'Navigation Menus', 'post type general name' ), 'singular_name' => _x( 'Navigation Menu', 'post type singular name' ), - 'add_new' => _x( 'Add New', 'Navigation Menu' ), + 'add_new' => __( 'Add New Navigation Menu' ), 'add_new_item' => __( 'Add New Navigation Menu' ), 'new_item' => __( 'New Navigation Menu' ), 'edit_item' => __( 'Edit Navigation Menu' ), @@ -1931,9 +1931,9 @@ function _post_type_meta_capabilities( $capabilities = null ) { * - `name` - General name for the post type, usually plural. The same and overridden * by `$post_type_object->label`. Default is 'Posts' / 'Pages'. * - `singular_name` - Name for one object of this post type. Default is 'Post' / 'Page'. - * - `add_new` - Default is 'Add New' for both hierarchical and non-hierarchical types. + * - `add_new` - Default is 'Add New Type' for both hierarchical and non-hierarchical types. * When internationalizing this string, please use a {@link https://developer.wordpress.org/plugins/internationalization/how-to-internationalize-your-plugin/#disambiguation-by-context gettext context} - * matching your post type. Example: `_x( 'Add New', 'product', 'textdomain' );`. + * matching your post type. Example: `__( 'Add New Product', 'textdomain' );`. * - `add_new_item` - Label for adding a new singular item. Default is 'Add New Post' / 'Add New Page'. * - `edit_item` - Label for editing a singular item. Default is 'Edit Post' / 'Edit Page'. * - `new_item` - Label for the new item page title. Default is 'New Post' / 'New Page'. diff --git a/wp-includes/version.php b/wp-includes/version.php index 88bd04a910..1295ba58fc 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.4-alpha-56514'; +$wp_version = '6.4-alpha-56515'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.