From 65dfce752e23b4130d5797066552af2be388eff1 Mon Sep 17 00:00:00 2001
From: Robert Anderson <noisysocks@git.wordpress.org>
Date: Tue, 23 Jun 2020 00:13:29 +0000
Subject: [PATCH] Editor: Revert [48119].

This commit caused the majority of blocks in the block editor to no longer
register as they reference the old category names.

See #50278.


git-svn-id: https://develop.svn.wordpress.org/trunk@48130 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/post.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/wp-admin/includes/post.php b/src/wp-admin/includes/post.php
index 907f92b46a..e4d919866c 100644
--- a/src/wp-admin/includes/post.php
+++ b/src/wp-admin/includes/post.php
@@ -2179,33 +2179,33 @@ function use_block_editor_for_post_type( $post_type ) {
 function get_block_categories( $post ) {
 	$default_categories = array(
 		array(
-			'slug'  => 'text',
-			'title' => _x( 'Text', 'block category' ),
+			'slug'  => 'common',
+			'title' => __( 'Common Blocks' ),
 			'icon'  => null,
 		),
 		array(
-			'slug'  => 'media',
-			'title' => _x( 'Media', 'block category' ),
+			'slug'  => 'formatting',
+			'title' => __( 'Formatting' ),
 			'icon'  => null,
 		),
 		array(
-			'slug'  => 'design',
-			'title' => _x( 'Design', 'block category' ),
+			'slug'  => 'layout',
+			'title' => __( 'Layout Elements' ),
 			'icon'  => null,
 		),
 		array(
 			'slug'  => 'widgets',
-			'title' => _x( 'Widgets', 'block category' ),
+			'title' => __( 'Widgets' ),
 			'icon'  => null,
 		),
 		array(
 			'slug'  => 'embed',
-			'title' => _x( 'Embeds', 'block category' ),
+			'title' => __( 'Embeds' ),
 			'icon'  => null,
 		),
 		array(
 			'slug'  => 'reusable',
-			'title' => _x( 'Reusable Blocks', 'block category' ),
+			'title' => __( 'Reusable Blocks' ),
 			'icon'  => null,
 		),
 	);