Changeset 45926 for trunk/src/wp-includes/widgets.php

Timestamp:

09/01/2019 05:12:43 PM (7 years ago)

Author:

SergeyBiryukov

Message:

I18N: Improve translator comments.

• Add missing translator comments.
• Fix placement of some translator comments. Translator comments should be on the line directly above the line containing the translation function call for optimal compatibility with various .pot file generation tools. The CS auto-fixing, which changed some inconsistent function calls to multi-line function calls, is part of the reason why this was no longer the case for a select group of translator comments.

Includes minor code layout fixes.

Polyglots, rejoice! All WordPress core files now have translator comments for all strings with placeholders!

Props jrf, subrataemfluence, GaryJ, webdados, Dency, swissspidy, alvarogois, marcomartins, mihaiiceyro, vladwtz, niq1982, flipkeijzer, michielatyoast, chandrapatel, thrijith, joshuanoyce, FesoVik, tessak22, bhaktirajdev, cleancoded, dhavalkasvala, garrett-eclipse, bibliofille, socalchristina, priyankkpatel, 5hel2l2y, adamsilverstein, JeffPaul, pierlo, SergeyBiryukov.
Fixes #44360.

File:

• trunk/src/wp-includes/widgets.php (modified) (4 diffs)

trunk/src/wp-includes/widgets.php

@@ -176 +176 @@
 
                 if ( $number > 1 ) {
-                        $_args['name'] = isset( $args['name'] ) ? sprintf( $args['name'], $i ) : sprintf( __( 'Sidebar %d' ), $i );
+                        if ( isset( $args['name'] ) ) {
+                                $_args['name'] = sprintf( $args['name'], $i );
+                        } else {
+                                /* translators: %d: Sidebar number */
+                                $_args['name'] = sprintf( __( 'Sidebar %d' ), $i );
+                        }
                 } else {
                         $_args['name'] = isset( $args['name'] ) ? $args['name'] : __( 'Sidebar' );
@@ -248 +253 @@
 
         $defaults = array(
+                /* translators: %d: Sidebar number */
                 'name'          => sprintf( __( 'Sidebar %d' ), $i ),
                 'id'            => "sidebar-$i",
@@ -261 +267 @@
 
         if ( $id_is_empty ) {
-                /* translators: 1: the id argument, 2: sidebar name, 3: recommended id value */
-                _doing_it_wrong( __FUNCTION__, sprintf( __( 'No %1$s was set in the arguments array for the "%2$s" sidebar. Defaulting to "%3$s". Manually set the %1$s to "%3$s" to silence this notice and keep existing sidebar content.' ), '<code>id</code>', $sidebar['name'], $sidebar['id'] ), '4.2.0' );
+                _doing_it_wrong(
+                        __FUNCTION__,
+                        sprintf(
+                                /* translators: 1: the id argument, 2: sidebar name, 3: recommended id value */
+                                __( 'No %1$s was set in the arguments array for the "%2$s" sidebar. Defaulting to "%3$s". Manually set the %1$s to "%3$s" to silence this notice and keep existing sidebar content.' ),
+                                '<code>id</code>',
+                                $sidebar['name'],
+                                $sidebar['id']
+                        ),
+                        '4.2.0'
+                );
         }
 
@@ -1105 +1120 @@
 
         if ( ! isset( $wp_widget_factory->widgets[ $widget ] ) ) {
-                /* translators: %s: register_widget() */
-                _doing_it_wrong( __FUNCTION__, sprintf( __( 'Widgets need to be registered using %s, before they can be displayed.' ), '<code>register_widget()</code>' ), '4.9.0' );
+                _doing_it_wrong(
+                        __FUNCTION__,
+                        sprintf(
+                                /* translators: %s: register_widget() */
+                                __( 'Widgets need to be registered using %s, before they can be displayed.' ),
+                                '<code>register_widget()</code>'
+                        ),
+                        '4.9.0'
+                );
                 return;
         }