Ticket #34684: 34684.patch

wp-admin/includes/class-wp-filesystem-ssh2.php

@@ -114 +114 @@
                 }
 
                 if ( ! $this->link ) {
-                        $this->errors->add('connect', sprintf(__('Failed to connect to SSH2 Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
+                        $this->errors->add( 'connect',
+                                sprintf(
+                                        /* translators: 1: hostname 2: port */
+                                        __( 'Failed to connect to SSH2 Server %1$s:%2$s' ),
+                                        $this->options['hostname'],
+                                        $this->options['port']
+                                )
+                        );
                         return false;
                 }
 
                 if ( !$this->keys ) {
                         if ( ! @ssh2_auth_password($this->link, $this->options['username'], $this->options['password']) ) {
-                                $this->errors->add('auth', sprintf(__('Username/Password incorrect for %s'), $this->options['username']));
+                                $this->errors->add( 'auth',
+                                        sprintf(
+                                                /* translators: %s: user name */
+                                                __( 'Username/Password incorrect for %s' ),
+                                                $this->options['username']
+                                        )
+                                );
                                 return false;
                         }
                 } else {
                         if ( ! @ssh2_auth_pubkey_file($this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'] ) ) {
-                                $this->errors->add('auth', sprintf(__('Public and Private keys incorrect for %s'), $this->options['username']));
+                                $this->errors->add( 'auth',
+                                        sprintf(
+                                                /* translators: %s: user name */
+                                                __( 'Public and Private keys incorrect for %s' ),
+                                                $this->options['username']
+                                        )
+                                );
                                 return false;
                         }
                 }
@@ -132 +151 @@
 
                 $this->sftp_link = ssh2_sftp( $this->link );
                 if ( ! $this->sftp_link ) {
-                        $this->errors->add( 'connect', sprintf( __( 'Failed to initialize a SFTP subsystem session with the SSH2 Server %1$s:%2$s' ), $this->options['hostname'], $this->options['port'] ) );
+                        $this->errors->add( 'connect',
+                                sprintf(
+                                        /* translators: 1: hostname 2: port */
+                                        __( 'Failed to initialize a SFTP subsystem session with the SSH2 Server %1$s:%2$s' ),
+                                        $this->options['hostname'],
+                                        $this->options['port']
+                                )
+                        );
                         return false;
                 }
 
@@ -173 +199 @@
                         return false;
 
                 if ( ! ($stream = ssh2_exec($this->link, $command)) ) {
-                        $this->errors->add('command', sprintf(__('Unable to perform command: %s'), $command));
+                        $this->errors->add( 'command',
+                                sprintf(
+                                        /* translators: %s: command */
+                                        __( 'Unable to perform command: %s'),
+                                        $command
+                                )
+                        );
                 } else {
                         stream_set_blocking( $stream, true );
                         stream_set_timeout( $stream, FS_TIMEOUT );