diff options
author | H.Merijn Brand <perl5@tux.freedom.nl> | 2021-06-16 08:30:15 +0200 |
---|---|---|
committer | H.Merijn Brand <perl5@tux.freedom.nl> | 2021-06-16 08:30:15 +0200 |
commit | 78f044cf3c081ec5840ad6e07cf2e3d33f2c227e (patch) | |
tree | 3794f89e320d520123dfb61cece316ddffb2bc3b /Configure | |
parent | 2723cea2c509f164b666b2fdd3c1ecf4b9685be7 (diff) | |
download | perl-78f044cf3c081ec5840ad6e07cf2e3d33f2c227e.tar.gz |
Disambiguate what user sees in interactive Configure
User should expect to see configuration questions spelled 'UTF-8', not
'UTF8' (even if we store information internally or in config.sh without
the hyphen).
Correct user prompts accordingly.
For: #18844
https://github.com/Perl/perl5/pull/18870 by @jkeenan
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -18195,7 +18195,7 @@ case $d_setlocale in echo "Your system has setlocale()..." >&4 $run ./try case $? in - 0) echo "and it seems sane; you don't have a C.UTF8 locale" >&4 + 0) echo "and it seems sane; you don't have a C.UTF-8 locale" >&4 d_setlocale="$define" d_setlocale_accepts_any_locale_name="$undef" d_has_C_UTF8="false" @@ -18205,7 +18205,7 @@ case $d_setlocale in d_setlocale_accepts_any_locale_name="$define" d_has_C_UTF8="false" ;; - 2) echo "and it seems sane; you have a C.UTF8 locale" >&4 + 2) echo "and it seems sane; you have a C.UTF-8 locale" >&4 d_setlocale="$define" d_setlocale_accepts_any_locale_name="$undef" d_has_C_UTF8="true" @@ -18237,12 +18237,12 @@ $rm_try $undef) echo "There may be other ways to set the locale on your system, so we need to ask:" >&4 ;; esac - rp="Does your system have the C.UTF8 locale?" + rp="Does your system have the C.UTF-8 locale?" dflt=n . ./myread case "$ans" in [Yy]*) d_has_C_UTF8="true" - c_utf8_locale=" or C.UTF8" + c_utf8_locale=" or C.UTF-8" ;; *) d_has_C_UTF8="false" c_utf8_locale="" |