From 41d883739782b50d7006a3e0a1bc15cff7160f9b Mon Sep 17 00:00:00 2001 From: nbachiyski Date: Mon, 10 May 2010 20:30:58 +0000 Subject: [PATCH] Various twentyten i18n fixes. Props zeo, dimadin. Fixes #13198 git-svn-id: http://svn.automattic.com/wordpress/trunk@14544 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyten/archive.php | 11 ++++++----- wp-content/themes/twentyten/category.php | 7 ++++++- wp-content/themes/twentyten/header.php | 9 +++++---- wp-content/themes/twentyten/single.php | 6 ++++-- wp-content/themes/twentyten/tag.php | 6 +++--- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/wp-content/themes/twentyten/archive.php b/wp-content/themes/twentyten/archive.php index 909c7fbd8d..cfb2556018 100644 --- a/wp-content/themes/twentyten/archive.php +++ b/wp-content/themes/twentyten/archive.php @@ -20,16 +20,17 @@ +

-

%s', 'twentyten' ), get_the_date() ); ?>

+ %s', 'twentyten' ), get_the_date() ); ?> -

%s', 'twentyten' ), get_the_date('F Y') ); ?>

+ %s', 'twentyten' ), get_the_date('F Y') ); ?> -

%s', 'twentyten' ), get_the_date('Y') ); ?>

+ %s', 'twentyten' ), get_the_date('Y') ); ?> -

+ - + ' . single_cat_title( '', false ) . '' ); ?> - ' . $categorydesc . '' ); ?> + ' . $categorydesc . '' ); + } + ?> > - <?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(); } - ?> + ?> + diff --git a/wp-content/themes/twentyten/single.php b/wp-content/themes/twentyten/single.php index 0ff069c902..e166139133 100644 --- a/wp-content/themes/twentyten/single.php +++ b/wp-content/themes/twentyten/single.php @@ -38,10 +38,12 @@
-

+

diff --git a/wp-content/themes/twentyten/tag.php b/wp-content/themes/twentyten/tag.php index eb2fba14bc..46fc968f36 100644 --- a/wp-content/themes/twentyten/tag.php +++ b/wp-content/themes/twentyten/tag.php @@ -15,9 +15,9 @@ -

' . single_tag_title( '', false ) . '' ); - ?>

+

+ ' . single_tag_title( '', false ) . '' ); ?> +