From bffc24639a1a1e800e4cd6b46658b8c9159f76cc Mon Sep 17 00:00:00 2001
From: Yong Jeffrey Huang <yhuang@openjdk.org>
Date: Thu, 17 Dec 2009 02:12:18 -0800
Subject: [PATCH] 6645268: Country/language names with locale fi_FI are
 incorrect for FRANCE/FRENCH

Reviewed-by: yhuang, peytoia
---
 .../classes/sun/util/resources/LocaleNames_fi.properties    | 4 ++--
 jdk/test/sun/text/resources/LocaleData                      | 6 ++++++
 jdk/test/sun/text/resources/LocaleDataTest.java             | 2 +-
 jdk/test/sun/util/resources/Locale/Bug4429024.java          | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNames_fi.properties b/jdk/src/share/classes/sun/util/resources/LocaleNames_fi.properties
index a055e55acd8..831b1a9cd7a 100644
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames_fi.properties
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames_fi.properties
@@ -49,7 +49,7 @@ el=kreikka
 en=englanti
 es=espanja
 fi=suomi
-fr=franska
+fr=ranska
 he=heprea
 iw=heprea
 hi=hindi
@@ -80,7 +80,7 @@ DE=Saksa
 DK=Tanska
 ES=Espanja
 FI=Suomi
-FR=Franska
+FR=Ranska
 GB=Iso-Britannia
 GR=Kreikka
 IE=Irlanti
diff --git a/jdk/test/sun/text/resources/LocaleData b/jdk/test/sun/text/resources/LocaleData
index 315caf7e1cf..7c1af1368ce 100644
--- a/jdk/test/sun/text/resources/LocaleData
+++ b/jdk/test/sun/text/resources/LocaleData
@@ -5557,3 +5557,9 @@ CurrencyNames/tr_TR/TRY=TL
 CalendarData/ro/firstDayOfWeek=2
 CalendarData/ro/minimalDaysInFirstWeek=1
 FormatData/ro/DayNames/6=s\u00e2mb\u0103t\u0103
+
+#bug 6645268
+LocaleNames/fi/fr=ranska
+LocaleNames/fi/FR=Ranska
+LocaleNames/fi_FI/fr=ranska
+LocaleNames/fi_FI/FR=Ranska
diff --git a/jdk/test/sun/text/resources/LocaleDataTest.java b/jdk/test/sun/text/resources/LocaleDataTest.java
index 872c4498df2..9ebb3de5650 100644
--- a/jdk/test/sun/text/resources/LocaleDataTest.java
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java
@@ -31,7 +31,7 @@
  *      5102005 5074431 6182685 6208712 6277020 6245766 6351682 6386647 6379382
  *      6414459 6455680 6498742 6558863 6488119 6547501 6497154 6558856 6481177
  *      6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259
- *      6509039 6609737 6610748 6645271 6507067 6873931 6450945
+ *      6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268
  * @summary Verify locale data
  *
  */
diff --git a/jdk/test/sun/util/resources/Locale/Bug4429024.java b/jdk/test/sun/util/resources/Locale/Bug4429024.java
index 6a3ffc2891f..e592025d0b3 100644
--- a/jdk/test/sun/util/resources/Locale/Bug4429024.java
+++ b/jdk/test/sun/util/resources/Locale/Bug4429024.java
@@ -46,7 +46,7 @@ public class Bug4429024 {
                     { "en", "englanti" },
                     { "es", "espanja" },
                     { "fi", "suomi" },
-                    { "fr", "franska" },
+                    { "fr", "ranska" },
                     { "he", "heprea" },
                     { "hi", "hindi" },
                     { "it", "italia" },
@@ -75,7 +75,7 @@ public class Bug4429024 {
                     { "DK", "Tanska" },
                     { "ES", "Espanja" },
                     { "FI", "Suomi" },
-                    { "FR", "Franska" },
+                    { "FR", "Ranska" },
                     { "GB", "Iso-Britannia" },
                     { "GR", "Kreikka" },
                     { "IE", "Irlanti" },