diff options
| author | Jeff Davis <jdavis@postgresql.org> | 2023-05-08 10:34:51 -0700 |
|---|---|---|
| committer | Jeff Davis <jdavis@postgresql.org> | 2023-05-08 10:34:51 -0700 |
| commit | f7faa9976cc0504c027a20ed66ceca9018041dd4 (patch) | |
| tree | 8e3935fadc654b0b83984be96db95ed4a4cb36fe /src/backend | |
| parent | 8d525d7b9545884a3e0d79adcd61543f9ae2ae28 (diff) | |
| download | postgresql-f7faa9976cc0504c027a20ed66ceca9018041dd4.tar.gz postgresql-f7faa9976cc0504c027a20ed66ceca9018041dd4.zip | |
ICU: do not convert locale 'C' to 'en-US-u-va-posix'.
The conversion was intended to be for convenience, but it's more
likely to be confusing than useful.
The user can still directly specify 'en-US-u-va-posix' if desired.
Discussion: https://postgr.es/m/f83f089ee1e9acd5dbbbf3353294d24e1f196e95.camel@j-davis.com
Discussion: https://postgr.es/m/37520ec1ae9591f83132f82dbd625f3fc2d69c16.camel@j-davis.com
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/utils/adt/pg_locale.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index f0b6567da12..51b4221a39c 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -2782,26 +2782,10 @@ icu_language_tag(const char *loc_str, int elevel) { #ifdef USE_ICU UErrorCode status; - char lang[ULOC_LANG_CAPACITY]; char *langtag; size_t buflen = 32; /* arbitrary starting buffer size */ const bool strict = true; - status = U_ZERO_ERROR; - uloc_getLanguage(loc_str, lang, ULOC_LANG_CAPACITY, &status); - if (U_FAILURE(status)) - { - if (elevel > 0) - ereport(elevel, - (errmsg("could not get language from locale \"%s\": %s", - loc_str, u_errorName(status)))); - return NULL; - } - - /* C/POSIX locales aren't handled by uloc_getLanguageTag() */ - if (strcmp(lang, "c") == 0 || strcmp(lang, "posix") == 0) - return pstrdup("en-US-u-va-posix"); - /* * A BCP47 language tag doesn't have a clearly-defined upper limit * (cf. RFC5646 section 4.4). Additionally, in older ICU versions, @@ -2889,8 +2873,7 @@ icu_validate_locale(const char *loc_str) /* check for special language name */ if (strcmp(lang, "") == 0 || - strcmp(lang, "root") == 0 || strcmp(lang, "und") == 0 || - strcmp(lang, "c") == 0 || strcmp(lang, "posix") == 0) + strcmp(lang, "root") == 0 || strcmp(lang, "und") == 0) found = true; /* search for matching language within ICU */ |