提交 9353e7ef 编写于 作者: K katakai

6998391: Serbian (Latin) locale support

Reviewed-by: naoto
上级 764b4d9d
......@@ -136,6 +136,7 @@ FILES_java = \
sun/text/resources/CollationData_sl.java \
sun/text/resources/CollationData_sq.java \
sun/text/resources/CollationData_sr.java \
sun/text/resources/CollationData_sr_Latn.java \
sun/text/resources/CollationData_sv.java \
sun/text/resources/CollationData_tr.java \
sun/text/resources/CollationData_uk.java \
......@@ -251,6 +252,10 @@ FILES_java = \
sun/text/resources/FormatData_sr_CS.java \
sun/text/resources/FormatData_sr_ME.java \
sun/text/resources/FormatData_sr_RS.java \
sun/text/resources/FormatData_sr_Latn.java \
sun/text/resources/FormatData_sr_Latn_BA.java \
sun/text/resources/FormatData_sr_Latn_ME.java \
sun/text/resources/FormatData_sr_Latn_RS.java \
sun/text/resources/FormatData_sv.java \
sun/text/resources/FormatData_sv_SE.java \
sun/text/resources/FormatData_tr.java \
......
......@@ -65,6 +65,7 @@ FILES_compiled_properties = \
sun/util/resources/LocaleNames_sl.properties \
sun/util/resources/LocaleNames_sq.properties \
sun/util/resources/LocaleNames_sr.properties \
sun/util/resources/LocaleNames_sr_Latn.properties \
sun/util/resources/LocaleNames_sv.properties \
sun/util/resources/LocaleNames_tr.properties \
sun/util/resources/LocaleNames_uk.properties \
......@@ -111,6 +112,9 @@ FILES_compiled_properties = \
sun/util/resources/CalendarData_sl.properties \
sun/util/resources/CalendarData_sq.properties \
sun/util/resources/CalendarData_sr.properties \
sun/util/resources/CalendarData_sr_Latn_BA.properties \
sun/util/resources/CalendarData_sr_Latn_ME.properties \
sun/util/resources/CalendarData_sr_Latn_RS.properties \
sun/util/resources/CalendarData_sv.properties \
sun/util/resources/CalendarData_tr.properties \
sun/util/resources/CalendarData_uk.properties \
......@@ -196,6 +200,9 @@ FILES_compiled_properties = \
sun/util/resources/CurrencyNames_sr_BA.properties \
sun/util/resources/CurrencyNames_sr_CS.properties \
sun/util/resources/CurrencyNames_sr_ME.properties \
sun/util/resources/CurrencyNames_sr_Latn_BA.properties \
sun/util/resources/CurrencyNames_sr_Latn_ME.properties \
sun/util/resources/CurrencyNames_sr_Latn_RS.properties \
sun/util/resources/CurrencyNames_sv.properties \
sun/util/resources/CurrencyNames_sv_SE.properties \
sun/util/resources/CurrencyNames_tr_TR.properties \
......
......@@ -504,8 +504,8 @@ public class SimpleDateFormat extends DateFormat {
/**
* Cache to hold the DateTimePatterns of a Locale.
*/
private static final ConcurrentMap<String, String[]> cachedLocaleData
= new ConcurrentHashMap<String, String[]>(3);
private static final ConcurrentMap<Locale, String[]> cachedLocaleData
= new ConcurrentHashMap<Locale, String[]>(3);
/**
* Cache NumberFormat instances with Locale key.
......@@ -619,8 +619,7 @@ public class SimpleDateFormat extends DateFormat {
initializeCalendar(loc);
/* try the cache first */
String key = getKey();
String[] dateTimePatterns = cachedLocaleData.get(key);
String[] dateTimePatterns = cachedLocaleData.get(loc);
if (dateTimePatterns == null) { /* cache miss */
ResourceBundle r = LocaleData.getDateFormatData(loc);
if (!isGregorianCalendar()) {
......@@ -633,7 +632,7 @@ public class SimpleDateFormat extends DateFormat {
dateTimePatterns = r.getStringArray("DateTimePatterns");
}
/* update cache */
cachedLocaleData.putIfAbsent(key, dateTimePatterns);
cachedLocaleData.putIfAbsent(loc, dateTimePatterns);
}
formatData = DateFormatSymbols.getInstanceRef(loc);
if ((timeStyle >= 0) && (dateStyle >= 0)) {
......@@ -684,13 +683,6 @@ public class SimpleDateFormat extends DateFormat {
}
}
private String getKey() {
StringBuilder sb = new StringBuilder();
sb.append(getCalendarName()).append('.');
sb.append(locale.getLanguage()).append('_').append(locale.getCountry()).append('_').append(locale.getVariant());
return sb.toString();
}
/**
* Returns the compiled form of the given pattern. The syntax of
* the compiled pattern is:
......
/*
* Copyright (c) 2005, 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.
*/
/*
*/
/*
* (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
* (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved
*
* The original version of this source code and documentation
* is copyrighted and owned by Taligent, Inc., a wholly-owned
* subsidiary of IBM. These materials are provided under terms
* of a License Agreement between Taligent and Sun. This technology
* is protected by multiple US and International patents.
*
* This notice and attribution to Taligent may not be removed.
* Taligent is a registered trademark of Taligent, Inc.
*
*/
package sun.text.resources;
import java.util.ListResourceBundle;
public class CollationData_sr_Latn extends ListResourceBundle {
protected final Object[][] getContents() {
return new Object[][] {
{ "Rule",
/* for sr-Latin, default sorting except for the following: */
/* add dz "ligature" between d and d<stroke>. */
/* add d<stroke> between d and e. */
/* add lj "ligature" between l and l<stroke>. */
/* add l<stroke> between l and m. */
/* add nj "ligature" between n and o. */
/* add z<abovedot> after z. */
"& \u200f = \u030c "
+ "& \u0306 = \u030d "
+ "& C < c\u030c , C\u030c " // C < c-caron
+ "< c\u0301 , C\u0301 " // c-acute
+ "& D < \u01f3 , \u01f2 , \u01f1 " // dz
+ "< dz , dZ , Dz , DZ " // dz ligature
+ "< \u01c6 , \u01c5 , \u01c4 " // dz-caron
+ "< \u0111 , \u0110 " // d-stroke
+ "& L < lj , lJ , Lj , LJ " // l < lj ligature
+ "& N < nj , nJ , Nj , NJ " // n < nj ligature
+ "& S < s\u030c , S\u030c " // s < s-caron
+ "& Z < z\u030c , Z\u030c " // z < z-caron
}
};
}
}
/*
* Copyright (c) 1997, 2011, 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-2011 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.
*
* 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.
*/
// Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
package sun.text.resources;
import java.util.ListResourceBundle;
public class FormatData_sr_Latn extends ListResourceBundle {
protected final Object[][] getContents() {
return new Object[][] {
{ "MonthNames",
new String[] {
"januar",
"februar",
"mart",
"april",
"maj",
"jun",
"jul",
"avgust",
"septembar",
"oktobar",
"novembar",
"decembar",
"",
}
},
{ "MonthAbbreviations",
new String[] {
"jan",
"feb",
"mar",
"apr",
"maj",
"jun",
"jul",
"avg",
"sep",
"okt",
"nov",
"dec",
"",
}
},
{ "DayNames",
new String[] {
"nedelja",
"ponedeljak",
"utorak",
"sreda",
"\u010detvrtak",
"petak",
"subota",
}
},
{ "DayAbbreviations",
new String[] {
"ned",
"pon",
"uto",
"sre",
"\u010det",
"pet",
"sub",
}
},
{ "Eras",
new String[] {
"p. n. e.",
"n. e",
}
},
{ "NumberPatterns",
new String[] {
"#,##0.###",
"\u00a4\u00a0#,##0.00",
"#,##0%",
}
},
{ "NumberElements",
new String[] {
".",
",",
";",
"%",
"0",
"#",
"-",
"E",
"\u2030",
"\u221e",
"NaN",
}
},
{ "DateTimePatterns",
new String[] {
"HH.mm.ss zzzz",
"HH.mm.ss z",
"HH.mm.ss",
"HH.mm",
"EEEE, dd. MMMM y.",
"dd. MMMM y.",
"dd.MM.y.",
"d.M.yy.",
"{1} {0}",
}
},
};
}
}
/*
* Copyright (c) 1997, 2011, 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-2011 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.
*
* 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.
*/
// Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
package sun.text.resources;
import sun.util.EmptyListResourceBundle;
public class FormatData_sr_Latn_BA extends EmptyListResourceBundle {
}
/*
* Copyright (c) 1997, 2011, 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-2011 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.
*
* 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.
*/
// Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
package sun.text.resources;
import java.util.ListResourceBundle;
public class FormatData_sr_Latn_ME extends ListResourceBundle {
protected final Object[][] getContents() {
return new Object[][] {
{ "DateTimePatterns",
new String[] {
"HH.mm.ss zzzz",
"HH.mm.ss z",
"HH.mm.ss",
"HH.mm",
"EEEE, dd. MMMM y.",
"d.MM.yyyy.",
"dd.MM.y.",
"d.M.yy.",
"{1} {0}",
}
}
};
}
}
/*
* Copyright (c) 1997, 2011, 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-2011 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.
*
* 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.
*/
// Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
package sun.text.resources;
import sun.util.EmptyListResourceBundle;
public class FormatData_sr_Latn_RS extends EmptyListResourceBundle {
}
#
# Copyright (c) 2005, 2011, 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-2011 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.
#
# 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.
#
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
#
minimalDaysInFirstWeek=4
#
# Copyright (c) 2005, 2011, 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-2011 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.
#
# 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.
#
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
#
minimalDaysInFirstWeek=4
#
# Copyright (c) 2005, 2011, 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-2011 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.
#
# 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.
#
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
#
minimalDaysInFirstWeek=4
#
# Copyright (c) 2005, 2011, 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-2011 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.
#
# 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.
#
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
#
BAM=KM
bam=bosansko-hercegova\u010dkih konvertibilnih maraka
EUR=\u20ac
eur=evra
#
# Copyright (c) 2005, 2011, 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-2011 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.
#
# 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.
#
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
#
EUR=\u20ac
eur=evra
#
# Copyright (c) 2005, 2011, 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-2011 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.
#
# 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.
#
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
#
RSD=din.
rsd=srpski dinari
......@@ -171,16 +171,21 @@ public class LocaleData {
/* Get the locale string list from LocaleDataMetaInfo class. */
String localeString = LocaleDataMetaInfo.getSupportedLocaleString(baseName);
if (localeString.length() == 0) {
if (localeString.length() == 0) {
return candidates;
}
for (Iterator<Locale> l = candidates.iterator(); l.hasNext(); ) {
String lstr = l.next().toString();
/* truncate extra segment introduced by Java 7 for script and extesions */
int idx = lstr.indexOf("_#");
if (idx >= 0) {
lstr = lstr.substring(0, idx);
Locale loc = l.next();
String lstr = null;
if (loc.getScript().length() > 0) {
lstr = loc.toLanguageTag().replace('-', '_');
} else {
lstr = loc.toString();
int idx = lstr.indexOf("_#");
if (idx >= 0) {
lstr = lstr.substring(0, idx);
}
}
/* Every locale string in the locale string list returned from
the above getSupportedLocaleString is enclosed
......@@ -265,28 +270,15 @@ public class LocaleData {
Locale[] locales = new Locale[localeStringTokenizer.countTokens()];
for (int i = 0; i < locales.length; i++) {
String currentToken = localeStringTokenizer.nextToken();
int p2 = 0;
int p1 = currentToken.indexOf('_');
String language = "";
String country = "";
String variant = "";
if (p1 == -1) {
language = currentToken;
} else {
language = currentToken.substring(0, p1);
p2 = currentToken.indexOf('_', p1 + 1);
if (p2 == -1) {
country = currentToken.substring(p1 + 1);
} else {
country = currentToken.substring(p1 + 1, p2);
if (p2 < currentToken.length()) {
variant = currentToken.substring(p2 + 1);
}
}
String currentToken = localeStringTokenizer.nextToken().replace('_','-');
if (currentToken.equals("ja-JP-JP")) {
currentToken = "ja-JP-u-ca-japanese-x-lvariant-JP";
} else if (currentToken.equals("th-TH-TH")) {
currentToken = "th-TH-u-nu-thai-x-lvariant-TH";
} else if (currentToken.equals("no-NO-NY")) {
currentToken = "no-NO-x-lvariant-NY";
}
locales[i] = new Locale(language, country, variant);
locales[i] = Locale.forLanguageTag(currentToken);
}
return locales;
}
......
#
# Copyright (c) 2005, 2011, 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-2011 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.
#
# 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.
#
# Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
#
aa=Afarski
ab=Abkazijski
ae=Avestanski
af=Afrikanerski
am=Amharski
an=Aragone\u017eanski
ar=Arapski
as=Asemijski
av=Avarski
ay=Ajmara
az=Azerbejd\u017eanski
ba=Ba\u0161kir
be=Beloruski
bg=Bugarski
bh=Biharski
bn=Bengalski
bo=Tibetanski
br=Bretonski
bs=Bosanski
ca=Katalonski
ce=\u010ce\u010denski
ch=\u010camoro
co=Korzikanski
cr=Kri
cs=\u010ce\u0161ki
cu=Staroslovenski
cv=\u010cuva\u0161ki
cy=Vel\u0161ki
da=Danski
de=Nema\u010dki
dv=Divehijski
dz=D\u017eonga
ee=Eve
el=Gr\u010dki
en=Engleski
eo=Esperanto
es=\u0160panski
et=Estonski
eu=Baskijski
fa=Persijski
fi=Finski
fj=Fid\u017eijski
fo=Farski
fr=Francuski
fy=Frizijski
ga=Irski
gd=\u0160kotski Galski
gl=Galski
gn=Gvarani
gu=Gud\u017earati
gv=Manks
he=Hebrejski
hi=Hindi
hr=Hrvatski
ht=Hai\u0107anski
hu=Ma\u0111arski
hy=Jermenski
ia=Interlingva
id=Indonezijski
ie=Interlingve
ii=Si\u010duan ji
ik=Inupiak
in=Indonezijski
is=Islandski
it=Italijanski
iw=Hebrejski
ja=Japanski
ji=Jidi\u0161
jv=Javanski
ka=Gruzijski
ki=Kikuju
kj=Kuanjama
kk=Koza\u010dki
kl=Kalalisutski
km=Kmerski
kn=Kanada
ko=Korejski
ks=Ka\u0161miri
ku=Kurdski
kw=Korni\u0161ki
ky=Kirgiski
la=Latinski
lb=Luksembur\u0161ki
li=Limburgi\u0161
lo=Lao\u0161ki
lt=Litvanski
lu=Luba-katanga
lv=Letonski
mg=Malagazijski
mh=Mar\u0161alski
mi=Maorski
mk=Makedonski
ml=Malajalam
mn=Mongolski
mo=Moldavski
mr=Marati
ms=Malajski
mt=Melte\u0161ki
my=Burmanski
nb=Norve\u0161ki bokm\u00e5l
nd=Severni ndebele
ne=Nepalski
nl=Holandski
nn=Norve\u0161ki njorsk
no=Norve\u0161ki
nr=Ju\u017eni ndebele
nv=Navaho
ny=Njanja
oc=Provansalski
oj=Ojibva
or=Orijski
os=Osetski
pa=Pand\u017eabski
pl=Poljski
ps=Pa\u0161tunski
pt=Portugalski
qu=Kven\u010da
rm=Reto-Romanski
ro=Rumunski
ru=Ruski
rw=Kinjarvanda
sa=Sanskrit
sc=Sardinijski
sd=Sindi
se=Severni sami
si=Singaleski
sk=Slova\u010dki
sl=Slovena\u010dki
sm=Samoanski
sn=\u0160ona
so=Somalski
sq=Albanski
sr=Srpski
ss=Svati
st=Sesoto
su=Sudanski
sv=\u0160vedski
sw=Svahili
ta=Tamilski
tg=Ta\u0111ik
th=Tajlandski
ti=Tigrinja
tk=Turkmenski
tl=Tagalski
tn=Tsvana
tr=Turski
tt=Tatarski
tw=Tvi
ty=Tahi\u0107anski
ug=Ujgurski
uk=Ukrajinski
uz=Uzbe\u010dki
vi=Vijetnamski
wa=Valun
wo=Volof
xh=Khosa
yi=Jidi\u0161
yo=Jorubanski
za=Zuang
zh=Kineski
AD=Andora
AE=Ujedinjeni Arapski Emirati
AF=Avganistan
AG=Antigva i Barbuda
AI=Angvila
AL=Albanija
AM=Armenija
AN=Holandski Antili
AO=Angola
AQ=Antarktika
AR=Argentina
AS=Ameri\u010dka Samoa
AT=Austrija
AU=Australija
AW=Aruba
AX=Alandska ostrva
AZ=Azerbejd\u017ean
BA=Bosna i Hercegovina
BB=Barbados
BD=Banglade\u0161
BE=Belgija
BF=Burkina Faso
BG=Bugarska
BH=Bahrein
BI=Burundi
BJ=Benin
BL=Sv. Bartolomej
BM=Bermuda
BN=Brunej
BO=Bolivija
BR=Brazil
BS=Bahami
BT=Butan
BV=Buve Ostrva
BW=Bocvana
BY=Belorusija
BZ=Belise
CA=Kanada
CC=Kokos (Keling) Ostrva
CD=Demokratska Republika Kongo
CF=Centralno Afri\u010dka Republika
CG=Kongo
CH=\u0160vajcarska
CI=Obala Slonova\u010de
CK=Kukova Ostrva
CL=\u010cile
CM=Kamerun
CN=Kina
CO=Kolumbija
CR=Kostarika
CU=Kuba
CV=Kape Verde
CX=Bo\u017ei\u0107na Ostrva
CY=Kipar
CZ=\u010ce\u0161ka
DE=Nema\u010dka
DJ=D\u017eibuti
DK=Danska
DM=Dominika
DO=Dominikanska Republika
DZ=Al\u017eir
EC=Ekvador
EE=Estonija
EG=Egipat
EH=Zapadna Sahara
ER=Eritreja
ES=\u0160panija
ET=Etiopija
FI=Finska
FJ=Fid\u017ei
FK=Folklandska Ostrva
FM=Mikronezija
FO=Farska Ostrva
FR=Francuska
GA=Gabon
GB=Velika Britanija
GD=Grenada
GE=Gruzija
GF=Francuska Gvajana
GG=Gurnsi
GH=Gana
GI=Gibraltar
GL=Grenland
GM=Gambija
GN=Gvineja
GP=Gvadelupe
GQ=Ekvatorijalna Gvineja
GR=Gr\u010dka
GS=Ju\u017ena D\u017eord\u017eija i Ju\u017ena Sendvi\u010d Ostrva
GT=Gvatemala
GU=Guam
GW=Gvineja-Bisao
GY=Gvajana
HK=Hong Kong (S. A. R. Kina)
HM=Herd i Mekdonald Ostrva
HN=Honduras
HR=Hrvatska
HT=Haiti
HU=Ma\u0111arska
ID=Indonezija
IE=Irska
IL=Izrael
IM=Ostrvo Man
IN=Indija
IO=Britansko Indijska Okeanska Teritorija
IQ=Irak
IR=Iran
IS=Island
IT=Italija
JE=D\u017eersi
JM=Jamajka
JO=Jordan
JP=Japan
KE=Kenija
KG=Kirgizstan
KH=Kambod\u017ea
KI=Kiribati
KM=Komorska Ostrva
KN=Sent Kits i Nevis
KP=Severna Koreja
KR=Ju\u017ena Koreja
KW=Kuvajt
KY=Kajmanska Ostrva
KZ=Kazahstan
LA=Laos
LB=Liban
LC=Sent Lucija
LI=Lihten\u0161tajn
LK=\u0160ri Lanka
LR=Liberija
LS=Lesoto
LT=Litvanija
LU=Luksemburg
LV=Letonija
LY=Libija
MA=Maroko
MC=Monako
MD=Moldavija
ME=Crna Gora
MF=Sv. Martin
MG=Madagaskar
MH=Mar\u0161alska Ostrva
MK=Makedonija
ML=Mali
MM=Mijanmar
MN=Mongolija
MO=Makao (S. A. R. Kina)
MP=Severna Marijanska Ostrva
MQ=Martinik
MR=Mauritanija
MS=Monserat
MT=Malta
MU=Mauricius
MV=Maldivi
MW=Malavi
MX=Meksiko
MY=Malezija
MZ=Mozambik
NA=Namibija
NC=Nova Kaledonija
NE=Niger
NF=Norfolk Ostrvo
NG=Nigerija
NI=Nikaragva
NL=Holandija
NO=Norve\u0161ka
NP=Nepal
NR=Nauru
NU=Niue
NZ=Novi Zeland
OM=Oman
PA=Panama
PE=Peru
PF=Francuska Polinezija
PG=Papua Nova Gvineja
PH=Filipini
PK=Pakistan
PL=Poljska
PM=Sen Pjer i Mikelon
PN=Pitcairn
PR=Porto Riko
PS=Palestinska Teritorija
PT=Portugal
PW=Palau
PY=Paragvaj
QA=Katar
RE=Rejunion
RO=Rumunija
RS=Srbija
RU=Rusija
RW=Ruanda
SA=Saudijska Arabija
SB=Solomonska Ostrva
SC=Sej\u0161eli
SD=Sudan
SE=\u0160vedska
SG=Singapur
SH=Sveta Jelena
SI=Slovenija
SJ=Svalbard i Janmajen Ostrva
SK=Slova\u010dka
SL=Sijera Leone
SM=San Marino
SN=Senegal
SO=Somalija
SR=Surinam
ST=Sao Tome i Principe
SV=Salvador
SY=Sirija
SZ=Svazilend
TC=Turks i Kajkos Ostrva
TD=\u010cad
TF=Francuske Ju\u017ene Teritorije
TG=Togo
TH=Tajland
TJ=Tad\u017eikistan
TK=Tokelau
TL=Isto\u010dni Timor
TM=Turkmenistan
TN=Tunis
TO=Tonga
TR=Turska
TT=Trinidad i Tobago
TV=Tuvalu
TW=Tajvan
TZ=Tanzanija
UA=Ukrajina
UG=Uganda
UM=Manja Udaljena Ostrva SAD
US=Sjedinjene Ameri\u010dke Dr\u017eave
UY=Urugvaj
UZ=Uzbekistan
VA=Vatikan
VC=Sent Vinsent i Grenadini
VE=Venecuela
VG=Britanska Devi\u010danska Ostrva
VI=S.A.D. Devi\u010danska Ostrva
VN=Vijetnam
VU=Vanuatu
WF=Valis i Futuna Ostrva
WS=Samoa
YE=Jemen
YT=Majote
ZA=Ju\u017enoafri\u010dka Republika
ZM=Zambija
ZW=Zimbabve
......@@ -6101,3 +6101,45 @@ LocaleNames/nl/ZM=Zambia
# bug 6919624
CalendarData/hu/minimalDaysInFirstWeek=4
# bug 6998391
CalendarData/sr-Latn/firstDayOfWeek=2
CalendarData/sr-Latn-BA/firstDayOfWeek=2
CalendarData/sr-Latn-ME/firstDayOfWeek=2
CalendarData/sr-Latn-RS/firstDayOfWeek=2
#
CalendarData/sr-Latn/minimalDaysInFirstWeek=1
CalendarData/sr-Latn-BA/minimalDaysInFirstWeek=4
CalendarData/sr-Latn-ME/minimalDaysInFirstWeek=4
CalendarData/sr-Latn-RS/minimalDaysInFirstWeek=4
#
LocaleNames/sr-Latn/SR=Surinam
LocaleNames/sr-Latn-BA/SR=Surinam
LocaleNames/sr-Latn-ME/SR=Surinam
LocaleNames/sr-Latn-RS/SR=Surinam
#
FormatData/sr-Latn/MonthNames/2=mart
FormatData/sr-Latn-BA/MonthNames/4=maj
FormatData/sr-Latn-ME/MonthNames/7=avgust
FormatData/sr-Latn-RS/MonthNames/8=septembar
#
FormatData/sr-Latn/DayNames/1=ponedeljak
FormatData/sr-Latn-BA/DayNames/2=utorak
FormatData/sr-Latn-ME/DayNames/3=sreda
FormatData/sr-Latn-RS/DayNames/4=\u010detvrtak
#
FormatData/sr-Latn/DayAbbreviations/1=pon
FormatData/sr-Latn-BA/DayAbbreviations/2=uto
FormatData/sr-Latn-ME/DayAbbreviations/3=sre
FormatData/sr-Latn-RS/DayAbbreviations/4=\u010det
#
CurrencyNames/sr-Latn/EUR=EUR
CurrencyNames/sr-Latn-BA/EUR=\u20ac
CurrencyNames/sr-Latn-BA/BAM=KM
CurrencyNames/sr-Latn-ME/EUR=\u20ac
CurrencyNames/sr-Latn-RS/EUR=EUR
#
FormatData/sr-Latn/DateTimePatterns/1=HH.mm.ss z
FormatData/sr-Latn-BA/DateTimePatterns/2=HH.mm.ss
FormatData/sr-Latn-ME/DateTimePatterns/5=d.MM.yyyy.
FormatData/sr-Latn-RS/DateTimePatterns/5=dd. MMMM y.
......@@ -33,7 +33,7 @@
* 6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259
* 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
* 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
* 6919624
* 6919624 6998391
* @summary Verify locale data
*
*/
......@@ -91,6 +91,10 @@
* LocaleNames/fr_FR/US=\u00c9tats-Unis
* LocaleNames/fr_FR/FR=France</pre>
*
* You can use language tag with '-' in locale field like this:<pre>
* LocaleNames/sr-Latn/SR=Surinam
* FormatData/sr-Latn-BA/DayNames/2=utorak</pre>
*
* The command-line syntax of this test is
* <tt>java LocaleDataTest [-w] [{ -s | <filename> }]</tt>
*
......@@ -242,7 +246,9 @@ public class LocaleDataTest
if (index == -1 || index + 1 == key.length())
throw new Exception("Malformed input file: \"" + key + "\" is missing locale name");
localeName = key.substring(oldIndex, index);
if (localeName.length() > 0) {
boolean use_tag = localeName.indexOf("-") != -1;
if (use_tag == false && localeName.length() > 0) {
language = localeName.substring(0, 2);
if (localeName.length() > 3) {
country = localeName.substring(3, 5);
......@@ -283,8 +289,14 @@ public class LocaleDataTest
} else {
fullName = "sun.text.resources." + rbName;
}
Locale locale;
if (use_tag) {
locale = Locale.forLanguageTag(localeName);
} else {
locale = new Locale(language, country, variant);
}
ResourceBundle bundle = ResourceBundle.getBundle(fullName,
new Locale(language, country, variant),
locale,
ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT));
resource = bundle.getObject(resTag);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
新手
引导
客服 返回
顶部