<!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" />
<title>[18029] trunk/wp-content/themes/twentyeleven: Twenty Eleven: make categories and tags i18n friendly; Props dimadin; Fixes #17531</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/18029">18029</a></dd>
<dt>Author</dt> <dd>iandstewart</dd>
<dt>Date</dt> <dd>2011-05-25 15:19:33 +0000 (Wed, 25 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Eleven: make categories and tags i18n friendly; Props dimadin; Fixes <a href="http://trac.wordpress.org/ticket/17531">#17531</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevencontentfeaturedphp">trunk/wp-content/themes/twentyeleven/content-featured.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentgalleryphp">trunk/wp-content/themes/twentyeleven/content-gallery.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentimagephp">trunk/wp-content/themes/twentyeleven/content-image.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentquotephp">trunk/wp-content/themes/twentyeleven/content-quote.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentsinglephp">trunk/wp-content/themes/twentyeleven/content-single.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentphp">trunk/wp-content/themes/twentyeleven/content.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevencontentfeaturedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-featured.php (18028 => 18029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-featured.php 2011-05-25 01:06:24 UTC (rev 18028)
+++ trunk/wp-content/themes/twentyeleven/content-featured.php 2011-05-25 15:19:33 UTC (rev 18029)
</span><span class="lines">@@ -34,7 +34,8 @@
</span><span class="cx">
</span><span class="cx"> <footer class="entry-meta">
</span><span class="cx"> <?php
</span><del>- $tag_list = get_the_tag_list( '', ', ' );
</del><ins>+ /* translators: used between list items, there is a space after the comma */
+ $tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
</ins><span class="cx"> if ( '' != $tag_list ) {
</span><span class="cx"> $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>.', 'twentyeleven' );
</span><span class="cx"> } else {
</span><span class="lines">@@ -42,7 +43,8 @@
</span><span class="cx"> }
</span><span class="cx"> printf(
</span><span class="cx"> $utility_text,
</span><del>- get_the_category_list( ', ' ),
</del><ins>+ /* translators: used between list items, there is a space after the comma */
+ get_the_category_list( __( ', ', 'twentyeleven' ) ),
</ins><span class="cx"> $tag_list,
</span><span class="cx"> get_permalink(),
</span><span class="cx"> the_title_attribute( 'echo=0' )
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentgalleryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-gallery.php (18028 => 18029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-gallery.php 2011-05-25 01:06:24 UTC (rev 18028)
+++ trunk/wp-content/themes/twentyeleven/content-gallery.php 2011-05-25 15:19:33 UTC (rev 18029)
</span><span class="lines">@@ -65,13 +65,35 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <footer class="entry-meta">
</span><del>- <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in', 'twentyeleven' ); ?></span> <?php the_category( ', ' ); ?></span>
- <?php the_tags( '<span class="sep"> | </span> <span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __( 'Tagged', 'twentyeleven' ) . '</span> ', ', ', '</span>' ); ?>
</del><ins>+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+ if ( $categories_list ):
+ ?>
+ <span class="cat-links">
+ <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
+ $show_sep = true; ?>
+ </span>
+ <?php endif; // End if categories ?>
+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
+ if ( $tags_list ):
+ if ( $show_sep ) : ?>
+ <span class="sep"> | </span>
+ <?php endif; // End if $show_sep ?>
+ <span class="tag-links">
+ <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list );
+ $show_sep = true; ?>
+ </span>
+ <?php endif; // End if $tags_list ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><ins>+ <?php if ( $show_sep ) : ?>
</ins><span class="cx"> <span class="sep"> | </span>
</span><ins>+ <?php endif; // End if $show_sep ?>
</ins><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; // End if comments_open() ?>
</ins><span class="cx">
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </footer><!-- #entry-meta -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-image.php (18028 => 18029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-image.php 2011-05-25 01:06:24 UTC (rev 18028)
+++ trunk/wp-content/themes/twentyeleven/content-image.php 2011-05-25 15:19:33 UTC (rev 18029)
</span><span class="lines">@@ -50,11 +50,27 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx"> <div class="entry-meta">
</span><del>- <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyeleven' ); ?></span><?php the_category( ', ' ); ?></span>
- <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __( 'Tagged', 'twentyeleven' ) . '</span> ', ', ', '</span>' ); ?>
</del><ins>+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+ if ( $categories_list ):
+ ?>
+ <span class="cat-links">
+ <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list ); ?>
+ </span>
+ <?php endif; // End if categories ?>
+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
+ if ( $tags_list ): ?>
+ <span class="tag-links">
+ <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list ); ?>
+ </span>
+ <?php endif; // End if $tags_list ?>
+
</ins><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; // End if comments_open() ?>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentquotephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-quote.php (18028 => 18029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-quote.php 2011-05-25 01:06:24 UTC (rev 18028)
+++ trunk/wp-content/themes/twentyeleven/content-quote.php 2011-05-25 15:19:33 UTC (rev 18029)
</span><span class="lines">@@ -50,14 +50,36 @@
</span><span class="cx">
</span><span class="cx"> <footer class="entry-meta">
</span><span class="cx"> <?php if ( 'post' == $post->post_type ) : // Hide category and tag text for pages on Search ?>
</span><del>- <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in', 'twentyeleven' ); ?></span> <?php the_category( ', ' ); ?></span>
- <?php the_tags( '<span class="sep"> | </span> <span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __( 'Tagged', 'twentyeleven' ) . '</span> ', ', ', '</span>' ); ?>
- <?php endif; ?>
</del><ins>+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+ if ( $categories_list ):
+ ?>
+ <span class="cat-links">
+ <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
+ $show_sep = true; ?>
+ </span>
+ <?php endif; // End if categories ?>
+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
+ if ( $tags_list ):
+ if ( $show_sep ) : ?>
+ <span class="sep"> | </span>
+ <?php endif; // End if $show_sep ?>
+ <span class="tag-links">
+ <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list );
+ $show_sep = true; ?>
+ </span>
+ <?php endif; // End if $tags_list ?>
+ <?php endif; // End if 'post' == $post->post_type ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><ins>+ <?php if ( $show_sep ) : ?>
</ins><span class="cx"> <span class="sep"> | </span>
</span><ins>+ <?php endif; // End if $show_sep ?>
</ins><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; // End if comments_open() ?>
</ins><span class="cx">
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </footer><!-- #entry-meta -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentsinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-single.php (18028 => 18029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-single.php 2011-05-25 01:06:24 UTC (rev 18028)
+++ trunk/wp-content/themes/twentyeleven/content-single.php 2011-05-25 15:19:33 UTC (rev 18029)
</span><span class="lines">@@ -33,7 +33,8 @@
</span><span class="cx">
</span><span class="cx"> <footer class="entry-meta">
</span><span class="cx"> <?php
</span><del>- $tag_list = get_the_tag_list( '', ', ' );
</del><ins>+ /* translators: used between list items, there is a space after the comma */
+ $tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
</ins><span class="cx"> if ( '' != $tag_list ) {
</span><span class="cx"> $utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
</span><span class="cx"> } else {
</span><span class="lines">@@ -41,7 +42,8 @@
</span><span class="cx"> }
</span><span class="cx"> printf(
</span><span class="cx"> $utility_text,
</span><del>- get_the_category_list( ', ' ),
</del><ins>+ /* translators: used between list items, there is a space after the comma */
+ get_the_category_list( __( ', ', 'twentyeleven' ) ),
</ins><span class="cx"> $tag_list,
</span><span class="cx"> get_permalink(),
</span><span class="cx"> the_title_attribute( 'echo=0' ),
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content.php (18028 => 18029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content.php 2011-05-25 01:06:24 UTC (rev 18028)
+++ trunk/wp-content/themes/twentyeleven/content.php 2011-05-25 15:19:33 UTC (rev 18029)
</span><span class="lines">@@ -54,14 +54,36 @@
</span><span class="cx">
</span><span class="cx"> <footer class="entry-meta">
</span><span class="cx"> <?php if ( 'post' == $post->post_type ) : // Hide category and tag text for pages on Search ?>
</span><del>- <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in', 'twentyeleven' ); ?></span> <?php the_category( ', ' ); ?></span>
- <?php the_tags( '<span class="sep"> | </span> <span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __( 'Tagged', 'twentyeleven' ) . '</span> ', ', ', '</span>' ); ?>
- <?php endif; ?>
</del><ins>+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+ if ( $categories_list ):
+ ?>
+ <span class="cat-links">
+ <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
+ $show_sep = true; ?>
+ </span>
+ <?php endif; // End if categories ?>
+ <?php
+ /* translators: used between list items, there is a space after the comma */
+ $tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
+ if ( $tags_list ):
+ if ( $show_sep ) : ?>
+ <span class="sep"> | </span>
+ <?php endif; // End if $show_sep ?>
+ <span class="tag-links">
+ <?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list );
+ $show_sep = true; ?>
+ </span>
+ <?php endif; // End if $tags_list ?>
+ <?php endif; // End if 'post' == $post->post_type ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><ins>+ <?php if ( $show_sep ) : ?>
</ins><span class="cx"> <span class="sep"> | </span>
</span><ins>+ <?php endif; // End if $show_sep ?>
</ins><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; // End if comments_open() ?>
</ins><span class="cx">
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </footer><!-- #entry-meta -->
</span></span></pre>
</div>
</div>
</body>
</html>