Map old -width theme tags to new -layout tags for the purposes of translation in the admin.

see #21442.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26614 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/class-wp-theme.php

@@ -46,6 +46,14 @@ final class WP_Theme implements ArrayAccess {
 		'twentyfourteen' => 'Twenty Fourteen',
 	);
 
+	/**
+	 * Renamed theme tags.
+	 */
+	private static $tag_map = array(
+		'fixed-width'    => 'fixed-layout',
+		'flexible-width' => 'fluid-layout',
+	);
+
 	/**
 	 * Absolute path to the theme root, usually wp-content/themes
 	 *
@@ -706,8 +714,11 @@ final class WP_Theme implements ArrayAccess {
 				}
 
 				foreach ( $value as &$tag ) {
-					if ( isset( $tags_list[ $tag ] ) )
+					if ( isset( $tags_list[ $tag ] ) ) {
 						$tag = $tags_list[ $tag ];
+					} elseif ( isset( self::$tag_map[ $tag ] ) ) {
+						$tag = $tags_list[ self::$tag_map[ $tag ] ];
+					}
 				}
 
 				return $value;