Make string generation for consistent

Author: schlessera

src/Capabilities_Command.php

@@ -86,7 +86,7 @@ public function list_( $args, $assoc_args ) {
 			$output_cap = new stdClass();
 
 			$output_cap->name  = $cap;
-			$output_cap->grant = ( $grant ) ? 'true' : 'false';
+			$output_cap->grant = $grant ? 'true' : 'false';
 
 			$output_caps[] = $output_cap;
 		}
@@ -156,12 +156,10 @@ public function add( $args, $assoc_args ) {
 			$count++;
 		}
 
-		if ( $grant ) {
-			$message = ( 1 === $count ) ? "Added %d capability to '%s' role." : "Added %d capabilities to '%s' role.";
-		} else {
-			$message = ( 1 === $count ) ? "Added %d capability to '%s' role as false." : "Added %d capabilities to '%s' role as false.";
-		}
-		WP_CLI::success( sprintf( $message, $count, $role ) );
+		$capability          = WP_CLI\Utils\pluralize( 'capability', $count );
+		$grant_qualification = $grant ? '' : ' as false';
+
+		WP_CLI::success( "Added {$count} {$capability} to '{$role}' role{$grant_qualification}." );
 	}
 
 	/**
@@ -200,8 +198,9 @@ public function remove( $args ) {
 			$count++;
 		}
 
-		$message = ( 1 === $count ) ? "Removed %d capability from '%s' role." : "Removed %d capabilities from '%s' role.";
-		WP_CLI::success( sprintf( $message, $count, $role ) );
+		$capability = WP_CLI\Utils\pluralize( 'capability', $count );
+
+		WP_CLI::success( "Removed {$count} {$capability} from '{$role}' role." );
 	}
 
 	/**

src/Role_Command.php

@@ -192,9 +192,9 @@ public function create( $args, $assoc_args ) {
 				foreach ( $capabilities as $cap ) {
 					$role_obj->add_cap( $cap );
 				}
-				WP_CLI::success( sprintf( "Role with key '%s' created. Cloned capabilities from '%s'.", $role_key, $assoc_args['clone'] ) );
+				WP_CLI::success( "Role with key '{$role_key}' created. Cloned capabilities from '{$assoc_args['clone']}'." );
 			} else {
-				WP_CLI::success( sprintf( "Role with key '%s' created.", $role_key ) );
+				WP_CLI::success( "Role with key '{$role_key}' created." );
 			}
 		} else {
 			WP_CLI::error( "Role couldn't be created." );
@@ -235,9 +235,9 @@ public function delete( $args ) {
 		// Note: remove_role() doesn't indicate success or otherwise, so we have to
 		// check ourselves
 		if ( ! isset( $wp_roles->roles[ $role_key ] ) ) {
-			WP_CLI::success( sprintf( "Role with key '%s' deleted.", $role_key ) );
+			WP_CLI::success( "Role with key '{$role_key}' deleted." );
 		} else {
-			WP_CLI::error( sprintf( "Role with key '%s' could not be deleted.", $role_key ) );
+			WP_CLI::error( "Role with key '{$role_key}' could not be deleted." );
 		}
 
 	}