From: Bruno Haible <bruno@clisp.org>
Date: Thu, 4 Jan 2018 09:52:13 +0000 (+0100)
Subject: Use locales with the customary names.
X-Git-Tag: v0.20~435
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7059d9803924250d8968f5a4272333ad1c00d88d;p=thirdparty%2Fgettext.git

Use locales with the customary names.

On glibc systems, nowadays, the German and French locales are named
'de_DE.UTF-8' and 'fr_FR.UTF-8', respectively. This change avoids the need
to install similar locales with different names.

* gettext-tools/tests/gettext-3: Use locales with '.UTF-8' suffix.
* gettext-tools/tests/gettext-3-prg.c (lang): Likewise.
---

diff --git a/gettext-tools/tests/gettext-3 b/gettext-tools/tests/gettext-3
index 0f64ee8b8..404cee2af 100755
--- a/gettext-tools/tests/gettext-3
+++ b/gettext-tools/tests/gettext-3
@@ -11,20 +11,20 @@ test "$GLIBC2" = yes || {
   Exit 77
 }
 
-# This test works only on systems that have a de_DE and fr_FR locale installed.
-LC_ALL=de_DE ../testlocale || {
+# This test works only on systems that have a de_DE.UTF-8 and fr_FR.UTF-8 locale installed.
+LC_ALL=de_DE.UTF-8 ../testlocale || {
   if test -f /usr/bin/localedef; then
-    echo "Skipping test: locale de_DE not installed"
+    echo "Skipping test: locale de_DE.UTF-8 not installed"
   else
-    echo "Skipping test: locale de_DE not supported"
+    echo "Skipping test: locale de_DE.UTF-8 not supported"
   fi
   Exit 77
 }
-LC_ALL=fr_FR ../testlocale || {
+LC_ALL=fr_FR.UTF-8 ../testlocale || {
   if test -f /usr/bin/localedef; then
-    echo "Skipping test: locale fr_FR not installed"
+    echo "Skipping test: locale fr_FR.UTF-8 not installed"
   else
-    echo "Skipping test: locale fr_FR not supported"
+    echo "Skipping test: locale fr_FR.UTF-8 not supported"
   fi
   Exit 77
 }
diff --git a/gettext-tools/tests/gettext-3-prg.c b/gettext-tools/tests/gettext-3-prg.c
index aca8c5be1..3bc2d2bff 100644
--- a/gettext-tools/tests/gettext-3-prg.c
+++ b/gettext-tools/tests/gettext-3-prg.c
@@ -44,7 +44,7 @@ struct data_t strings[] =
 };
 const int data_cnt = sizeof (strings) / sizeof (strings[0]);
 
-const char *lang[] = { "de_DE", "fr_FR", "ll_CC" };
+const char *lang[] = { "de_DE.UTF-8", "fr_FR.UTF-8", "ll_CC" };
 const int lang_cnt = sizeof (lang) / sizeof (lang[0]);
 
 int