infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-10 15:08:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

6610748: Dateformat - AM-PM indicator in Finnish appears to be from English

Browse Source 
Reviewed-by: yhuang, peytoia
This commit is contained in:
Yong Jeffrey Huang 2009-12-08 21:14:04 -08:00
parent 945eaabe91
commit d87dfc7a2e
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/share/classes/sun/text/resources/FormatData_fi.java
View File

@ -133,6 +133,12 @@ public class FormatData_fi extends ListResourceBundle {
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
{ "AmPmMarkers",
new String[] {
"ap.", // am marker
"ip." // pm marker
}
},
};
}
}

23
jdk/test/sun/text/resources/LocaleData
View File

@ -5526,3 +5526,26 @@ LocaleNames//IM=Isle Of Man
# BL, MF (6627549)
LocaleNames//BL=Saint Barth\u00e9lemy
LocaleNames//MF=Saint Martin
# bug 6609737
FormatData/de/DateTimePatterns/0=HH:mm' Uhr 'z
TimeZoneNames/de/CET/1=Mitteleurop\u00e4ische Zeit
TimeZoneNames/de/CET/2=MEZ
TimeZoneNames/de/CET/3=Mitteleurop\u00e4ische Sommerzeit
TimeZoneNames/de/CET/4=MESZ
TimeZoneNames/de/EET/2=OEZ
TimeZoneNames/de/EET/4=OESZ
TimeZoneNames/de/WET/2=WEZ
TimeZoneNames/de/WET/4=WESZ
# bug 6610748
FormatData/fi/AmPmMarkers/0=ap.
FormatData/fi/AmPmMarkers/1=ip.
# bug 6507067
TimeZoneNames/zh_TW/Asia\/Taipei/1=\u53f0\u7063\u6a19\u6e96\u6642\u9593
TimeZoneNames/zh_TW/Asia\/Taipei/2=TST
# bug 6645271
FormatData/hr_HR/DateTimePatterns/6=dd.MM.yyyy.
FormatData/hr_HR/DateTimePatterns/7=dd.MM.yy.

11
jdk/test/sun/text/resources/LocaleDataTest.java
View File

@ -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
* 6509039 6609737 6610748 6645271 6507067
* @summary Verify locale data
*
*/
@ -255,6 +255,15 @@ public class LocaleDataTest
index = key.length();
resTag = key.substring(oldIndex, index);
// TimeZone name may have "/" in it, for example "Asia/Taipei", so use "Asia\/Taipei in LocaleData.
if(resTag.endsWith("\\")) {
resTag = resTag.substring(0, resTag.length() - 1);
oldIndex = index;
index = key.indexOf("/", oldIndex + 1);
if (index == -1) index = key.length();
resTag += key.substring(oldIndex, index);
}
if (index < key.length() - 1)
qualifier = key.substring(index + 1);
else