Changeset 26725

Timestamp:

12/06/2013 02:36:07 PM (10 years ago)

Author:

nacin

Message:

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

see #21442.

Location:

trunk/src

Files:

• wp-admin/css/wp-admin.css (modified) (1 diff)
• wp-admin/themes.php (modified) (1 diff)
• wp-includes/class-wp-theme.php (modified) (2 diffs)

trunk/src/wp-admin/css/wp-admin.css

@@ -7007 +7007 @@
     margin: 30px 0 0 0;
     padding-top: 20px;
-    text-transform: capitalize;
 }
 

trunk/src/wp-admin/themes.php

@@ -290 +290 @@
 
                 <# if ( data.tags ) { #>
-                    <p class="theme-tags">
-                        <span><?php _e( 'Tags:' ); ?></span>
-                        {{{ data.tags.replace( /-/g, ' ' ) }}}
-                    </p>
+                    <p class="theme-tags"><span><?php _e( 'Tags:' ); ?></span> {{{ data.tags }}}</p>
                 <# } #>
             </div>

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

@@ -45 +45 @@
         'twentythirteen' => 'Twenty Thirteen',
         'twentyfourteen' => 'Twenty Fourteen',
+    );
+
+    /**
+     * Renamed theme tags.
+     */
+    private static $tag_map = array(
+        'fixed-width'    => 'fixed-layout',
+        'flexible-width' => 'fluid-layout',
     );
 
@@ -707 +715 @@
 
                 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 ] ];
+                    }
                 }