From 75f695f688fc97c0efea30822cb106f0b66845c3 Mon Sep 17 00:00:00 2001 From: Goetz Lindenmaier Date: Mon, 9 Jan 2023 15:58:23 +0000 Subject: [PATCH] 8299439: java/text/Format/NumberFormat/CurrencyFormat.java fails for hr_HR 8299483: ProblemList java/text/Format/NumberFormat/CurrencyFormat.java Backport-of: cf6c041bd82a9b62780ef3126e93865fac8c0444 --- .../sun/util/resources/ext/CurrencyNames_hr_HR.properties | 3 ++- test/jdk/ProblemList.txt | 2 +- .../text/Format/NumberFormat/CurrencySymbols.properties | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties index 70f210e2da6..56e61953a8c 100644 --- a/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties +++ b/src/jdk.localedata/share/classes/sun/util/resources/ext/CurrencyNames_hr_HR.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2023, 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 @@ -35,4 +35,5 @@ # This notice and attribution to Taligent may not be removed. # Taligent is a registered trademark of Taligent, Inc. +EUR=\u20AC HRK=Kn diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt index 835bc07ae25..fb9defd510b 100644 --- a/test/jdk/ProblemList.txt +++ b/test/jdk/ProblemList.txt @@ -1,6 +1,6 @@ ########################################################################### # -# Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2023, 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 diff --git a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties index cf73a9c7e31..665dd3b290a 100644 --- a/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties +++ b/test/jdk/java/text/Format/NumberFormat/CurrencySymbols.properties @@ -79,7 +79,7 @@ fr_FR=\u20AC fr_LU=\u20AC hi_IN=\u0930\u0942 hr=\u00A4 -hr_HR=Kn +hr_HR=\u20AC hu=\u00A4 hu_HU=Ft is=\u00A4 @@ -94,9 +94,9 @@ ja_JP=\uFFE5 ko=\u00A4 ko_KR=\uFFE6 lt=\u00A4 -lt_LT=Lt;2014-12-31-22-00-00;\u20AC +lt_LT=\u20AC lv=\u00A4 -lv_LV=Ls;2013-12-31-22-00-00;\u20AC +lv_LV=\u20AC mk=\u00A4 mk_MK=Den nl=\u00A4