<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14544] trunk/wp-content/themes/twentyten: Various twentyten i18n fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14544">14544</a></dd>
<dt>Author</dt> <dd>nbachiyski</dd>
<dt>Date</dt> <dd>2010-05-10 20:30:58 +0000 (Mon, 10 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Various twentyten i18n fixes. Props zeo, dimadin. Fixes <a href="http://trac.wordpress.org/ticket/13198">#13198</a> </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenarchivephp">trunk/wp-content/themes/twentyten/archive.php</a></li>
<li><a href="#trunkwpcontentthemestwentytencategoryphp">trunk/wp-content/themes/twentyten/category.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenheaderphp">trunk/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensinglephp">trunk/wp-content/themes/twentyten/single.php</a></li>
<li><a href="#trunkwpcontentthemestwentytentagphp">trunk/wp-content/themes/twentyten/tag.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/archive.php (14543 => 14544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/archive.php 2010-05-10 20:22:01 UTC (rev 14543)
+++ trunk/wp-content/themes/twentyten/archive.php 2010-05-10 20:30:58 UTC (rev 14544)
</span><span class="lines">@@ -20,16 +20,17 @@
</span><span class="cx">
</span><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><ins>+ <h1 class="page-title">
</ins><span class="cx"> <?php if ( is_day() ) : ?>
</span><del>- <h1 class="page-title"><?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ); ?></h1>
</del><ins>+ <?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ); ?>
</ins><span class="cx"> <?php elseif ( is_month() ) : ?>
</span><del>- <h1 class="page-title"><?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date('F Y') ); ?></h1>
</del><ins>+ <?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date('F Y') ); ?>
</ins><span class="cx"> <?php elseif ( is_year() ) : ?>
</span><del>- <h1 class="page-title"><?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date('Y') ); ?></h1>
</del><ins>+ <?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date('Y') ); ?>
</ins><span class="cx"> <?php else : ?>
</span><del>- <h1 class="page-title"><?php _e( 'Blog Archives', 'twentyten' ); ?></h1>
</del><ins>+ <?php _e( 'Blog Archives', 'twentyten' ); ?>
</ins><span class="cx"> <?php endif; ?>
</span><del>-
</del><ins>+ </h1>
</ins><span class="cx"> <?php rewind_posts(); ?>
</span><span class="cx"> <?php
</span><span class="cx"> /* Run the loop for the archives page to output the posts.
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/category.php (14543 => 14544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/category.php 2010-05-10 20:22:01 UTC (rev 14543)
+++ trunk/wp-content/themes/twentyten/category.php 2010-05-10 20:30:58 UTC (rev 14544)
</span><span class="lines">@@ -16,7 +16,12 @@
</span><span class="cx"> <h1 class="page-title"><?php
</span><span class="cx"> printf( __( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title( '', false ) . '</span>' );
</span><span class="cx"> ?></h1>
</span><del>- <?php $categorydesc = category_description(); if ( ! empty( $categorydesc ) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
</del><ins>+ <?php
+ $categorydesc = category_description();
+ if ( ! empty( $categorydesc ) ) {
+ echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' );
+ }
+ ?>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> /* Run the loop for the category page to output the posts.
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (14543 => 14544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-05-10 20:22:01 UTC (rev 14543)
+++ trunk/wp-content/themes/twentyten/header.php 2010-05-10 20:30:58 UTC (rev 14544)
</span><span class="lines">@@ -14,8 +14,8 @@
</span><span class="cx"> <html <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span><span class="cx"> <meta charset="<?php bloginfo( 'charset' ); ?>" />
</span><del>- <title><?php
- // Returns the title based on the type of page being viewed
</del><ins>+ <title>
+ <?php
</ins><span class="cx"> if ( is_single() ) {
</span><span class="cx"> single_post_title(); echo ' | '; bloginfo( 'name' );
</span><span class="cx"> } elseif ( is_home() || is_front_page() ) {
</span><span class="lines">@@ -26,13 +26,14 @@
</span><span class="cx"> } elseif ( is_page() ) {
</span><span class="cx"> single_post_title( '' ); echo ' | '; bloginfo( 'name' );
</span><span class="cx"> } elseif ( is_search() ) {
</span><del>- printf( __( 'Search results for "%s"', 'twentyten' ), get_search_query() ); twentyten_the_page_number(); echo ' | '; bloginfo( 'name' );
</del><ins>+ printf( __( 'Search results for %s', 'twentyten' ), '"'.get_search_query().'"' ); twentyten_the_page_number(); echo ' | '; bloginfo( 'name' );
</ins><span class="cx"> } elseif ( is_404() ) {
</span><span class="cx"> _e( 'Not Found', 'twentyten' ); echo ' | '; bloginfo( 'name' );
</span><span class="cx"> } else {
</span><span class="cx"> wp_title( '' ); echo ' | '; bloginfo( 'name' ); twentyten_the_page_number();
</span><span class="cx"> }
</span><del>- ?></title>
</del><ins>+ ?>
+ </title>
</ins><span class="cx"> <link rel="profile" href="http://gmpg.org/xfn/11" />
</span><span class="cx"> <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
</span><span class="cx"> <?php if ( is_singular() && get_option( 'thread_comments' ) ) wp_enqueue_script( 'comment-reply' ); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/single.php (14543 => 14544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/single.php 2010-05-10 20:22:01 UTC (rev 14543)
+++ trunk/wp-content/themes/twentyten/single.php 2010-05-10 20:30:58 UTC (rev 14544)
</span><span class="lines">@@ -38,10 +38,12 @@
</span><span class="cx"> <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
</span><span class="cx"> </div><!-- #author-avatar -->
</span><span class="cx"> <div id="author-description">
</span><del>- <h2><?php _e( 'About ', 'twentyten' ); ?><?php the_author(); ?></h2>
</del><ins>+ <h2><?php printf( esc_attr__( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
</ins><span class="cx"> <?php the_author_meta( 'description' ); ?>
</span><span class="cx"> <div id="author-link">
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> </div><!-- #author-link -->
</span><span class="cx"> </div><!-- #author-description -->
</span><span class="cx"> </div><!-- .entry-author-info -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytentagphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/tag.php (14543 => 14544)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/tag.php 2010-05-10 20:22:01 UTC (rev 14543)
+++ trunk/wp-content/themes/twentyten/tag.php 2010-05-10 20:30:58 UTC (rev 14544)
</span><span class="lines">@@ -15,9 +15,9 @@
</span><span class="cx">
</span><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><del>- <h1 class="page-title"><?php
- printf( __( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title( '', false ) . '</span>' );
- ?></h1>
</del><ins>+ <h1 class="page-title">
+ <?php printf( __( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title( '', false ) . '</span>' ); ?>
+ </h1>
</ins><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>