Changeset 53058

Timestamp:

04/04/2022 03:48:08 AM (2 years ago)

Author:

peterwilsoncc

Message:

Posts, Post Types; Taxonomy: Translate default labels once.

Improve the translation of post type and taxonomy labels by caching the translations during runtime. To account for internationalisation plugins, the runtime cache is cleared as the post types/taxonomies are reinitiated on change_local hook.

The same property and methods are added to both WP_Post_Type and WP_Taxonomy:

• $default_labels: for storing the translated strings at runtime
• get_default_labels(): for getting the default labels, these are translated on the first run and stored in the new property.
• reset_default_labels(): to clear the runtime cache and force a re-translation of the default labels

Props Chouby, nacin, SergeyBiryukov, Rarst, chriscct7, ocean90, audrasjb, costdev.
Fixes #26746.

Location:

trunk/src/wp-includes

Files:

• class-wp-post-type.php (modified) (2 diffs)
• class-wp-taxonomy.php (modified) (2 diffs)
• post.php (modified) (2 diffs)
• taxonomy.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-post-type.php

@@ -44 +44 @@
      */
     public $labels;
+
+
+
+
+
+
+
+
 
     /**
@@ -786 +794 @@
         return $this->rest_controller;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/src/wp-includes/class-wp-taxonomy.php

@@ -42 +42 @@
      */
     public $labels;
+
+
+
+
+
+
+
+
 
     /**
@@ -563 +571 @@
         return $this->rest_controller;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/src/wp-includes/post.php

@@ -19 +19 @@
  */
 function create_initial_post_types() {
+
+
     register_post_type(
         'post',
@@ -1956 +1958 @@
  */
 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'];

trunk/src/wp-includes/taxonomy.php

@@ -25 +25 @@
 function create_initial_taxonomies() {
     global $wp_rewrite;
+
+
 
     if ( ! did_action( 'init' ) ) {
@@ -660 +662 @@
     }
 
-    $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'];