<!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>[13498] trunk/wp-content/themes/twentyten:
Better internationalisation for TwentyTen.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13498">13498</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-28 11:43:04 +0000 (Sun, 28 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better internationalisation for TwentyTen. Props filosofo. Fixes <a href="http://trac.wordpress.org/ticket/12384">#12384</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenattachmentphp">trunk/wp-content/themes/twentyten/attachment.php</a></li>
<li><a href="#trunkwpcontentthemestwentytencategoryphp">trunk/wp-content/themes/twentyten/category.php</a></li>
<li><a href="#trunkwpcontentthemestwentytencommentsphp">trunk/wp-content/themes/twentyten/comments.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenheaderphp">trunk/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenindexphp">trunk/wp-content/themes/twentyten/index.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenloopphp">trunk/wp-content/themes/twentyten/loop.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensearchphp">trunk/wp-content/themes/twentyten/search.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="trunkwpcontentthemestwentytenattachmentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/attachment.php (13497 => 13498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/attachment.php 2010-02-28 10:23:55 UTC (rev 13497)
+++ trunk/wp-content/themes/twentyten/attachment.php 2010-02-28 11:43:04 UTC (rev 13498)
</span><span class="lines">@@ -11,11 +11,20 @@
</span><span class="cx"> <h2 class="entry-title"><?php the_title(); ?></h2>
</span><span class="cx">
</span><span class="cx"> <div class="entry-meta">
</span><del>- <span class="meta-prep meta-prep-author"><?php _e( 'By ', 'twentyten' ); ?></span>
- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
- <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
- <span class="meta-prep meta-prep-entry-date"><?php _e( 'Published ', 'twentyten' ); ?></span>
- <span class="entry-date"><abbr class="published" title="<?php the_time() ?>"><?php echo get_the_date(); ?></abbr></span>
</del><ins>+ <?php
+ printf(__( '<span class="meta-prep meta-prep-author"> By </span> <span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>', 'twentyten'),
+ get_author_posts_url( get_the_author_meta('ID') ),
+ sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
+ get_the_author()
+ );
+ ?>
+ <span class="meta-sep"> | </span>
+ <?php
+ printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>', 'twentyten'),
+ esc_attr(get_the_time()),
+ get_the_date()
+ );
+ ?>
</ins><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ); ?>
</span><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="lines">@@ -42,12 +51,22 @@
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><del>- <?php printf( __( 'This entry was posted in %1$s%2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' ),
- get_the_category_list(', '),
- get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ),
- get_permalink(),
- the_title_attribute('echo=0'),
- get_post_comments_feed_link() ); ?>
</del><ins>+ <?php
+ $tag_list = get_the_tag_list();
+ if ( '' != $tag_list ) {
+ $utility_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' );
+ } else {
+ $utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' );
+ }
+ printf(
+ $utility_text,
+ get_the_category_list(', '),
+ $tag_list,
+ get_permalink(),
+ the_title_attribute('echo=0'),
+ get_post_comments_feed_link()
+ );
+ ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
</span><span class="cx"> <?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/category.php (13497 => 13498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/category.php 2010-02-28 10:23:55 UTC (rev 13497)
+++ trunk/wp-content/themes/twentyten/category.php 2010-02-28 11:43:04 UTC (rev 13498)
</span><span class="lines">@@ -3,7 +3,9 @@
</span><span class="cx"> <div id="container">
</span><span class="cx"> <div id="content">
</span><span class="cx">
</span><del>- <h1 class="page-title"><?php _e( 'Category Archives:', 'twentyten' ); ?> <span><?php single_cat_title(); ?></span></span></h1>
</del><ins>+ <h1 class="page-title"><?php
+ printf(__( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title('', false) . '</span>');
+ ?></h1>
</ins><span class="cx"> <?php $categorydesc = category_description(); if ( !empty($categorydesc) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
</span><span class="cx">
</span><span class="cx"> <?php get_generic_template( 'loop', 'category' ); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/comments.php (13497 => 13498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/comments.php 2010-02-28 10:23:55 UTC (rev 13497)
+++ trunk/wp-content/themes/twentyten/comments.php 2010-02-28 11:43:04 UTC (rev 13498)
</span><span class="lines">@@ -1,8 +1,3 @@
</span><del>-<?php
- // Do not delete these lines
- if ( ! defined('ABSPATH') )
- die ( __( 'Please do not load this page directly. Thanks!', 'twentyten' ) );
-?>
</del><span class="cx"> <div id="comments">
</span><span class="cx"> <?php if ( post_password_required() ) : ?>
</span><span class="cx"> <div class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></div>
</span><span class="lines">@@ -17,7 +12,11 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( have_comments() ) : ?>
</span><del>- <h3 id="comments-title"><?php comments_number( __('No Responses to', 'twentyten'), __('One Response to', 'twentyten'), __('% Responses to', 'twentyten') );?> <em><?php the_title(); ?></em></h3>
</del><ins>+ <h3 id="comments-title"><?php comments_number(
+ sprintf(__('No Responses to %s', 'twentyten'), '<em>' . get_the_title() . '</em>'),
+ sprintf(__('One Response to %s', 'twentyten'), '<em>' . get_the_title() . '</em>'),
+ sprintf(__('%% Responses to %s', 'twentyten'), '<em>' . get_the_title() . '</em>')
+ ); ?> </h3>
</ins><span class="cx">
</span><span class="cx"> <?php if ( get_comment_pages_count() > 1 ) : // are there comments to navigate through ?>
</span><span class="cx"> <div class="navigation">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (13497 => 13498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-02-28 10:23:55 UTC (rev 13497)
+++ trunk/wp-content/themes/twentyten/header.php 2010-02-28 11:43:04 UTC (rev 13498)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span><del>- <title><?php
- if ( is_single() ) {
</del><ins>+ <title><?php
+ if ( is_single() ) {
</ins><span class="cx"> single_post_title(); echo ' | '; bloginfo('name');
</span><span class="cx"> } elseif ( is_home() || is_front_page() ) {
</span><span class="cx"> bloginfo('name'); echo ' | '; bloginfo('description'); twentyten_the_page_number();
</span><span class="lines">@@ -15,7 +15,7 @@
</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">
</span><span class="cx"> <meta http-equiv="content-type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/index.php (13497 => 13498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/index.php 2010-02-28 10:23:55 UTC (rev 13497)
+++ trunk/wp-content/themes/twentyten/index.php 2010-02-28 11:43:04 UTC (rev 13498)
</span><span class="lines">@@ -3,15 +3,7 @@
</span><span class="cx"> <div id="container">
</span><span class="cx"> <div id="content">
</span><span class="cx">
</span><del>- <?php if ( have_posts() ) :
- get_generic_template( 'loop', 'index' );
- else : ?>
- <h2><?php _e( 'Not Found', 'twentyten' ); ?></h2>
- <div class="entry-content">
- <p><?php _e( 'Apologies, but we were unable to find what you were looking for. Perhaps searching will help.', 'twentyten' ); ?></p>
- <?php get_search_form(); ?>
- </div>
- <?php endif; ?>
</del><ins>+ <?php get_generic_template( 'loop', 'index' ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenloopphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/loop.php (13497 => 13498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/loop.php 2010-02-28 10:23:55 UTC (rev 13497)
+++ trunk/wp-content/themes/twentyten/loop.php 2010-02-28 11:43:04 UTC (rev 13498)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>-<?php if ( $wp_query->max_num_pages > 1 ) { ?>
</del><ins>+<?php if ( $wp_query->max_num_pages > 1 ) : ?>
</ins><span class="cx"> <div id="nav-above" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</span><span class="cx"> </div><!-- #nav-above -->
</span><del>-<?php } ?>
</del><ins>+<?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( ! have_posts() ) : ?>
</span><span class="cx"> <div id="post-0" class="post error404 not-found">
</span><span class="lines">@@ -16,112 +16,132 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><del>-<?php if ( in_category( 'Gallery' ) ) { ?>
- <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</del><ins>+ <?php if ( in_category( 'Gallery' ) ) : ?>
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</ins><span class="cx">
</span><del>- <div class="entry-meta">
- <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
- <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
- <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
- <span class="author vcard"><a class="url fn n" 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 the_author(); ?></a></span>
- </div><!-- .entry-meta -->
</del><ins>+ <div class="entry-meta">
+ <?php
+ printf(__( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten'),
+ get_permalink(),
+ esc_attr( get_the_time() ),
+ get_the_date(),
+ get_author_posts_url( get_the_author_meta('ID') ),
+ sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
+ get_the_author()
+ );
+ ?>
+ </div><!-- .entry-meta -->
</ins><span class="cx">
</span><del>- <div class="entry-content">
- <div class="gallery-thumb">
- <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php
- $images =& get_children( array('post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) );
- $total_images = count($images);
- $image = array_shift($images);
- echo wp_get_attachment_image( $image->ID, 'thumbnail' );
- ?></a>
- </div>
- <p><em><?php printf( __('This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten'), 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"', $total_images ); ?></em></p>
</del><ins>+ <div class="entry-content">
+ <div class="gallery-thumb">
+ <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php
+ $images = get_children( array('post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) );
+ $total_images = count($images);
+ $image = array_shift($images);
+ echo wp_get_attachment_image( $image->ID, 'thumbnail' );
+ ?></a>
+ </div>
+ <p><em><?php printf( __('This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten'),
+ 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"',
+ $total_images
+ ); ?></em></p>
</ins><span class="cx">
</span><del>- <?php the_excerpt( '' ); ?>
- </div><!-- .entry-content -->
</del><ins>+ <?php the_excerpt( '' ); ?>
+ </div><!-- .entry-content -->
</ins><span class="cx">
</span><del>- <div class="entry-utility">
- <?php
- $category_id = get_cat_ID( 'Gallery' );
- $category_link = get_category_link( $category_id );
- ?>
- <a href="<?php echo $category_link; ?>" title="<?php esc_attr_e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
- <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
- </div><!-- #entry-utility -->
- </div>
</del><ins>+ <div class="entry-utility">
+ <?php
+ $category_id = get_cat_ID( 'Gallery' );
+ $category_link = get_category_link( $category_id );
+ ?>
+ <a href="<?php echo $category_link; ?>" title="<?php esc_attr_e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
+ <span class="meta-sep"> | </span>
+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
+ </div><!-- #entry-utility -->
+ </div>
</ins><span class="cx">
</span><span class="cx">
</span><del>-<?php } elseif ( in_category( 'asides' ) ) { ?>
- <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-<?php if ( is_archive() || is_search() ) : //Only display Excerpts for archives & search ?>
- <div class="entry-summary">
- <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
- </div><!-- .entry-summary -->
-<?php else : ?>
- <div class="entry-content">
- <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
- </div><!-- .entry-content -->
-<?php endif; ?>
</del><ins>+ <?php elseif ( in_category( 'asides' ) ) : ?>
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <?php if ( is_archive() || is_search() ) : //Only display Excerpts for archives & search ?>
+ <div class="entry-summary">
+ <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+ </div><!-- .entry-summary -->
+ <?php else : ?>
+ <div class="entry-content">
+ <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+ </div><!-- .entry-content -->
+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <div class="entry-utility">
- <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
- <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
- <span class="meta-sep"> <?php _e( ' by ', 'twentyten' ); ?> </span>
- <span class="author vcard"><a class="url fn n" 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 the_author(); ?></a></span>
- <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
- </div><!-- #entry-utility -->
- </div><!-- #post-<?php the_ID(); ?> -->
</del><ins>+ <div class="entry-utility">
+ <?php
+ printf(__( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten'),
+ get_permalink(),
+ esc_attr( get_the_time() ),
+ get_the_date(),
+ get_author_posts_url( get_the_author_meta('ID') ),
+ sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
+ get_the_author()
+ );
+ ?>
+ <span class="meta-sep"> | </span>
+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
+ </div><!-- #entry-utility -->
+ </div><!-- #post-<?php the_ID(); ?> -->
</ins><span class="cx">
</span><span class="cx">
</span><del>-<?php } else { ?>
- <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</del><ins>+ <?php else : ?>
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</ins><span class="cx">
</span><del>- <div class="entry-meta">
- <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
- <a href="<?php
-the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
- <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
- <span class="author vcard"><a class="url fn n" 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 the_author(); ?></a></span>
- </div><!-- .entry-meta -->
</del><ins>+ <div class="entry-meta">
+ <?php
+ printf(__( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten'),
+ get_permalink(),
+ esc_attr( get_the_time() ),
+ get_the_date(),
+ get_author_posts_url( get_the_author_meta('ID') ),
+ sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
+ get_the_author()
+ );
+ ?>
+ </div><!-- .entry-meta -->
</ins><span class="cx">
</span><del>-<?php if ( is_archive() || is_search() ) : //Only display Excerpts for archives & search ?>
- <div class="entry-summary">
- <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
- </div><!-- .entry-summary -->
-<?php else : ?>
- <div class="entry-content">
- <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
- <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
- </div><!-- .entry-content -->
-<?php endif; ?>
</del><ins>+ <?php if ( is_archive() || is_search() ) : //Only display Excerpts for archives & search ?>
+ <div class="entry-summary">
+ <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+ </div><!-- .entry-summary -->
+ <?php else : ?>
+ <div class="entry-content">
+ <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+ <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
+ </div><!-- .entry-content -->
+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <div class="entry-utility">
- <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php echo twentyten_cat_list(); ?></span></span>
- <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
- <?php $tags_text = twentyten_tag_list(); ?>
- <?php if ( !empty($tags_text) ) : ?>
- <span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links"><?php echo $tags_text; ?></span></span>
- <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
- <?php endif; //$tags_text ?>
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
- </div><!-- #entry-utility -->
- </div><!-- #post-<?php the_ID(); ?> -->
</del><ins>+ <div class="entry-utility">
+ <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php echo twentyten_cat_list(); ?></span></span>
+ <span class="meta-sep"> | </span>
+ <?php $tags_text = twentyten_tag_list(); ?>
+ <?php if ( !empty($tags_text) ) : ?>
+ <span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links"><?php echo $tags_text; ?></span></span>
+ <span class="meta-sep"> | </span>
+ <?php endif; //$tags_text ?>
+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
+ </div><!-- #entry-utility -->
+ </div><!-- #post-<?php the_ID(); ?> -->
</ins><span class="cx">
</span><del>- <?php comments_template( '', true ); ?>
</del><ins>+ <?php comments_template( '', true ); ?>
</ins><span class="cx">
</span><del>-<?php } ?>
</del><ins>+ <?php endif; // if different categories queried ?>
</ins><span class="cx"> <?php endwhile; ?>
</span><span class="cx">
</span><del>-<?php if ( $wp_query->max_num_pages > 1 ) { ?>
</del><ins>+<?php if ( $wp_query->max_num_pages > 1 ) : ?>
</ins><span class="cx"> <div id="nav-below" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</span><span class="cx"> </div><!-- #nav-below -->
</span><del>-<?php } ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php endif; ?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/search.php (13497 => 13498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/search.php 2010-02-28 10:23:55 UTC (rev 13497)
+++ trunk/wp-content/themes/twentyten/search.php 2010-02-28 11:43:04 UTC (rev 13498)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <div id="content">
</span><span class="cx">
</span><span class="cx"> <?php if ( have_posts() ) : ?>
</span><del>- <h1 class="page-title"><?php _e( 'Search Results for: ', 'twentyten' ); ?><span><?php the_search_query(); ?></span></h1>
</del><ins>+ <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyten' ), '<span>' . get_search_query() . '</span>'); ?></h1>
</ins><span class="cx"> <?php get_generic_template( 'loop', 'search' ); ?>
</span><span class="cx"> <?php else : ?>
</span><span class="cx"> <div id="post-0" class="post no-results not-found">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/single.php (13497 => 13498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/single.php 2010-02-28 10:23:55 UTC (rev 13497)
+++ trunk/wp-content/themes/twentyten/single.php 2010-02-28 11:43:04 UTC (rev 13498)
</span><span class="lines">@@ -42,12 +42,22 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><del>- <?php printf( __( 'This entry was posted in %1$s%2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' ),
- get_the_category_list(', '),
- get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ),
- get_permalink(),
- the_title_attribute('echo=0'),
- get_post_comments_feed_link() ); ?>
</del><ins>+ <?php
+ $tag_list = get_the_tag_list();
+ if ( '' != $tag_list ) {
+ $utility_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' );
+ } else {
+ $utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' );
+ }
+ printf(
+ $utility_text,
+ get_the_category_list(', '),
+ $tag_list,
+ get_permalink(),
+ the_title_attribute('echo=0'),
+ get_post_comments_feed_link()
+ );
+ ?>
</ins><span class="cx">
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ); ?>
</span><span class="cx"> </div><!-- .entry-utility -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytentagphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/tag.php (13497 => 13498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/tag.php 2010-02-28 10:23:55 UTC (rev 13497)
+++ trunk/wp-content/themes/twentyten/tag.php 2010-02-28 11:43:04 UTC (rev 13498)
</span><span class="lines">@@ -5,7 +5,9 @@
</span><span class="cx">
</span><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><del>- <h1 class="page-title"><?php _e( 'Tag Archives: ', 'twentyten' ); ?><span><?php single_tag_title(); ?></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>