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

Timestamp:

09/01/2019 05:12:43 PM (5 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/wp-db.php (modified) (4 diffs)

trunk/src/wp-includes/wp-db.php

@@ -1308 +1308 @@
         if ( strpos( $query, '%' ) === false ) {
             wp_load_translations_early();
-            _doing_it_wrong( 'wpdb::prepare', sprintf( __( 'The query argument of %s must have a placeholder.' ), 'wpdb::prepare()' ), '3.9.0' );
+            _doing_it_wrong(
+                'wpdb::prepare',
+                sprintf(
+                    /* translators: %s: wpdb::prepare() */
+                    __( 'The query argument of %s must have a placeholder.' ),
+                    'wpdb::prepare()'
+                ),
+                '3.9.0'
+            );
         }
 
@@ -1321 +1329 @@
             if ( ! is_scalar( $arg ) && ! is_null( $arg ) ) {
                 wp_load_translations_early();
-                _doing_it_wrong( 'wpdb::prepare', sprintf( __( 'Unsupported value type (%s).' ), gettype( $arg ) ), '4.8.2' );
+                _doing_it_wrong(
+                    'wpdb::prepare',
+                    sprintf(
+                        /* translators: %s: value type */
+                        __( 'Unsupported value type (%s).' ),
+                        gettype( $arg )
+                    ),
+                    '4.8.2'
+                );
             }
         }
@@ -1358 +1374 @@
                 // If the passed query only expected one argument, but the wrong number of arguments were sent as an array, bail.
                 wp_load_translations_early();
-                _doing_it_wrong( 'wpdb::prepare', __( 'The query only expected one placeholder, but an array of multiple placeholders was sent.' ), '4.9.0' );
+                _doing_it_wrong(
+                    'wpdb::prepare',
+                    __( 'The query only expected one placeholder, but an array of multiple placeholders was sent.' ),
+                    '4.9.0'
+                );
 
                 return;
@@ -1369 +1389 @@
                 _doing_it_wrong(
                     'wpdb::prepare',
-                    /* translators: 1: number of placeholders, 2: number of arguments passed */
                     sprintf(
+                        /* translators: 1: number of placeholders, 2: number of arguments passed */
                         __( 'The query does not contain the correct number of placeholders (%1$d) for the number of arguments passed (%2$d).' ),
                         $placeholders,