diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2019-10-21 14:18:01 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2019-10-21 14:18:16 -0400 |
| commit | 4f2ad52269750c9f04121251a23e7f6ed1fb911c (patch) | |
| tree | a7c67af228b02a2b7cf210c5ece2f719cb67d82d | |
| parent | ca658c91ae724c0a093a039813666705ef0bcfa4 (diff) | |
| download | postgresql-4f2ad52269750c9f04121251a23e7f6ed1fb911c.tar.gz postgresql-4f2ad52269750c9f04121251a23e7f6ed1fb911c.zip | |
Deal with yet another issue related to "Norwegian (Bokmål)" locale.
It emerges that recent versions of Windows (at least 2016 Standard)
spell this locale name as "Norwegian Bokmål_Norway.1252", defeating
our mapping code that translates "Norwegian (Bokmål)_Norway" to
something that's all-ASCII (cf commits db29620d4 and aa1d2fc5e).
Add another mapping entry to handle this spelling.
Per bug #16068 from Robert Ford. Like the previous patches,
back-patch to all supported branches.
Discussion: https://postgr.es/m/16068-4cb6eeaa7eb46d93@postgresql.org
| -rw-r--r-- | src/port/win32setlocale.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/port/win32setlocale.c b/src/port/win32setlocale.c index 710dbb9b9d4..dfa31407381 100644 --- a/src/port/win32setlocale.c +++ b/src/port/win32setlocale.c @@ -96,8 +96,12 @@ static const struct locale_map locale_map_result[] = { * * It's not clear what encoding setlocale() uses when it returns the * locale name, so to play it safe, we search for "Norwegian (Bok*l)". + * + * Just to make life even more complicated, some versions of Windows spell + * the locale name without parentheses. Translate that too. */ {"Norwegian (Bokm", "l)_Norway", "Norwegian_Norway"}, + {"Norwegian Bokm", "l_Norway", "Norwegian_Norway"}, {NULL, NULL, NULL} }; |