From eb863af14628cd13ceb455c406937c717c8d3ee5 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sun, 2 Nov 2014 11:51:20 +0100
Subject: Plural and singular forms in error messages.

---
 proofs/proofview.ml  | 2 +-
 tactics/tacticals.ml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/proofs/proofview.ml b/proofs/proofview.ml
index 0a03965f1d..7ab7e882ce 100644
--- a/proofs/proofview.ml
+++ b/proofs/proofview.ml
@@ -368,7 +368,7 @@ let _ = Errors.register_handler begin function
       let open Pp in
       let errmsg =
         str"Incorrect number of goals" ++ spc() ++
-        str"(expected "++int i++str" tactics)."
+        str"(expected "++int i++str(String.plural i " tactic") ++ str")."
       in
       Errors.errorlabstrm "" errmsg
   | _ -> raise Errors.Unhandled
diff --git a/tactics/tacticals.ml b/tactics/tacticals.ml
index 2a21c53ab6..bc7e5f7cda 100644
--- a/tactics/tacticals.ml
+++ b/tactics/tacticals.ml
@@ -345,7 +345,7 @@ module New = struct
             | SizeMismatch (i,_)->
                 let errmsg =
                   str"Incorrect number of goals" ++ spc() ++
-                  str"(expected "++int i++str" tactics)"
+                  str"(expected "++int i++str(String.plural i " tactic") ++ str")"
                 in
                 tclFAIL 0 errmsg
             | reraise -> tclZERO reraise
@@ -368,7 +368,7 @@ module New = struct
             | SizeMismatch (i,_)->
                 let errmsg =
                   str"Incorrect number of goals" ++ spc() ++
-                  str"(expected "++int i++str" tactics)"
+                  str"(expected "++int i++str(String.plural i " tactic") ++ str")"
                 in
                 tclFAIL 0 errmsg
             | reraise -> tclZERO reraise
-- 
cgit v1.2.3