Improve messages in Makefile.am about French locale now needed.

3 files changed, 17 insertions, 8 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index eca4313a..b20fff47 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-17         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* Makefile.am (charset-tests-all): Add punctuation in the message.
+	(charset-msg-start): Add fr_FR.UTF-8 to list of desired locales,
+	reformat the message.
+
 2018-01-15         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* Makefile.am (nlstringtest): New test.
diff --git a/test/Makefile.am b/test/Makefile.am
index 81b36066..26996ad0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1385,7 +1385,7 @@ charset-tests-all:
 		$(MAKE) charset-msg-start charset-tests charset-msg-end; \
 	else \
 		echo %%%%%%%%%% Inadequate locale support: skipping charset tests. ; \
-		echo %%%%%%%%%% At least en_US.UTF-8 fr_FR.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \
+		echo %%%%%%%%%% At least en_US.UTF-8, fr_FR.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \
 	fi
 
 charset-tests: $(LOCALE_CHARSET_TESTS)
@@ -1458,9 +1458,10 @@ charset-msg-start:
 	@echo "======== Starting tests that can vary based on character set or locale support ========"
 	@echo "**************************************************************************"
 	@echo "* Some or all of these tests may fail if you have inadequate or missing  *"
-	@echo "* locale support. At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are  *"
-	@echo "* needed. The el_GR.iso88597 is optional but helpful. However, if you    *"
-	@echo "* see this message, the Makefile thinks you have what you need ...       *"
+	@echo "* locale support. At least en_US.UTF-8, fr_FR.UTF-8, ru_RU.UTF-8 and     *"
+	@echo "* ja_JP.UTF-8 are needed. The el_GR.iso88597 is optional but helpful.    *"
+	@echo "* However, if you see this message, the Makefile thinks you have what    *"
+	@echo "* you need ...                                                           *"
 	@echo "**************************************************************************"
 
 charset-msg-end:
diff --git a/test/Makefile.in b/test/Makefile.in
index e5676b51..e3e98da0 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -974,6 +974,7 @@ EXTRA_DIST = \
 	nlstrina.ok \
 	nlstringtest.awk \
 	nlstringtest.ok \
+	nlstringtest.po \
 	fr \
 	noeffect.awk \
 	noeffect.ok \
@@ -1825,7 +1826,7 @@ charset-tests-all:
 		$(MAKE) charset-msg-start charset-tests charset-msg-end; \
 	else \
 		echo %%%%%%%%%% Inadequate locale support: skipping charset tests. ; \
-		echo %%%%%%%%%% At least en_US.UTF-8 fr_FR.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \
+		echo %%%%%%%%%% At least en_US.UTF-8, fr_FR.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \
 	fi
 
 charset-tests: $(LOCALE_CHARSET_TESTS)
@@ -1898,9 +1899,10 @@ charset-msg-start:
 	@echo "======== Starting tests that can vary based on character set or locale support ========"
 	@echo "**************************************************************************"
 	@echo "* Some or all of these tests may fail if you have inadequate or missing  *"
-	@echo "* locale support. At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are  *"
-	@echo "* needed. The el_GR.iso88597 is optional but helpful. However, if you    *"
-	@echo "* see this message, the Makefile thinks you have what you need ...       *"
+	@echo "* locale support. At least en_US.UTF-8, fr_FR.UTF-8, ru_RU.UTF-8 and     *"
+	@echo "* ja_JP.UTF-8 are needed. The el_GR.iso88597 is optional but helpful.    *"
+	@echo "* However, if you see this message, the Makefile thinks you have what    *"
+	@echo "* you need ...                                                           *"
 	@echo "**************************************************************************"
 
 charset-msg-end: