Ticket #37802: 37802.patch

wp-includes/functions.php

@@ -1411 +1411 @@
                 wp_load_translations_early();
 
                 // Die with a DB error.
-                $wpdb->error = sprintf( __( 'One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.' ), 'maint/repair.php?referrer=is_blog_installed' );
+                $wpdb->error = sprintf(
+                        /* translators: %s: database repair URL */
+                        __( 'One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.' ),
+                        'maint/repair.php?referrer=is_blog_installed'
+                );
+
                 dead_db();
         }
 
@@ -1895 +1900 @@
                                         $error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
                                 }
 
-                                $uploads['error'] = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), esc_html( $error_path ) );
+                                $uploads['error'] = sprintf(
+                                        /* translators: %s: directory path */
+                                        __( 'Unable to create directory %s. Is its parent directory writable by the server?' ),
+                                        esc_html( $error_path )
+                                );
                         }
 
                         $tested_paths[ $path ] = $uploads['error'];
@@ -2157 +2166 @@
                 else
                         $error_path = basename( $upload['basedir'] ) . $upload['subdir'];
 
-                $message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
+                $message = sprintf(
+                        /* translators: %s: directory path */
+                        __( 'Unable to create directory %s. Is its parent directory writable by the server?' ),
+                        $error_path
+                );
                 return array( 'error' => $message );
         }
 
@@ -2516 +2529 @@
  */
 function wp_nonce_ays( $action ) {
         if ( 'log-out' == $action ) {
-                $html = sprintf( __( 'You are attempting to log out of %s' ), get_bloginfo( 'name' ) ) . '</p><p>';
+                $html = sprintf(
+                        /* translators: %s: site name */
+                        __( 'You are attempting to log out of %s' ),
+                        get_bloginfo( 'name' )
+                );
+                $html .= '</p><p>';
                 $redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
-                $html .= sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url( $redirect_to ) );
+                $html .= sprintf(
+                        /* translators: %s: logout URL */
+                        __( 'Do you really want to <a href="%s">log out</a>?' ),
+                        wp_logout_url( $redirect_to )
+                );
         } else {
                 $html = __( 'Are you sure you want to do this?' );
                 if ( wp_get_referer() )
@@ -3990 +4012 @@
          */
         if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) {
                 if ( function_exists( '__' ) ) {
+                        /* translators: %s: version number */
                         $version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version );
                         /* translators: %s: Codex URL */
                         $message .= ' ' . sprintf( __( 'Please see <a href="%s">Debugging in WordPress</a> for more information.' ),