X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/042f5bed7ff3e5b34ff3166951a7b98bf6bbf105..3f9f71ca8adbab14eafccca1d6f634e836325d5c:/uip/folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 23aea0b7..077fa053 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -568,9 +568,9 @@ print_folders (void)
 			nummsgdigits, "no",
 			fi[i].others ? lowmsgdigits + hghmsgdigits + 5 : 0, "");
 	    } else {
-		printf ("has %*d message%s  (%*d-%*d)",
+		printf ("has %*d message%1s  (%*d-%*d)",
 			nummsgdigits, fi[i].nummsg,
-			(fi[i].nummsg == 1) ? " " : "s",
+			PLURALS(fi[i].nummsg),
 			lowmsgdigits, fi[i].lowmsg,
 			hghmsgdigits, fi[i].hghmsg);
 		if (fi[i].curmsg >= fi[i].lowmsg && fi[i].curmsg <= fi[i].hghmsg) {
@@ -591,9 +591,9 @@ print_folders (void)
     if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
 	if (all)
 	    putchar('\n');
-	printf ("TOTAL = %d message%c in %d folder%s.\n",
-		total_msgs, total_msgs != 1 ? 's' : ' ',
-		total_folders, total_folders != 1 ? "s" : "");
+	printf ("TOTAL = %d message%s in %d folder%s.\n",
+		total_msgs, PLURALS(total_msgs),
+		total_folders, PLURALS(total_folders));
     }
 
     fflush (stdout);