Use mu_true_answer_p()

2 files changed, 8 insertions, 12 deletions

diff --git a/mh/mh.h b/mh/mh.h
index 63f2220ed..c9d9c1135 100644
--- a/mh/mh.h
+++ b/mh/mh.h
@@ -63,7 +63,7 @@ extern char *strchrnul __P((const char *s, int c_in));
 #define MH_CONTEXT_FILE "context"
 #define DEFAULT_ALIAS_FILE MHLIBDIR "/MailAliases"
 
-#define is_true(arg) ((arg)==NULL||(arg)[0] == 'y')
+#define is_true(arg) ((arg) == NULL||mu_true_answer_p (arg) == 1)
 
 enum mh_opcode
 {
diff --git a/mh/mh_init.c b/mh/mh_init.c
index db011fdbd..e4e7ffe93 100644
--- a/mh/mh_init.c
+++ b/mh/mh_init.c
@@ -256,7 +256,7 @@ mh_vgetyn (const char *fmt, va_list ap)
   while (1)
     {
       char *p;
-      int len;
+      int len, rc;
       
       vfprintf (stdout, fmt, ap);
       fprintf (stdout, "? ");
@@ -269,17 +269,13 @@ mh_vgetyn (const char *fmt, va_list ap)
 
       while (*p && isspace (*p))
 	p++;
-      
-      switch (p[0])
-	{
-	case 'y':
-	case 'Y':
-	  return 1;
-	case 'n':
-	case 'N':
-	  return 0;
-	}
 
+      rc = mu_true_answer_p (p);
+
+      if (rc >= 0)
+	return rc;
+
+      /* TRANSLATORS: See msgids "nN" and "yY". */
       fprintf (stdout, _("Please answer yes or no: "));
     }
   return 0; /* to pacify gcc */