opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Tom Lane 2019-10-21 14:18:01 -04:00
parent d995fd667f
commit db477b691d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/port/win32setlocale.c
View File

@ -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}
};