postgrespro.git / summary / log / commit / refs

commit    db477b691dc4e80bc8379d976ef53a0aa0afe4c0
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Mon Oct 21 18:18:01 2019 +0000

    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


 src/port/win32setlocale.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/port/win32setlocale.c b/src/port/win32setlocale.c
index 710dbb9b9d..dfa3140738 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}
 };
 


[parent: d995fd667f6d]