locale-print-LANGUAGE

Comments tell that LANG has to be the first value, and LC_ALL the last
one.  Thus LANGUAGE is printed between them.

# DP: Dpatch author: Denis Barbier
# DP: Patch author: Denis Barbier
# DP: Upstream status: not submitted
# DP: Date: 2006-01-08

Gbp-Pq: Topic locale
Gbp-Pq: Name locale-print-LANGUAGE.diff

diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index 575b208e82d7bff89b20fce6cd5392cdea067f2a..bde36003229021ce2285fd52cd9f9e9c7cf65576 100644 (file)
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -796,11 +796,15 @@ static void
 show_locale_vars (void)
 {
   const char *lcall = getenv ("LC_ALL") ?: "";
+  const char *language = getenv ("LANGUAGE") ?: "";
   const char *lang = getenv ("LANG") ?: "";
 
   /* LANG has to be the first value.  */
   print_assignment ("LANG", lang, false);
 
+  if (getenv ("POSIXLY_CORRECT") == NULL)
+    printf ("LANGUAGE=%s\n", language);
+
   /* Now all categories in an unspecified order.  */
   for (size_t cat_no = 0; cat_no < NCATEGORIES; ++cat_no)
     if (cat_no != LC_ALL)

diff --git a/locale/tst-locale-locpath.sh b/locale/tst-locale-locpath.sh
index 14ad4a14926ef36b2d3b3bc7449cb8dc72b316de..31761cfb604411d457e10abfbf0e17d05ff0837c 100644 (file)
--- a/locale/tst-locale-locpath.sh
+++ b/locale/tst-locale-locpath.sh
@@ -54,6 +54,7 @@ EOF
 
 cat > "$testroot/stdout-expected" <<EOF
 LANG=
+LANGUAGE=
 LC_CTYPE="invalid-locale"
 LC_NUMERIC="invalid-locale"
 LC_TIME="invalid-locale"