WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Blocks: Include necessary labels for the 'wp_block' post type. 

Merges [43849] from the 5.0 branch to trunk.

Props danielbachhuber.
See #45098.

Built from https://develop.svn.wordpress.org/trunk@44215


git-svn-id: http://core.svn.wordpress.org/trunk@44045 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2018-12-16 01:25:52 +00:00
parent ff7b1bfe48
commit c9f8525211
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-admin/edit.php
View File

@ -311,8 +311,8 @@ $bulk_counts = array(
'untrashed' => isset( $_REQUEST['untrashed'] ) ? absint( $_REQUEST['untrashed'] ) : 0, 'untrashed' => isset( $_REQUEST['untrashed'] ) ? absint( $_REQUEST['untrashed'] ) : 0,
); );
$bulk_messages = array(); $bulk_messages = array();
$bulk_messages['post'] = array( $bulk_messages['post'] = array(
'updated' => _n( '%s post updated.', '%s posts updated.', $bulk_counts['updated'] ), 'updated' => _n( '%s post updated.', '%s posts updated.', $bulk_counts['updated'] ),
'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) : 'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) :
_n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ), _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
@ -320,7 +320,7 @@ $bulk_messages['post'] = array(
'trashed' => _n( '%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed'] ), 'trashed' => _n( '%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed'] ),
'untrashed' => _n( '%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed'] ), 'untrashed' => _n( '%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed'] ),
); );
$bulk_messages['page'] = array( $bulk_messages['page'] = array(
'updated' => _n( '%s page updated.', '%s pages updated.', $bulk_counts['updated'] ), 'updated' => _n( '%s page updated.', '%s pages updated.', $bulk_counts['updated'] ),
'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) : 'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) :
_n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ), _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
@ -328,6 +328,13 @@ $bulk_messages['page'] = array(
'trashed' => _n( '%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed'] ), 'trashed' => _n( '%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed'] ),
'untrashed' => _n( '%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed'] ), 'untrashed' => _n( '%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed'] ),
); );
$bulk_messages['wp_block'] = array(
'updated' => _n( '%s block updated.', '%s blocks updated.', $bulk_counts['updated'] ),
'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 block not updated, somebody is editing it.' ) : _n( '%s block not updated, somebody is editing it.', '%s blocks not updated, somebody is editing them.', $bulk_counts['locked'] ),
'deleted' => _n( '%s block permanently deleted.', '%s blocks permanently deleted.', $bulk_counts['deleted'] ),
'trashed' => _n( '%s block moved to the Trash.', '%s blocks moved to the Trash.', $bulk_counts['trashed'] ),
'untrashed' => _n( '%s block restored from the Trash.', '%s blocks restored from the Trash.', $bulk_counts['untrashed'] ),
);
/** /**
* Filters the bulk action updated messages. * Filters the bulk action updated messages.

24
wp-includes/post.php
View File

@ -256,9 +256,27 @@ function create_initial_post_types() {
'wp_block', 'wp_block',
array( array(
'labels' => array( 'labels' => array(
'name' => __( 'Blocks' ), 'name' => _x( 'Blocks', 'post type general name' ),
'singular_name' => __( 'Block' ), 'singular_name' => _x( 'Block', 'post type singular name' ),
'search_items' => __( 'Search Blocks' ), 'menu_name' => _x( 'Blocks', 'admin menu' ),
'name_admin_bar' => _x( 'Block', 'add new on admin bar' ),
'add_new' => _x( 'Add New', 'Block' ),
'add_new_item' => __( 'Add New Block' ),
'new_item' => __( 'New Block' ),
'edit_item' => __( 'Edit Block' ),
'view_item' => __( 'View Block' ),
'all_items' => __( 'All Blocks' ),
'search_items' => __( 'Search Blocks' ),
'not_found' => __( 'No blocks found.' ),
'not_found_in_trash' => __( 'No blocks found in Trash.' ),
'filter_items_list' => __( 'Filter blocks list' ),
'items_list_navigation' => __( 'Blocks list navigation' ),
'items_list' => __( 'Blocks list' ),
'item_published' => __( 'Block published.' ),
'item_published_privately' => __( 'Block published privately.' ),
'item_reverted_to_draft' => __( 'Block reverted to draft.' ),
'item_scheduled' => __( 'Block scheduled.' ),
'item_updated' => __( 'Block updated.' ),
), ),
'public' => false, 'public' => false,
'_builtin' => true, /* internal use only. don't use this when registering your own post type. */ '_builtin' => true, /* internal use only. don't use this when registering your own post type. */

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.1-alpha-44214'; $wp_version = '5.1-alpha-44215';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.