Changeset 18348

Timestamp:

06/27/2011 08:24:23 PM (15 years ago)

Author:

azaozz

Message:

Simplify some Twenty-Eleven strings for i18n, props nbachiyski, fixes #17777

Location:

trunk/wp-content/themes/twentyeleven

Files:

• 404.php (modified) (1 diff)
• content-aside.php (modified) (2 diffs)
• content-gallery.php (modified) (1 diff)
• content-image.php (modified) (3 diffs)
• content-link.php (modified) (2 diffs)
• content-quote.php (modified) (2 diffs)
• content-status.php (modified) (2 diffs)
• content.php (modified) (2 diffs)
• showcase.php (modified) (2 diffs)

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

@@ -33 +33 @@
 
                                         <?php
+                                        /* translators: %1$s: smilie */
                                         $archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'twentyeleven' ), convert_smilies( ':)' ) ) . '</p>';
-                                        the_widget( 'WP_Widget_Archives', array('count' => 0 , 'dropdown' => 1 ), "after_title=</h2>$archive_content" );
+                                        the_widget( 'WP_Widget_Archives', array('count' => 0 , 'dropdown' => 1 ), array( 'after_title' => '</h2>'.$archive_content ) );
                                         ?>
 

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

@@ -20 +20 @@
                         <?php if ( comments_open() ) : ?>
                         <div class="comments-link">
-                                <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
+                                <?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
                         </div>
                         <?php endif; ?>
@@ -40 +40 @@
                         <?php if ( comments_open() ) : ?>
                         <span class="sep"> | </span>
-                        <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 class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
                         <?php endif; ?>
                         <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>

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

@@ -85 +85 @@
                 <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>
+                <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a Reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
                 <?php endif; // End if comments_open() ?>
 

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

@@ -19 +19 @@
                         <?php if ( comments_open() ) : ?>
                         <div class="comments-link">
-                                <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
+                                <?php comments_popup_link( '<span class="leave-reply">' . __( "Reply", 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
                         </div>
                         <?php endif; ?>
@@ -44 +44 @@
                         <div class="entry-meta">
                                 <?php
-                                /* translators: used between list items, there is a space after the comma */
+                                        /* translators: used between list items, there is a space after the comma */
                                         $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
                                         if ( $categories_list ):
@@ -62 +62 @@
 
                                 <?php if ( comments_open() ) : ?>
-                                <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 class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%</strong> Replies', 'twentyeleven' ) ); ?></span>
                                 <?php endif; // End if comments_open() ?>
                         </div><!-- .entry-meta -->

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

@@ -20 +20 @@
                         <?php if ( comments_open() ) : ?>
                         <div class="comments-link">
-                                <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
+                                <?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
                         </div>
                         <?php endif; ?>
@@ -40 +40 @@
                         <?php if ( comments_open() ) : ?>
                         <span class="sep"> | </span>
-                        <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 class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
                         <?php endif; ?>
                         <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>

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

@@ -22 +22 @@
                         <?php if ( comments_open() ) : ?>
                         <div class="comments-link">
-                                <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
+                                <?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>t
                         </div>
                         <?php endif; ?>
@@ -67 +67 @@
                         <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>
+                        <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
                         <?php endif; // End if comments_open() ?>
 

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

@@ -19 +19 @@
                         <?php if ( comments_open() ) : ?>
                         <div class="comments-link">
-                                <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
+                                <?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
                         </div>
                         <?php endif; ?>
@@ -41 +41 @@
                         <?php if ( comments_open() ) : ?>
                         <span class="sep"> | </span>
-                        <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 class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
                         <?php endif; ?>
                         <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>

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

@@ -28 +28 @@
                         <?php if ( comments_open() ) : ?>
                         <div class="comments-link">
-                                <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
+                                <?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
                         </div>
                         <?php endif; ?>
@@ -75 +75 @@
                         <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>
+                        <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
                         <?php endif; // End if comments_open() ?>
 

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

@@ -192 +192 @@
                                                         <a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
                                                         <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' ) ); ?>
+                                                                <?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?>
                                                         </span>
                                                 </li>
@@ -209 +209 @@
 
                                                 <?php
-                                                the_widget( 'Twenty_Eleven_Ephemera_Widget', '', 'before_title=<h3 class="widget-title">&after_title=</h3>' );
+                                                the_widget( 'Twenty_Eleven_Ephemera_Widget', '', array( 'before_title' => '<h3 class="widget-title">', 'after_title' => '</h3>' ) );
                                                 ?>