--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/vi/JavaTimeSupplementary_vi.java Wed Jun 24 16:08:58 2015 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/vi/JavaTimeSupplementary_vi.java Wed Jun 24 16:42:11 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -26,37 +26,41 @@
/*
* COPYRIGHT AND PERMISSION NOTICE
*
- * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
- * the Terms of Use in http://www.unicode.org/copyright.html.
+ * Copyright (C) 1991-2015 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) the above copyright notice(s) and this permission notice
- * appear with all copies of the Data Files or Software, (b) both the above
- * copyright notice(s) and this 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.
+ * 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,
+ * 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.
+ * 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.
+ * 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.
@@ -68,15 +72,11 @@
public class JavaTimeSupplementary_vi extends OpenListResourceBundle {
@Override
protected final Object[][] getContents() {
+ final String[] javatimelongEras = {
+ "tr. CN",
+ "sau CN",
+ };
return new Object[][] {
- { "QuarterAbbreviations",
- new String[] {
- "Q1",
- "Q2",
- "Q3",
- "Q4",
- }
- },
{ "QuarterNames",
new String[] {
"Qu\u00fd 1",
@@ -85,14 +85,6 @@
"Qu\u00fd 4",
}
},
- { "QuarterNarrows",
- new String[] {
- "1",
- "2",
- "3",
- "4",
- }
- },
{ "calendarname.buddhist",
"L\u1ecbch Ph\u1eadt Gi\u00e1o" },
{ "calendarname.gregorian",
@@ -100,11 +92,11 @@
{ "calendarname.gregory",
"L\u1ecbch Gregory" },
{ "calendarname.islamic",
- "L\u1ecbch Islamic" },
+ "L\u1ecbch H\u1ed3i Gi\u00e1o" },
{ "calendarname.islamic-civil",
"L\u1ecbch Islamic-Civil" },
- { "calendarname.islamicc",
- "L\u1ecbch Islamic-Civil" },
+ { "calendarname.islamic-umalqura",
+ "L\u1ecbch H\u1ed3i Gi\u00e1o - Umm al-Qura" },
{ "calendarname.japanese",
"L\u1ecbch Nh\u1eadt B\u1ea3n" },
{ "calendarname.roc",
@@ -129,20 +121,133 @@
"N\u0103m" },
{ "field.zone",
"M\u00fai gi\u1edd" },
+ { "islamic.AmPmMarkers",
+ new String[] {
+ "SA",
+ "CH",
+ }
+ },
{ "islamic.DatePatterns",
new String[] {
"EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y GGGG",
"'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y GGGG",
"dd-MM-y GGGG",
- "dd/MM/y GGGG",
+ "dd/MM/y G",
+ }
+ },
+ { "islamic.DayAbbreviations",
+ new String[] {
+ "CN",
+ "Th 2",
+ "Th 3",
+ "Th 4",
+ "Th 5",
+ "Th 6",
+ "Th 7",
+ }
+ },
+ { "islamic.DayNames",
+ new String[] {
+ "Ch\u1ee7 Nh\u1eadt",
+ "Th\u1ee9 Hai",
+ "Th\u1ee9 Ba",
+ "Th\u1ee9 T\u01b0",
+ "Th\u1ee9 N\u0103m",
+ "Th\u1ee9 S\u00e1u",
+ "Th\u1ee9 B\u1ea3y",
+ }
+ },
+ { "islamic.DayNarrows",
+ new String[] {
+ "CN",
+ "T2",
+ "T3",
+ "T4",
+ "T5",
+ "T6",
+ "T7",
+ }
+ },
+ { "islamic.Eras",
+ new String[] {
+ "",
+ "AH",
+ }
+ },
+ { "islamic.QuarterAbbreviations",
+ new String[] {
+ "Q1",
+ "Q2",
+ "Q3",
+ "Q4",
+ }
+ },
+ { "islamic.QuarterNames",
+ new String[] {
+ "Qu\u00fd 1",
+ "Qu\u00fd 2",
+ "Qu\u00fd 3",
+ "Qu\u00fd 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[] {
+ "s",
+ "c",
+ }
+ },
+ { "islamic.narrow.Eras",
+ new String[] {
+ "",
+ "AH",
+ }
+ },
+ { "islamic.short.Eras",
+ new String[] {
+ "",
+ "AH",
}
},
{ "java.time.buddhist.DatePatterns",
new String[] {
"EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y G",
"'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y G",
- "dd-MM-yyyy G",
- "dd/MM/yyyy G",
+ "dd-MM-y G",
+ "dd/MM/y GGGGG",
+ }
+ },
+ { "java.time.buddhist.long.Eras",
+ new String[] {
+ "BC",
+ "BE",
+ }
+ },
+ { "java.time.buddhist.short.Eras",
+ new String[] {
+ "BC",
+ "BE",
}
},
{ "java.time.islamic.DatePatterns",
@@ -150,7 +255,7 @@
"EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y G",
"'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y G",
"dd-MM-y G",
- "dd/MM/y G",
+ "dd/MM/y GGGGG",
}
},
{ "java.time.japanese.DatePatterns",
@@ -161,18 +266,22 @@
"dd/MM/y G",
}
},
+ { "java.time.long.Eras",
+ javatimelongEras },
{ "java.time.roc.DatePatterns",
new String[] {
"EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y G",
"'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y G",
"dd-MM-y G",
- "dd/MM/y G",
+ "dd/MM/y GGGGG",
}
},
{ "java.time.short.Eras",
+ javatimelongEras },
+ { "roc.AmPmMarkers",
new String[] {
- "tr. CN",
- "sau CN",
+ "SA",
+ "CH",
}
},
{ "roc.DatePatterns",
@@ -180,19 +289,145 @@
"EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y GGGG",
"'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y GGGG",
"dd-MM-y GGGG",
- "dd/MM/y GGGG",
+ "dd/MM/y G",
+ }
+ },
+ { "roc.DayAbbreviations",
+ new String[] {
+ "CN",
+ "Th 2",
+ "Th 3",
+ "Th 4",
+ "Th 5",
+ "Th 6",
+ "Th 7",
+ }
+ },
+ { "roc.DayNames",
+ new String[] {
+ "Ch\u1ee7 Nh\u1eadt",
+ "Th\u1ee9 Hai",
+ "Th\u1ee9 Ba",
+ "Th\u1ee9 T\u01b0",
+ "Th\u1ee9 N\u0103m",
+ "Th\u1ee9 S\u00e1u",
+ "Th\u1ee9 B\u1ea3y",
+ }
+ },
+ { "roc.DayNarrows",
+ new String[] {
+ "CN",
+ "T2",
+ "T3",
+ "T4",
+ "T5",
+ "T6",
+ "T7",
}
},
{ "roc.Eras",
new String[] {
"Tr\u01b0\u1edbc R.O.C",
+ "R.O.C.",
+ }
+ },
+ { "roc.MonthAbbreviations",
+ new String[] {
+ "thg 1",
+ "thg 2",
+ "thg 3",
+ "thg 4",
+ "thg 5",
+ "thg 6",
+ "thg 7",
+ "thg 8",
+ "thg 9",
+ "thg 10",
+ "thg 11",
+ "thg 12",
"",
}
},
+ { "roc.MonthNames",
+ new String[] {
+ "th\u00e1ng 1",
+ "th\u00e1ng 2",
+ "th\u00e1ng 3",
+ "th\u00e1ng 4",
+ "th\u00e1ng 5",
+ "th\u00e1ng 6",
+ "th\u00e1ng 7",
+ "th\u00e1ng 8",
+ "th\u00e1ng 9",
+ "th\u00e1ng 10",
+ "th\u00e1ng 11",
+ "th\u00e1ng 12",
+ "",
+ }
+ },
+ { "roc.MonthNarrows",
+ new String[] {
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12",
+ "",
+ }
+ },
+ { "roc.QuarterAbbreviations",
+ new String[] {
+ "Q1",
+ "Q2",
+ "Q3",
+ "Q4",
+ }
+ },
+ { "roc.QuarterNames",
+ new String[] {
+ "Qu\u00fd 1",
+ "Qu\u00fd 2",
+ "Qu\u00fd 3",
+ "Qu\u00fd 4",
+ }
+ },
+ { "roc.TimePatterns",
+ new String[] {
+ "HH:mm:ss zzzz",
+ "HH:mm:ss z",
+ "HH:mm:ss",
+ "HH:mm",
+ }
+ },
+ { "roc.long.Eras",
+ new String[] {
+ "Tr\u01b0\u1edbc R.O.C",
+ "R.O.C.",
+ }
+ },
+ { "roc.narrow.AmPmMarkers",
+ new String[] {
+ "s",
+ "c",
+ }
+ },
+ { "roc.narrow.Eras",
+ new String[] {
+ "Tr\u01b0\u1edbc R.O.C",
+ "R.O.C.",
+ }
+ },
{ "roc.short.Eras",
new String[] {
"Tr\u01b0\u1edbc R.O.C",
- "",
+ "R.O.C.",
}
},
};