Improve wording of final backup message #918

virtualmin · Oct 11, 2024 · 16ff49c · 16ff49c
1 parent 659234d
commit 16ff49c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/backups-lib.pl b/backups-lib.pl
@@ -1954,10 +1954,15 @@ sub backup_domains
 
 # Show some status
 if ($ok) {
-	&$first_print(
-	  ($okcount || $errcount ?
-	    &text('backup_finalstatus', $okcount, $errcount) : "")."\n".
-	  ($vcount ? &text('backup_finalstatus2', $vcount) : ""));
+	if ($okcount && $errcount) {
+		&$first_print(&text('backup_finalstatus', $okcount, $errcount));
+		}
+	elsif ($okcount) {
+		&$first_print(&text('backup_finalstatusok', $okcount));
+		}
+	if ($vcount) {
+		&$first_print(&text('backup_finalstatus2', $vcount));
+		}
 	if ($errcount) {
 		&$first_print(&text('backup_errorsites',
 			      join(" ", map { $_->{'dom'} } @errdoms)));

diff --git a/lang/en b/lang/en
@@ -2729,8 +2729,9 @@ backup_upload10=Uploading archive to Backblaze ..
 backup_upload11=Uploading archive to Azure Blob Storage ..
 backup_upload12=Uploading archive to Google Drive ..
 backup_uploadfailed=.. upload failed! $1
-backup_finalstatus=$1 servers backed up successfully, $2 had errors.
-backup_finalstatus2=$1 Virtualmin configuration settings backed up successfully.
+backup_finalstatus=$1 virtual servers backed up successfully, $2 had errors.
+backup_finalstatusok=$1 virtual servers backed up successfully.
+backup_finalstatus2=$1 Virtualmin system configuration settings backed up successfully.
 backup_errorsites=Servers with errors: $1
 backup_emode=No valid backup destination mode selected
 backup_es3nopath=You must specify a filename when backing up to a single file on S3