I18n fixes for header.php in Twentyten. Props zeo. See #13198

git-svn-id: http://svn.automattic.com/wordpress/trunk@14535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nbachiyski 2010-05-10 06:04:14 +00:00
parent 25e4c70b5d
commit d4e3352f1e
1 changed files with 8 additions and 8 deletions

View File

@ -35,7 +35,7 @@
?></title> ?></title>
<link rel="profile" href="http://gmpg.org/xfn/11" /> <link rel="profile" href="http://gmpg.org/xfn/11" />
<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" /> <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
<?php if ( is_singular() && get_option('thread_comments') ) wp_enqueue_script( 'comment-reply' ); ?> <?php if ( is_singular() && get_option( 'thread_comments' ) ) wp_enqueue_script( 'comment-reply' ); ?>
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" /> <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
<?php wp_head(); ?> <?php wp_head(); ?>
</head> </head>
@ -45,19 +45,19 @@
<div id="header"> <div id="header">
<div id="masthead"> <div id="masthead">
<div id="branding"> <div id="branding">
<?php if ( is_home() || is_front_page() ) { ?> <?php $heading_tag = ( is_home() || is_front_page() )? 'h1' : 'div'; ?>
<h1 id="site-title"><span><a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></h1> <<?php echo $heading_tag; ?> id="site-title">
<?php } else { ?> <span>
<div id="site-title"><span><a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></div> <a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
<?php } ?> </span>
</<?php echo $heading_tag; ?>>
<div id="site-description"><?php bloginfo( 'description' ); ?></div> <div id="site-description"><?php bloginfo( 'description' ); ?></div>
<?php <?php
// Check if this is a post or page, if it has a thumbnail, and if it's a big one // Check if this is a post or page, if it has a thumbnail, and if it's a big one
if ( is_singular() && if ( is_singular() &&
has_post_thumbnail( $post->ID ) && has_post_thumbnail( $post->ID ) &&
( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail') ) && ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail' ) ) &&
$image[1] >= HEADER_IMAGE_WIDTH ) : $image[1] >= HEADER_IMAGE_WIDTH ) :
// Houston, we have a new header image! // Houston, we have a new header image!
echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' ); echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );