diff --git a/wp-includes/class-wp-post-type.php b/wp-includes/class-wp-post-type.php index ef40f4ec90..b5e4caa14c 100644 --- a/wp-includes/class-wp-post-type.php +++ b/wp-includes/class-wp-post-type.php @@ -44,6 +44,14 @@ final class WP_Post_Type { */ public $labels; + /** + * Default labels. + * + * @since 6.0.0 + * @var (string|null)[][] $default_labels + */ + protected static $default_labels = array(); + /** * A short descriptive summary of what the post type is. * @@ -785,4 +793,69 @@ final class WP_Post_Type { return $this->rest_controller; } + + /** + * Returns the default labels for post types. + * + * @since 6.0.0 + * + * @return (string|null)[][] The default labels for post types. + */ + public static function get_default_labels() { + if ( ! empty( self::$default_labels ) ) { + return self::$default_labels; + } + + 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_item' => array( __( 'Add New Post' ), __( 'Add New Page' ) ), + 'edit_item' => array( __( 'Edit Post' ), __( 'Edit Page' ) ), + 'new_item' => array( __( 'New Post' ), __( 'New Page' ) ), + 'view_item' => array( __( 'View Post' ), __( 'View Page' ) ), + 'view_items' => array( __( 'View Posts' ), __( 'View Pages' ) ), + 'search_items' => array( __( 'Search Posts' ), __( 'Search Pages' ) ), + 'not_found' => array( __( 'No posts found.' ), __( 'No pages found.' ) ), + 'not_found_in_trash' => array( __( 'No posts found in Trash.' ), __( 'No pages found in Trash.' ) ), + 'parent_item_colon' => array( null, __( 'Parent Page:' ) ), + 'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) ), + 'archives' => array( __( 'Post Archives' ), __( 'Page Archives' ) ), + 'attributes' => array( __( 'Post Attributes' ), __( 'Page Attributes' ) ), + 'insert_into_item' => array( __( 'Insert into post' ), __( 'Insert into page' ) ), + 'uploaded_to_this_item' => array( __( 'Uploaded to this post' ), __( 'Uploaded to this page' ) ), + 'featured_image' => array( _x( 'Featured image', 'post' ), _x( 'Featured image', 'page' ) ), + 'set_featured_image' => array( _x( 'Set featured image', 'post' ), _x( 'Set featured image', 'page' ) ), + 'remove_featured_image' => array( _x( 'Remove featured image', 'post' ), _x( 'Remove featured image', 'page' ) ), + 'use_featured_image' => array( _x( 'Use as featured image', 'post' ), _x( 'Use as featured image', 'page' ) ), + 'filter_items_list' => array( __( 'Filter posts list' ), __( 'Filter pages list' ) ), + 'filter_by_date' => array( __( 'Filter by date' ), __( 'Filter by date' ) ), + 'items_list_navigation' => array( __( 'Posts list navigation' ), __( 'Pages list navigation' ) ), + 'items_list' => array( __( 'Posts list' ), __( 'Pages list' ) ), + 'item_published' => array( __( 'Post published.' ), __( 'Page published.' ) ), + 'item_published_privately' => array( __( 'Post published privately.' ), __( 'Page published privately.' ) ), + 'item_reverted_to_draft' => array( __( 'Post reverted to draft.' ), __( 'Page reverted to draft.' ) ), + 'item_scheduled' => array( __( 'Post scheduled.' ), __( 'Page scheduled.' ) ), + 'item_updated' => array( __( 'Post updated.' ), __( 'Page updated.' ) ), + 'item_link' => array( + _x( 'Post Link', 'navigation link block title' ), + _x( 'Page Link', 'navigation link block title' ), + ), + 'item_link_description' => array( + _x( 'A link to a post.', 'navigation link block description' ), + _x( 'A link to a page.', 'navigation link block description' ), + ), + ); + + return self::$default_labels; + } + + /** + * Resets the cache for the default labels. + * + * @since 6.0.0 + */ + public static function reset_default_labels() { + self::$default_labels = array(); + } } diff --git a/wp-includes/class-wp-taxonomy.php b/wp-includes/class-wp-taxonomy.php index 81dc0bd407..27b04d952b 100644 --- a/wp-includes/class-wp-taxonomy.php +++ b/wp-includes/class-wp-taxonomy.php @@ -42,6 +42,14 @@ final class WP_Taxonomy { */ public $labels; + /** + * Default labels. + * + * @since 6.0.0 + * @var (string|null)[][] $default_labels + */ + protected static $default_labels = array(); + /** * A short descriptive summary of what the taxonomy is for. * @@ -562,4 +570,71 @@ final class WP_Taxonomy { return $this->rest_controller; } + + /** + * Returns the default labels for taxonomies. + * + * @since 6.0.0 + * + * @return (string|null)[][] The default labels for taxonomies. + */ + public static function get_default_labels() { + if ( ! empty( self::$default_labels ) ) { + return self::$default_labels; + } + + $name_field_description = __( 'The name is how it appears on your site.' ); + $slug_field_description = __( 'The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ); + $parent_field_description = __( 'Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.' ); + $desc_field_description = __( 'The description is not prominent by default; however, some themes may show it.' ); + + self::$default_labels = array( + 'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ), + 'singular_name' => array( _x( 'Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ), + 'search_items' => array( __( 'Search Tags' ), __( 'Search Categories' ) ), + 'popular_items' => array( __( 'Popular Tags' ), null ), + 'all_items' => array( __( 'All Tags' ), __( 'All Categories' ) ), + 'parent_item' => array( null, __( 'Parent Category' ) ), + 'parent_item_colon' => array( null, __( 'Parent Category:' ) ), + 'name_field_description' => array( $name_field_description, $name_field_description ), + 'slug_field_description' => array( $slug_field_description, $slug_field_description ), + 'parent_field_description' => array( null, $parent_field_description ), + 'desc_field_description' => array( $desc_field_description, $desc_field_description ), + 'edit_item' => array( __( 'Edit Tag' ), __( 'Edit Category' ) ), + 'view_item' => array( __( 'View Tag' ), __( 'View Category' ) ), + 'update_item' => array( __( 'Update Tag' ), __( 'Update Category' ) ), + 'add_new_item' => array( __( 'Add New Tag' ), __( 'Add New Category' ) ), + 'new_item_name' => array( __( 'New Tag Name' ), __( 'New Category Name' ) ), + 'separate_items_with_commas' => array( __( 'Separate tags with commas' ), null ), + 'add_or_remove_items' => array( __( 'Add or remove tags' ), null ), + 'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ), + 'not_found' => array( __( 'No tags found.' ), __( 'No categories found.' ) ), + 'no_terms' => array( __( 'No tags' ), __( 'No categories' ) ), + 'filter_by_item' => array( null, __( 'Filter by category' ) ), + 'items_list_navigation' => array( __( 'Tags list navigation' ), __( 'Categories list navigation' ) ), + 'items_list' => array( __( 'Tags list' ), __( 'Categories list' ) ), + /* translators: Tab heading when selecting from the most used terms. */ + 'most_used' => array( _x( 'Most Used', 'tags' ), _x( 'Most Used', 'categories' ) ), + 'back_to_items' => array( __( '← Go to Tags' ), __( '← Go to Categories' ) ), + 'item_link' => array( + _x( 'Tag Link', 'navigation link block title' ), + _x( 'Category Link', 'navigation link block title' ), + ), + 'item_link_description' => array( + _x( 'A link to a tag.', 'navigation link block description' ), + _x( 'A link to a category.', 'navigation link block description' ), + ), + ); + + return self::$default_labels; + } + + /** + * Resets the cache for the default labels. + * + * @since 6.0.0 + */ + public static function reset_default_labels() { + self::$default_labels = array(); + } } diff --git a/wp-includes/post.php b/wp-includes/post.php index 182031cf99..67704e9fd7 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -18,6 +18,8 @@ * @since 2.9.0 */ function create_initial_post_types() { + WP_Post_Type::reset_default_labels(); + register_post_type( 'post', array( @@ -1955,46 +1957,7 @@ function _post_type_meta_capabilities( $capabilities = null ) { * @return object Object with all the labels as member variables. */ function get_post_type_labels( $post_type_object ) { - $nohier_vs_hier_defaults = 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_item' => array( __( 'Add New Post' ), __( 'Add New Page' ) ), - 'edit_item' => array( __( 'Edit Post' ), __( 'Edit Page' ) ), - 'new_item' => array( __( 'New Post' ), __( 'New Page' ) ), - 'view_item' => array( __( 'View Post' ), __( 'View Page' ) ), - 'view_items' => array( __( 'View Posts' ), __( 'View Pages' ) ), - 'search_items' => array( __( 'Search Posts' ), __( 'Search Pages' ) ), - 'not_found' => array( __( 'No posts found.' ), __( 'No pages found.' ) ), - 'not_found_in_trash' => array( __( 'No posts found in Trash.' ), __( 'No pages found in Trash.' ) ), - 'parent_item_colon' => array( null, __( 'Parent Page:' ) ), - 'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) ), - 'archives' => array( __( 'Post Archives' ), __( 'Page Archives' ) ), - 'attributes' => array( __( 'Post Attributes' ), __( 'Page Attributes' ) ), - 'insert_into_item' => array( __( 'Insert into post' ), __( 'Insert into page' ) ), - 'uploaded_to_this_item' => array( __( 'Uploaded to this post' ), __( 'Uploaded to this page' ) ), - 'featured_image' => array( _x( 'Featured image', 'post' ), _x( 'Featured image', 'page' ) ), - 'set_featured_image' => array( _x( 'Set featured image', 'post' ), _x( 'Set featured image', 'page' ) ), - 'remove_featured_image' => array( _x( 'Remove featured image', 'post' ), _x( 'Remove featured image', 'page' ) ), - 'use_featured_image' => array( _x( 'Use as featured image', 'post' ), _x( 'Use as featured image', 'page' ) ), - 'filter_items_list' => array( __( 'Filter posts list' ), __( 'Filter pages list' ) ), - 'filter_by_date' => array( __( 'Filter by date' ), __( 'Filter by date' ) ), - 'items_list_navigation' => array( __( 'Posts list navigation' ), __( 'Pages list navigation' ) ), - 'items_list' => array( __( 'Posts list' ), __( 'Pages list' ) ), - 'item_published' => array( __( 'Post published.' ), __( 'Page published.' ) ), - 'item_published_privately' => array( __( 'Post published privately.' ), __( 'Page published privately.' ) ), - 'item_reverted_to_draft' => array( __( 'Post reverted to draft.' ), __( 'Page reverted to draft.' ) ), - 'item_scheduled' => array( __( 'Post scheduled.' ), __( 'Page scheduled.' ) ), - 'item_updated' => array( __( 'Post updated.' ), __( 'Page updated.' ) ), - 'item_link' => array( - _x( 'Post Link', 'navigation link block title' ), - _x( 'Page Link', 'navigation link block title' ), - ), - 'item_link_description' => array( - _x( 'A link to a post.', 'navigation link block description' ), - _x( 'A link to a page.', 'navigation link block description' ), - ), - ); + $nohier_vs_hier_defaults = WP_Post_Type::get_default_labels(); $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name']; diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 663c9bfe25..2f3298e142 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -25,6 +25,8 @@ function create_initial_taxonomies() { global $wp_rewrite; + WP_Taxonomy::reset_default_labels(); + if ( ! did_action( 'init' ) ) { $rewrite = array( 'category' => false, @@ -659,48 +661,7 @@ function get_taxonomy_labels( $tax ) { $tax->labels['not_found'] = $tax->no_tagcloud; } - $name_field_description = __( 'The name is how it appears on your site.' ); - $slug_field_description = __( 'The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ); - $parent_field_description = __( 'Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.' ); - $desc_field_description = __( 'The description is not prominent by default; however, some themes may show it.' ); - - $nohier_vs_hier_defaults = array( - 'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ), - 'singular_name' => array( _x( 'Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ), - 'search_items' => array( __( 'Search Tags' ), __( 'Search Categories' ) ), - 'popular_items' => array( __( 'Popular Tags' ), null ), - 'all_items' => array( __( 'All Tags' ), __( 'All Categories' ) ), - 'parent_item' => array( null, __( 'Parent Category' ) ), - 'parent_item_colon' => array( null, __( 'Parent Category:' ) ), - 'name_field_description' => array( $name_field_description, $name_field_description ), - 'slug_field_description' => array( $slug_field_description, $slug_field_description ), - 'parent_field_description' => array( null, $parent_field_description ), - 'desc_field_description' => array( $desc_field_description, $desc_field_description ), - 'edit_item' => array( __( 'Edit Tag' ), __( 'Edit Category' ) ), - 'view_item' => array( __( 'View Tag' ), __( 'View Category' ) ), - 'update_item' => array( __( 'Update Tag' ), __( 'Update Category' ) ), - 'add_new_item' => array( __( 'Add New Tag' ), __( 'Add New Category' ) ), - 'new_item_name' => array( __( 'New Tag Name' ), __( 'New Category Name' ) ), - 'separate_items_with_commas' => array( __( 'Separate tags with commas' ), null ), - 'add_or_remove_items' => array( __( 'Add or remove tags' ), null ), - 'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ), - 'not_found' => array( __( 'No tags found.' ), __( 'No categories found.' ) ), - 'no_terms' => array( __( 'No tags' ), __( 'No categories' ) ), - 'filter_by_item' => array( null, __( 'Filter by category' ) ), - 'items_list_navigation' => array( __( 'Tags list navigation' ), __( 'Categories list navigation' ) ), - 'items_list' => array( __( 'Tags list' ), __( 'Categories list' ) ), - /* translators: Tab heading when selecting from the most used terms. */ - 'most_used' => array( _x( 'Most Used', 'tags' ), _x( 'Most Used', 'categories' ) ), - 'back_to_items' => array( __( '← Go to Tags' ), __( '← Go to Categories' ) ), - 'item_link' => array( - _x( 'Tag Link', 'navigation link block title' ), - _x( 'Category Link', 'navigation link block title' ), - ), - 'item_link_description' => array( - _x( 'A link to a tag.', 'navigation link block description' ), - _x( 'A link to a category.', 'navigation link block description' ), - ), - ); + $nohier_vs_hier_defaults = WP_Taxonomy::get_default_labels(); $nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name']; diff --git a/wp-includes/version.php b/wp-includes/version.php index 30fae2af01..8c57dfd69d 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-alpha-53057'; +$wp_version = '6.0-alpha-53058'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.