opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 18:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11738 from rhatdan/docs

Browse Source 
Fix english on prune prompt
This commit is contained in:
OpenShift Merge Robot
2021-09-24 12:14:54 -04:00
committed by GitHub
parent 9c48947c73 a97551eb20
commit 85d9b37051
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/images/prune.go
View File

@ -80,7 +80,7 @@ func prune(cmd *cobra.Command, args []string) error {
func createPruneWarningMessage(pruneOpts entities.ImagePruneOptions) string { func createPruneWarningMessage(pruneOpts entities.ImagePruneOptions) string {
question := "Are you sure you want to continue? [y/N] " question := "Are you sure you want to continue? [y/N] "
if pruneOpts.All { if pruneOpts.All {
return "WARNING! This will remove all images without at least one container associated to them.\n" + question return "WARNING! This command removes all images without at least one container associated with them.\n" + question
} }
return "WARNING! This will remove all dangling images.\n" + question return "WARNING! This command removes all dangling images.\n" + question
} }

6
cmd/podman/system/prune.go
View File

@ -113,15 +113,15 @@ func prune(cmd *cobra.Command, args []string) error {
func createPruneWarningMessage(pruneOpts entities.SystemPruneOptions) string { func createPruneWarningMessage(pruneOpts entities.SystemPruneOptions) string {
if pruneOpts.All { if pruneOpts.All {
return `WARNING! This will remove: return `WARNING! This command removes:
- all stopped containers - all stopped containers
- all networks not used by at least one container%s - all networks not used by at least one container%s
- all images without at least one container associated to them - all images without at least one container associated with them
- all build cache - all build cache
%s` %s`
} }
return `WARNING! This will remove: return `WARNING! This command removes:
- all stopped containers - all stopped containers
- all networks not used by at least one container%s - all networks not used by at least one container%s
- all dangling images - all dangling images