Changeset 55631

Timestamp:

04/06/2023 05:37:45 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Correct sprintf() calls for messages in wp-admin/upload.php.

This ensures that sprintf() is not unnecessarily applied to strings without any placeholders.

Follow-up to [31941], [31619], [36328], [55178].

See #57839.

File:

• trunk/src/wp-admin/upload.php (modified) (7 diffs)

trunk/src/wp-admin/upload.php

@@ -16 +16 @@
 $message = '';
 if ( ! empty( $_GET['posted'] ) ) {
-    $message                = __( 'Media file updated.' );
+    $message = __( 'Media file updated.' );
+
     $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'posted' ), $_SERVER['REQUEST_URI'] );
     unset( $_GET['posted'] );
@@ -23 +24 @@
 if ( ! empty( $_GET['attached'] ) && absint( $_GET['attached'] ) ) {
     $attached = absint( $_GET['attached'] );
+
     if ( 1 === $attached ) {
         $message = __( 'Media file attached.' );
     } else {
-        /* translators: %s: Number of media files. */
-        $message = _n( '%s media file attached.', '%s media files attached.', $attached );
-    }
-    $message                = sprintf( $message, $attached );
+        $message = sprintf(
+            /* translators: %s: Number of media files. */
+            _n( '%s media file attached.', '%s media files attached.', $attached ),
+            number_format_i18n( $attached )
+        );
+    }
+
     $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
     unset( $_GET['detach'], $_GET['attached'] );
@@ -36 +41 @@
 if ( ! empty( $_GET['detach'] ) && absint( $_GET['detach'] ) ) {
     $detached = absint( $_GET['detach'] );
+
     if ( 1 === $detached ) {
         $message = __( 'Media file detached.' );
     } else {
-        /* translators: %s: Number of media files. */
-        $message = _n( '%s media file detached.', '%s media files detached.', $detached );
-    }
-    $message                = sprintf( $message, $detached );
+        $message = sprintf(
+            /* translators: %s: Number of media files. */
+            _n( '%s media file detached.', '%s media files detached.', $detached ),
+            number_format_i18n( $detached )
+        );
+    }
+
     $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
     unset( $_GET['detach'], $_GET['attached'] );
@@ -49 +58 @@
 if ( ! empty( $_GET['deleted'] ) && absint( $_GET['deleted'] ) ) {
     $deleted = absint( $_GET['deleted'] );
+
     if ( 1 === $deleted ) {
         $message = __( 'Media file permanently deleted.' );
     } else {
-        /* translators: %s: Number of media files. */
-        $message = _n( '%s media file permanently deleted.', '%s media files permanently deleted.', $deleted );
-    }
-    $message                = sprintf( $message, $deleted );
+        $message = sprintf(
+            /* translators: %s: Number of media files. */
+            _n( '%s media file permanently deleted.', '%s media files permanently deleted.', $deleted ),
+            number_format_i18n( $deleted )
+        );
+    }
+
     $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deleted' ), $_SERVER['REQUEST_URI'] );
     unset( $_GET['deleted'] );
@@ -62 +75 @@
 if ( ! empty( $_GET['trashed'] ) && absint( $_GET['trashed'] ) ) {
     $trashed = absint( $_GET['trashed'] );
+
     if ( 1 === $trashed ) {
         $message = __( 'Media file moved to the Trash.' );
     } else {
-        /* translators: %s: Number of media files. */
-        $message = _n( '%s media file moved to the Trash.', '%s media files moved to the Trash.', $trashed );
-    }
-    $message                = sprintf( $message, $trashed );
-    $message               .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
+        $message = sprintf(
+            /* translators: %s: Number of media files. */
+            _n( '%s media file moved to the Trash.', '%s media files moved to the Trash.', $trashed ),
+            number_format_i18n( $trashed )
+        );
+    }
+
+    $message .= sprintf(
+        ' <a href="%1$s">%2$s</a>',
+        esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ),
+        __( 'Undo' )
+    );
+
     $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'trashed' ), $_SERVER['REQUEST_URI'] );
     unset( $_GET['trashed'] );
@@ -76 +98 @@
 if ( ! empty( $_GET['untrashed'] ) && absint( $_GET['untrashed'] ) ) {
     $untrashed = absint( $_GET['untrashed'] );
+
     if ( 1 === $untrashed ) {
         $message = __( 'Media file restored from the Trash.' );
     } else {
-        /* translators: %s: Number of media files. */
-        $message = _n( '%s media file restored from the Trash.', '%s media files restored from the Trash.', $untrashed );
-    }
-    $message                = sprintf( $message, $untrashed );
+        $message = sprintf(
+            /* translators: %s: Number of media files. */
+            _n( '%s media file restored from the Trash.', '%s media files restored from the Trash.', $untrashed ),
+            number_format_i18n( $untrashed )
+        );
+    }
+
     $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'untrashed' ), $_SERVER['REQUEST_URI'] );
     unset( $_GET['untrashed'] );
@@ -90 +116 @@
 $messages[2] = __( 'Media file permanently deleted.' );
 $messages[3] = __( 'Error saving media file.' );
-$messages[4] = __( 'Media file moved to the Trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
+$messages[4] = __( 'Media file moved to the Trash.' ) . sprintf(
+    ' <a href="%1$s">%2$s</a>',
+    esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ),
+    __( 'Undo' )
+);
 $messages[5] = __( 'Media file restored from the Trash.' );
 
 if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
-    $message                = $messages[ $_GET['message'] ];
+    $message = $messages[ $_GET['message'] ];
+
     $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message' ), $_SERVER['REQUEST_URI'] );
 }