Changeset 18029 for trunk/wp-content/themes/twentyeleven/content.php

Timestamp:

05/25/2011 03:19:33 PM (15 years ago)

Author:

iandstewart

Message:

Twenty Eleven: make categories and tags i18n friendly; Props dimadin; Fixes #17531

File:

• trunk/wp-content/themes/twentyeleven/content.php (modified) (1 diff)

trunk/wp-content/themes/twentyeleven/content.php

@@ -55 +55 @@
                 <footer class="entry-meta">
                         <?php if ( 'post' == $post->post_type ) : // Hide category and tag text for pages on Search ?>
-                        <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; ?>
+                        <?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 ?>
 
                         <?php if ( comments_open() ) : ?>
+                        <?php if ( $show_sep ) : ?>
                         <span class="sep"> | </span>
+                        <?php endif; // End if $show_sep ?>
                         <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>
-                        <?php endif; ?>
+                        <?php endif; // End if comments_open() ?>
 
                         <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>