From 1f5471841b2d155cd52b42f9e6517cb9ef352fe6 Mon Sep 17 00:00:00 2001 From: Stefano de Fabris Date: Thu, 3 Jun 2021 14:43:20 +0200 Subject: [PATCH 1/2] Fix Norwegian Bokmal locale --- build.gradle.kts | 2 +- driver/src/main/java/com/impossibl/postgres/utils/Locales.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 59fe9df7b..5332b11f6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ allprojects { } group = "com.impossibl.pgjdbc-ng" - version = "0.8.9" + version = "0.8.9-bokmal" extra["isSnapshot"] = version.toString().endsWith("SNAPSHOT") diff --git a/driver/src/main/java/com/impossibl/postgres/utils/Locales.java b/driver/src/main/java/com/impossibl/postgres/utils/Locales.java index b9d5af1c8..e2e03d2e2 100644 --- a/driver/src/main/java/com/impossibl/postgres/utils/Locales.java +++ b/driver/src/main/java/com/impossibl/postgres/utils/Locales.java @@ -51,6 +51,9 @@ public class Locales { public static Locale parseLocale(String localeValue) { // Strip encoding/codepage localeValue = localeValue.split("\\.", 2)[0]; + if (localeValue.startsWith("Norwegian Bokm")) { + localeValue = "Norwegian Bokmal"; + } switch (localeValue.toUpperCase(Locale.ROOT)) { case "C": From 6114cd26773600445877057498027e80cf9ce716 Mon Sep 17 00:00:00 2001 From: Stefano de Fabris Date: Thu, 3 Jun 2021 15:59:32 +0200 Subject: [PATCH 2/2] Fix Norwegian Bokmal -> Norwegian_Norway --- driver/src/main/java/com/impossibl/postgres/utils/Locales.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/driver/src/main/java/com/impossibl/postgres/utils/Locales.java b/driver/src/main/java/com/impossibl/postgres/utils/Locales.java index e2e03d2e2..bc48abcf8 100644 --- a/driver/src/main/java/com/impossibl/postgres/utils/Locales.java +++ b/driver/src/main/java/com/impossibl/postgres/utils/Locales.java @@ -52,7 +52,7 @@ public static Locale parseLocale(String localeValue) { // Strip encoding/codepage localeValue = localeValue.split("\\.", 2)[0]; if (localeValue.startsWith("Norwegian Bokm")) { - localeValue = "Norwegian Bokmal"; + localeValue = "Norwegian_Norway"; } switch (localeValue.toUpperCase(Locale.ROOT)) {