Various twentyten i18n fixes. Props zeo, dimadin. Fixes #13198

git-svn-id: http://svn.automattic.com/wordpress/trunk@14544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nbachiyski 2010-05-10 20:30:58 +00:00
parent c05b99ed95
commit 41d8837397
5 changed files with 24 additions and 15 deletions

View File

@ -20,16 +20,17 @@
<?php the_post(); ?>
<h1 class="page-title">
<?php if ( is_day() ) : ?>
<h1 class="page-title"><?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ); ?></h1>
<?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ); ?>
<?php elseif ( is_month() ) : ?>
<h1 class="page-title"><?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date('F Y') ); ?></h1>
<?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date('F Y') ); ?>
<?php elseif ( is_year() ) : ?>
<h1 class="page-title"><?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date('Y') ); ?></h1>
<?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date('Y') ); ?>
<?php else : ?>
<h1 class="page-title"><?php _e( 'Blog Archives', 'twentyten' ); ?></h1>
<?php _e( 'Blog Archives', 'twentyten' ); ?>
<?php endif; ?>
</h1>
<?php rewind_posts(); ?>
<?php
/* Run the loop for the archives page to output the posts.

View File

@ -16,7 +16,12 @@
<h1 class="page-title"><?php
printf( __( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title( '', false ) . '</span>' );
?></h1>
<?php $categorydesc = category_description(); if ( ! empty( $categorydesc ) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
<?php
$categorydesc = category_description();
if ( ! empty( $categorydesc ) ) {
echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' );
}
?>
<?php
/* Run the loop for the category page to output the posts.

View File

@ -14,8 +14,8 @@
<html <?php language_attributes(); ?>>
<head>
<meta charset="<?php bloginfo( 'charset' ); ?>" />
<title><?php
// Returns the title based on the type of page being viewed
<title>
<?php
if ( is_single() ) {
single_post_title(); echo ' | '; bloginfo( 'name' );
} elseif ( is_home() || is_front_page() ) {
@ -26,13 +26,14 @@
} elseif ( is_page() ) {
single_post_title( '' ); echo ' | '; bloginfo( 'name' );
} elseif ( is_search() ) {
printf( __( 'Search results for "%s"', 'twentyten' ), get_search_query() ); twentyten_the_page_number(); echo ' | '; bloginfo( 'name' );
printf( __( 'Search results for %s', 'twentyten' ), '"'.get_search_query().'"' ); twentyten_the_page_number(); echo ' | '; bloginfo( 'name' );
} elseif ( is_404() ) {
_e( 'Not Found', 'twentyten' ); echo ' | '; bloginfo( 'name' );
} else {
wp_title( '' ); echo ' | '; bloginfo( 'name' ); twentyten_the_page_number();
}
?></title>
?>
</title>
<link rel="profile" href="http://gmpg.org/xfn/11" />
<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' ); ?>

View File

@ -38,10 +38,12 @@
<?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
</div><!-- #author-avatar -->
<div id="author-description">
<h2><?php _e( 'About ', 'twentyten' ); ?><?php the_author(); ?></h2>
<h2><?php printf( esc_attr__( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
<?php the_author_meta( 'description' ); ?>
<div id="author-link">
<a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php _e( 'View all posts by ', 'twentyten' ); ?><?php the_author(); ?> &rarr;</a>
<a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>">
<?php printf( __( 'View all posts by %s &rarr;', 'twentyten' ), get_the_author() ); ?>
</a>
</div><!-- #author-link -->
</div><!-- #author-description -->
</div><!-- .entry-author-info -->

View File

@ -15,9 +15,9 @@
<?php the_post(); ?>
<h1 class="page-title"><?php
printf( __( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title( '', false ) . '</span>' );
?></h1>
<h1 class="page-title">
<?php printf( __( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title( '', false ) . '</span>' ); ?>
</h1>
<?php rewind_posts(); ?>