archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 03:54:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8220227: Host Locale Provider getDisplayCountry returns error message under non-English Win10

Browse source 
Adjusting to detect translated Unknown messages

Reviewed-by: naoto
This commit is contained in:
Toshio Nakamura 2019-03-13 13:05:37 +09:00
parent bcdbc436ec
commit aa5aa46fb0
4 changed files with 36 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -510,8 +510,15 @@ public class HostLocaleProviderAdapterImpl {
public String getDisplayCountry(String countryCode, Locale locale) {
// Retrieves the display country name by calling
// GetLocaleInfoEx(LOCALE_SLOCALIZEDCOUNTRYNAME).
return getDisplayString(locale.toLanguageTag(),
DN_LOCALE_REGION, nativeDisplayLanguage+"-"+countryCode);
String str = getDisplayString(locale.toLanguageTag(),
DN_LOCALE_REGION,
nativeDisplayLanguage+"-"+countryCode);
// Hack: Windows 10 returns translated "Unknown Region (XX)"
// for localized XX region name. Take that as not known.
if (str != null && str.endsWith("("+countryCode+")")) {
return null;
}
return str;
}
@Override

18
src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -168,11 +168,6 @@ WCHAR * fixes[2][2][3][16] =
}
};
// Localized region name for unknown regions (Windows 10)
#define UNKNOWN_REGION L"Unknown Region ("
#define UNKNOWN_REGION_SIZE wcslen(UNKNOWN_REGION)
/*
* Class: sun_util_locale_provider_HostLocaleProviderAdapterImpl
* Method: initialize
@ -755,15 +750,10 @@ JNIEXPORT jstring JNICALL Java_sun_util_locale_provider_HostLocaleProviderAdapte
(*env)->ReleaseStringChars(env, jStr, pjChar);
if (got) {
// Hack: Windows 10 returns "Unknown Region (XX)" for localized XX region name.
// Take that as not known.
if (type != sun_util_locale_provider_HostLocaleProviderAdapterImpl_DN_LOCALE_REGION ||
wcsncmp(UNKNOWN_REGION, buf, UNKNOWN_REGION_SIZE) != 0) {
return (*env)->NewString(env, buf, (jsize)wcslen(buf));
}
return (*env)->NewString(env, buf, (jsize)wcslen(buf));
} else {
return NULL;
}
return NULL;
}
int getLocaleInfoWrapper(const jchar *langtag, LCTYPE type, LPWSTR data, int buflen) {