archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8342582: user.region for formatting number no longer works for 21.0.5

Browse source 
Reviewed-by: jlu, rriggs
This commit is contained in:
Naoto Sato 2024-10-23 17:44:31 +00:00
parent 426da4bbad
commit e64f0798be
3 changed files with 98 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/java.base/share/classes/java/util/Locale.java
View file

@ -1126,28 +1126,11 @@ public final class Locale implements Cloneable, Serializable {
}
private static Locale initDefault() {
String language, region, script, country, variant;
language = StaticProperty.USER_LANGUAGE;
// for compatibility, check for old user.region property
region = StaticProperty.USER_REGION;
if (!region.isEmpty()) {
// region can be of form country, country_variant, or _variant
int i = region.indexOf('_');
if (i >= 0) {
country = region.substring(0, i);
variant = region.substring(i + 1);
} else {
country = region;
variant = "";
}
script = "";
} else {
script = StaticProperty.USER_SCRIPT;
country = StaticProperty.USER_COUNTRY;
variant = StaticProperty.USER_VARIANT;
}
return getInstance(language, script, country, variant,
return getInstance(
StaticProperty.USER_LANGUAGE,
StaticProperty.USER_SCRIPT,
StaticProperty.USER_COUNTRY,
StaticProperty.USER_VARIANT,
getDefaultExtensions(StaticProperty.USER_EXTENSIONS)
.orElse(null));
}