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

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
This commit is contained in:
Andrew Nacin 2013-12-06 14:37:10 +00:00
parent b9bbf2e814
commit 9ecfa135d8
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/css/wp-admin-rtl.css
View File

@ -7006,7 +7006,6 @@ body.folded .theme-overlay .theme-wrap {
font-weight: 400;
margin: 30px 0 0 0;
padding-top: 20px;
text-transform: capitalize;
}
.theme-overlay .theme-tags span {

2
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
wp-admin/css/wp-admin.css
View File

@ -7006,7 +7006,6 @@ body.folded .theme-overlay .theme-wrap {
font-weight: 400;
margin: 30px 0 0 0;
padding-top: 20px;
text-transform: capitalize;
}
.theme-overlay .theme-tags span {

2
wp-admin/css/wp-admin.min.css vendored
View File

File diff suppressed because one or more lines are too long

5
wp-admin/themes.php
View File

@ -289,10 +289,7 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_
<# } #>
<# 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>
</div>

13
wp-includes/class-wp-theme.php
View File

@ -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;