Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 d8d30a8a 编写于 作者: S sgehwolf
浏览文件
操作

8244843: JapanEraNameCompatTest fails 

Summary: Backports hr, lt, in, nl, no, sr_Latn & sv changes from 8008577, 8145136 and 8219781
Reviewed-by: andrew
上级 54b26037
隐藏空白更改
内联 并排
Showing with 617 addition and 0 deletion
src/share/classes/sun/text/resources/hr/JavaTimeSupplementary_hr.java
浏览文件 @ d8d30a8a
...@@ -145,6 +145,26 @@ public class JavaTimeSupplementary_hr extends OpenListResourceBundle { ...@@ -145,6 +145,26 @@ public class JavaTimeSupplementary_hr extends OpenListResourceBundle {
"d.M.y. G", "d.M.y. G",
} }
}, },
{ "java.time.japanese.long.Eras",
new String[] {
"poslije Krista",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
"Reiwa",
}
},
{ "java.time.japanese.short.Eras",
new String[] {
"p. Kr.",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
"Reiwa",
}
},
{ "java.time.long.Eras", { "java.time.long.Eras",
new String[] { new String[] {
"Prije Krista", "Prije Krista",
......
src/share/classes/sun/text/resources/in/JavaTimeSupplementary_in.java 0 → 100644
浏览文件 @ d8d30a8a
/*
* Copyright (c) 2016, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
* Copyright (C) 1991-2016 Unicode, Inc. All rights reserved.
* Distributed under the Terms of Use in
* http://www.unicode.org/copyright.html.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of the Unicode data files and any associated documentation
* (the "Data Files") or Unicode software and any associated documentation
* (the "Software") to deal in the Data Files or Software
* without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, and/or sell copies of
* the Data Files or Software, and to permit persons to whom the Data Files
* or Software are furnished to do so, provided that
* (a) this copyright and permission notice appear with all copies
* of the Data Files or Software,
* (b) this copyright and permission notice appear in associated
* documentation, and
* (c) there is clear notice in each modified Data File or in the Software
* as well as in the documentation associated with the Data File(s) or
* Software that the data or software has been modified.
*
* THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
* ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT OF THIRD PARTY RIGHTS.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
* NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
* DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THE DATA FILES OR SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in these Data Files or Software without prior
* written authorization of the copyright holder.
*/
// Note: this file has been generated by a tool.
package sun.text.resources.ext;
import sun.util.resources.OpenListResourceBundle;
public class JavaTimeSupplementary_in extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
return new Object[][] {
{ "QuarterAbbreviations",
new String[] {
"K1",
"K2",
"K3",
"K4",
}
},
{ "QuarterNames",
new String[] {
"Kuartal ke-1",
"Kuartal ke-2",
"Kuartal ke-3",
"Kuartal ke-4",
}
},
{ "calendarname.buddhist",
"Kalender Buddha" },
{ "calendarname.gregorian",
"Kalender Gregorian" },
{ "calendarname.gregory",
"Kalender Gregorian" },
{ "calendarname.islamic",
"Kalender Islam" },
{ "calendarname.islamic-civil",
"Kalender Sipil Islam" },
{ "calendarname.japanese",
"Kalender Jepang" },
{ "calendarname.roc",
"Kalendar Minguo" },
{ "field.dayperiod",
"AM/PM" },
{ "field.hour",
"Jam" },
{ "field.minute",
"Menit" },
{ "field.month",
"Bulan" },
{ "field.second",
"Detik" },
{ "field.week",
"Minggu" },
{ "field.weekday",
"Hari dalam Seminggu" },
{ "field.year",
"Tahun" },
{ "field.zone",
"Zona Waktu" },
{ "islamic.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.DatePatterns",
new String[] {
"EEEE, dd MMMM y GGGG",
"d MMMM y GGGG",
"d MMM y GGGG",
"d/M/y G",
}
},
{ "islamic.DayAbbreviations",
new String[] {
"Min",
"Sen",
"Sel",
"Rab",
"Kam",
"Jum",
"Sab",
}
},
{ "islamic.DayNames",
new String[] {
"Minggu",
"Senin",
"Selasa",
"Rabu",
"Kamis",
"Jumat",
"Sabtu",
}
},
{ "islamic.DayNarrows",
new String[] {
"M",
"S",
"S",
"R",
"K",
"J",
"S",
}
},
{ "islamic.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.MonthAbbreviations",
new String[] {
"Muh.",
"Saf.",
"Rab. I",
"Rab. II",
"Jum. I",
"Jum. II",
"Raj.",
"Sha.",
"Ram.",
"Syaw.",
"Dhu\u02bbl-Q.",
"Dhu\u02bbl-H.",
"",
}
},
{ "islamic.MonthNames",
new String[] {
"Muharram",
"Safar",
"Rabi\u02bb I",
"Rabi\u02bb II",
"Jumada I",
"Jumada II",
"Rajab",
"Sya\u2019ban",
"Ramadhan",
"Syawal",
"Dhu\u02bbl-Qi\u02bbdah",
"Dhu\u02bbl-Hijjah",
"",
}
},
{ "islamic.QuarterAbbreviations",
new String[] {
"K1",
"K2",
"K3",
"K4",
}
},
{ "islamic.QuarterNames",
new String[] {
"Kuartal ke-1",
"Kuartal ke-2",
"Kuartal ke-3",
"Kuartal ke-4",
}
},
{ "islamic.QuarterNarrows",
new String[] {
"1",
"2",
"3",
"4",
}
},
{ "islamic.TimePatterns",
new String[] {
"HH.mm.ss zzzz",
"HH.mm.ss z",
"HH.mm.ss",
"HH.mm",
}
},
{ "islamic.long.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.narrow.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "islamic.narrow.Eras",
new String[] {
"",
"AH",
}
},
{ "islamic.short.Eras",
new String[] {
"",
"AH",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, dd MMMM y G",
"d MMMM y G",
"d MMM y G",
"d/M/y GGGGG",
}
},
{ "java.time.buddhist.long.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.buddhist.short.Eras",
new String[] {
"BC",
"BE",
}
},
{ "java.time.islamic.DatePatterns",
new String[] {
"EEEE, dd MMMM y G",
"d MMMM y G",
"d MMM y G",
"d/M/y GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
new String[] {
"EEEE, dd MMMM y G",
"d MMMM y G",
"d MMM y G",
"d/M/y GGGGG",
}
},
{ "java.time.japanese.long.Eras",
new String[] {
"M",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
"Reiwa",
}
},
{ "java.time.japanese.short.Eras",
new String[] {
"M",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
"Reiwa",
}
},
{ "java.time.long.Eras",
new String[] {
"Sebelum Masehi",
"M",
}
},
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE, dd MMMM y G",
"d MMMM y G",
"d MMM y G",
"d/M/y GGGGG",
}
},
{ "java.time.short.Eras",
new String[] {
"BCE",
"CE",
}
},
{ "roc.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.DatePatterns",
new String[] {
"EEEE, dd MMMM y GGGG",
"d MMMM y GGGG",
"d MMM y GGGG",
"d/M/y G",
}
},
{ "roc.DayAbbreviations",
new String[] {
"Min",
"Sen",
"Sel",
"Rab",
"Kam",
"Jum",
"Sab",
}
},
{ "roc.DayNames",
new String[] {
"Minggu",
"Senin",
"Selasa",
"Rabu",
"Kamis",
"Jumat",
"Sabtu",
}
},
{ "roc.DayNarrows",
new String[] {
"M",
"S",
"S",
"R",
"K",
"J",
"S",
}
},
{ "roc.Eras",
new String[] {
"Sebelum R.O.C.",
"R.O.C.",
}
},
{ "roc.MonthAbbreviations",
new String[] {
"Jan",
"Feb",
"Mar",
"Apr",
"Mei",
"Jun",
"Jul",
"Agt",
"Sep",
"Okt",
"Nov",
"Des",
"",
}
},
{ "roc.MonthNames",
new String[] {
"Januari",
"Februari",
"Maret",
"April",
"Mei",
"Juni",
"Juli",
"Agustus",
"September",
"Oktober",
"November",
"Desember",
"",
}
},
{ "roc.MonthNarrows",
new String[] {
"J",
"F",
"M",
"A",
"M",
"J",
"J",
"A",
"S",
"O",
"N",
"D",
"",
}
},
{ "roc.QuarterAbbreviations",
new String[] {
"K1",
"K2",
"K3",
"K4",
}
},
{ "roc.QuarterNames",
new String[] {
"Kuartal ke-1",
"Kuartal ke-2",
"Kuartal ke-3",
"Kuartal ke-4",
}
},
{ "roc.TimePatterns",
new String[] {
"HH.mm.ss zzzz",
"HH.mm.ss z",
"HH.mm.ss",
"HH.mm",
}
},
{ "roc.long.Eras",
new String[] {
"Sebelum R.O.C.",
"R.O.C.",
}
},
{ "roc.narrow.AmPmMarkers",
new String[] {
"AM",
"PM",
}
},
{ "roc.narrow.Eras",
new String[] {
"Sebelum R.O.C.",
"R.O.C.",
}
},
{ "roc.short.Eras",
new String[] {
"Sebelum R.O.C.",
"R.O.C.",
}
},
};
}
}
src/share/classes/sun/text/resources/lt/JavaTimeSupplementary_lt.java
浏览文件 @ d8d30a8a
...@@ -137,6 +137,26 @@ public class JavaTimeSupplementary_lt extends OpenListResourceBundle { ...@@ -137,6 +137,26 @@ public class JavaTimeSupplementary_lt extends OpenListResourceBundle {
"GGGGG yyyy-MM-dd", "GGGGG yyyy-MM-dd",
} }
}, },
{ "java.time.japanese.long.Eras",
new String[] {
"po Kristaus",
"Meid\u017ei",
"Tai\u0161o",
"\u0160ova",
"Heisei",
"Reiwa",
}
},
{ "java.time.japanese.short.Eras",
new String[] {
"po Kr.",
"Meid\u017ei",
"Tai\u0161o",
"\u0160ova",
"Heisei",
"Reiwa",
}
},
{ "java.time.long.Eras", { "java.time.long.Eras",
new String[] { new String[] {
"prie\u0161 Krist\u0173", "prie\u0161 Krist\u0173",
......
src/share/classes/sun/text/resources/nl/JavaTimeSupplementary_nl.java
浏览文件 @ d8d30a8a
...@@ -207,6 +207,26 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle { ...@@ -207,6 +207,26 @@ public class JavaTimeSupplementary_nl extends OpenListResourceBundle {
"dd-MM-yy GGGGG", "dd-MM-yy GGGGG",
} }
}, },
{ "java.time.japanese.long.Eras",
new String[] {
"na Christus",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
"Reiwa",
}
},
{ "java.time.japanese.short.Eras",
new String[] {
"n.Chr.",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
"Reiwa",
}
},
{ "java.time.long.Eras", { "java.time.long.Eras",
new String[] { new String[] {
"Voor Christus", "Voor Christus",
......
src/share/classes/sun/text/resources/no/JavaTimeSupplementary_no.java
浏览文件 @ d8d30a8a
...@@ -189,6 +189,26 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle { ...@@ -189,6 +189,26 @@ public class JavaTimeSupplementary_no extends OpenListResourceBundle {
"d.M y GGGG", "d.M y GGGG",
} }
}, },
{ "java.time.japanese.long.Eras",
new String[] {
"etter Kristus",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
"Reiwa",
}
},
{ "java.time.japanese.short.Eras",
new String[] {
"e.Kr.",
"M",
"T",
"S",
"H",
"R",
}
},
}; };
} }
} }
src/share/classes/sun/text/resources/sr/JavaTimeSupplementary_sr_Latn.java
浏览文件 @ d8d30a8a
...@@ -145,6 +145,26 @@ public class JavaTimeSupplementary_sr_Latn extends OpenListResourceBundle { ...@@ -145,6 +145,26 @@ public class JavaTimeSupplementary_sr_Latn extends OpenListResourceBundle {
"RK", "RK",
} }
}, },
{ "java.time.japanese.long.Eras",
new String[] {
"nove ere",
"Mei\u0111i",
"Tai\u0161o",
"\u0160ova",
"Haisei",
"Reiva",
}
},
{ "java.time.japanese.short.Eras",
new String[] {
"n. e.",
"Mei\u0111i",
"Tai\u0161o",
"\u0160ova",
"Haisei",
"Reiva",
}
},
}; };
} }
} }
src/share/classes/sun/text/resources/sv/JavaTimeSupplementary_sv.java
浏览文件 @ d8d30a8a
...@@ -170,6 +170,26 @@ public class JavaTimeSupplementary_sv extends OpenListResourceBundle { ...@@ -170,6 +170,26 @@ public class JavaTimeSupplementary_sv extends OpenListResourceBundle {
"G y-MM-dd", "G y-MM-dd",
} }
}, },
{ "java.time.japanese.long.Eras",
new String[] {
"efter Kristus",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
"Reiwa",
}
},
{ "java.time.japanese.short.Eras",
new String[] {
"e.Kr.",
"Meiji",
"Taish\u014d",
"Sh\u014dwa",
"Heisei",
"Reiwa",
}
},
{ "java.time.long.Eras", { "java.time.long.Eras",
new String[] { new String[] {
"f\u00f6re Kristus", "f\u00f6re Kristus",
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或