[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: updated
locale information
Kaffe CVS
cvs-commits at kaffe.org
Mon Jan 31 11:38:07 PST 2005
PatchSet 5955
Date: 2005/01/31 19:22:40
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: updated locale information
2005-01-31 Dalibor Topic <robilad at kaffe.org>
Resynced with GNU Classpath.
2005-01-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
* gnu/java/locale/LocaleHelper.java:
New utility class.
(getLocalizedString(java.util.Locale,
String, String, boolean, boolean)):
More generic version of what was
java.util.Locale.getDisplayString, now
available to all classes.
* gnu/java/locale/LocaleInformation.java,
gnu/java/locale/LocaleInformation_aa.java,
gnu/java/locale/LocaleInformation_aa_ET.java,
gnu/java/locale/LocaleInformation_af.java,
gnu/java/locale/LocaleInformation_am.java,
gnu/java/locale/LocaleInformation_am_ET.java,
gnu/java/locale/LocaleInformation_ar.java,
gnu/java/locale/LocaleInformation_as.java,
gnu/java/locale/LocaleInformation_az.java,
gnu/java/locale/LocaleInformation_be.java,
gnu/java/locale/LocaleInformation_bg.java,
gnu/java/locale/LocaleInformation_bn.java,
gnu/java/locale/LocaleInformation_byn.java
gnu/java/locale/LocaleInformation_byn_ER.java
gnu/java/locale/LocaleInformation_ca.java,
gnu/java/locale/LocaleInformation_cs.java,
gnu/java/locale/LocaleInformation_cy.java,
gnu/java/locale/LocaleInformation_da.java,
gnu/java/locale/LocaleInformation_de.java,
gnu/java/locale/LocaleInformation_de_AT.java,
gnu/java/locale/LocaleInformation_de_BE.java,
gnu/java/locale/LocaleInformation_de_CH.java,
gnu/java/locale/LocaleInformation_de_LU.java,
gnu/java/locale/LocaleInformation_dv.java,
gnu/java/locale/LocaleInformation_dz.java,
gnu/java/locale/LocaleInformation_dz_BT.java,
gnu/java/locale/LocaleInformation_el.java,
gnu/java/locale/LocaleInformation_el_GR.java,
gnu/java/locale/LocaleInformation_en.java,
gnu/java/locale/LocaleInformation_en_AU.java,
gnu/java/locale/LocaleInformation_en_BE.java,
gnu/java/locale/LocaleInformation_en_CA.java,
gnu/java/locale/LocaleInformation_en_GB.java,
gnu/java/locale/LocaleInformation_en_HK.java,
gnu/java/locale/LocaleInformation_en_IE.java,
gnu/java/locale/LocaleInformation_en_MT.java,
gnu/java/locale/LocaleInformation_en_NZ.java,
gnu/java/locale/LocaleInformation_en_PH.java,
gnu/java/locale/LocaleInformation_en_SG.java,
gnu/java/locale/LocaleInformation_en_US.java,
gnu/java/locale/LocaleInformation_en_ZW.java,
gnu/java/locale/LocaleInformation_eo.java,
gnu/java/locale/LocaleInformation_es.java,
gnu/java/locale/LocaleInformation_es_AR.java,
gnu/java/locale/LocaleInformation_es_CL.java,
gnu/java/locale/LocaleInformation_es_CO.java,
gnu/java/locale/LocaleInformation_es_ES.java,
gnu/java/locale/LocaleInformation_es_MX.java,
gnu/java/locale/LocaleInformation_es_PR.java,
gnu/java/locale/LocaleInformation_et.java,
gnu/java/locale/LocaleInformation_eu.java,
gnu/java/locale/LocaleInformation_fa.java,
gnu/java/locale/LocaleInformation_fa_AF.java,
gnu/java/locale/LocaleInformation_fi.java,
gnu/java/locale/LocaleInformation_fo.java,
gnu/java/locale/LocaleInformation_fr.java,
gnu/java/locale/LocaleInformation_fr_CA.java,
gnu/java/locale/LocaleInformation_fr_LU.java,
gnu/java/locale/LocaleInformation_ga.java,
gnu/java/locale/LocaleInformation_ga_IE.java,
gnu/java/locale/LocaleInformation_gez.java
gnu/java/locale/LocaleInformation_gez_ER.java
gnu/java/locale/LocaleInformation_gez_ET.java
gnu/java/locale/LocaleInformation_gl.java,
gnu/java/locale/LocaleInformation_gu.java,
gnu/java/locale/LocaleInformation_gv.java,
gnu/java/locale/LocaleInformation_haw.java
gnu/java/locale/LocaleInformation_haw_US.java
gnu/java/locale/LocaleInformation_he.java,
gnu/java/locale/LocaleInformation_hi.java,
gnu/java/locale/LocaleInformation_hr.java,
gnu/java/locale/LocaleInformation_hu.java,
gnu/java/locale/LocaleInformation_hy.java,
gnu/java/locale/LocaleInformation_id.java,
gnu/java/locale/LocaleInformation_is.java,
gnu/java/locale/LocaleInformation_it.java,
gnu/java/locale/LocaleInformation_it_IT.java,
gnu/java/locale/LocaleInformation_iu.java,
gnu/java/locale/LocaleInformation_ja.java,
gnu/java/locale/LocaleInformation_ka.java,
gnu/java/locale/LocaleInformation_kk.java,
gnu/java/locale/LocaleInformation_kl.java,
gnu/java/locale/LocaleInformation_km.java,
gnu/java/locale/LocaleInformation_kn.java,
gnu/java/locale/LocaleInformation_ko.java,
gnu/java/locale/LocaleInformation_kok.java
gnu/java/locale/LocaleInformation_kok_IN.java
gnu/java/locale/LocaleInformation_kw.java,
gnu/java/locale/LocaleInformation_ky.java,
gnu/java/locale/LocaleInformation_lo.java,
gnu/java/locale/LocaleInformation_lt.java,
gnu/java/locale/LocaleInformation_lv.java,
gnu/java/locale/LocaleInformation_mk.java,
gnu/java/locale/LocaleInformation_ml.java,
gnu/java/locale/LocaleInformation_mn.java,
gnu/java/locale/LocaleInformation_mn_MN.java,
gnu/java/locale/LocaleInformation_mr.java,
gnu/java/locale/LocaleInformation_ms.java,
gnu/java/locale/LocaleInformation_ms_BN.java,
gnu/java/locale/LocaleInformation_mt.java,
gnu/java/locale/LocaleInformation_nb.java,
gnu/java/locale/LocaleInformation_nl.java,
gnu/java/locale/LocaleInformation_nn.java,
gnu/java/locale/LocaleInformation_om.java,
gnu/java/locale/LocaleInformation_om_ET.java,
gnu/java/locale/LocaleInformation_or.java,
gnu/java/locale/LocaleInformation_pa.java,
gnu/java/locale/LocaleInformation_pl.java,
gnu/java/locale/LocaleInformation_ps.java,
gnu/java/locale/LocaleInformation_pt.java,
gnu/java/locale/LocaleInformation_pt_PT.java,
gnu/java/locale/LocaleInformation_ro.java,
gnu/java/locale/LocaleInformation_ru.java,
gnu/java/locale/LocaleInformation_sa.java,
gnu/java/locale/LocaleInformation_sid.java
gnu/java/locale/LocaleInformation_sid_ET.java
gnu/java/locale/LocaleInformation_sk.java,
gnu/java/locale/LocaleInformation_sl.java,
gnu/java/locale/LocaleInformation_so.java,
gnu/java/locale/LocaleInformation_so_DJ.java,
gnu/java/locale/LocaleInformation_so_ET.java,
gnu/java/locale/LocaleInformation_so_SO.java,
gnu/java/locale/LocaleInformation_sq.java,
gnu/java/locale/LocaleInformation_sr.java,
gnu/java/locale/LocaleInformation_sr_Latn.java,
gnu/java/locale/LocaleInformation_sv.java,
gnu/java/locale/LocaleInformation_sw.java,
gnu/java/locale/LocaleInformation_syr.java
gnu/java/locale/LocaleInformation_syr_SY.java
gnu/java/locale/LocaleInformation_ta.java,
gnu/java/locale/LocaleInformation_te.java,
gnu/java/locale/LocaleInformation_th.java,
gnu/java/locale/LocaleInformation_ti.java,
gnu/java/locale/LocaleInformation_ti_ER.java,
gnu/java/locale/LocaleInformation_ti_ET.java,
gnu/java/locale/LocaleInformation_tig.java
gnu/java/locale/LocaleInformation_tig_ER.java
gnu/java/locale/LocaleInformation_tr.java,
gnu/java/locale/LocaleInformation_tt.java,
gnu/java/locale/LocaleInformation_uk.java,
gnu/java/locale/LocaleInformation_ur.java,
gnu/java/locale/LocaleInformation_uz.java,
gnu/java/locale/LocaleInformation_uz_AF.java,
gnu/java/locale/LocaleInformation_vi.java,
gnu/java/locale/LocaleInformation_wal.java
gnu/java/locale/LocaleInformation_wal_ET.java
gnu/java/locale/LocaleInformation_zh.java,
gnu/java/locale/LocaleInformation_zh_HK_Hant.java,
gnu/java/locale/LocaleInformation_zh_Hant.java,
gnu/java/locale/LocaleInformation_zh_MO_Hant.java,
gnu/java/locale/LocaleInformation_zh_SG_Hans.java,
Locales updated with re-ordered zone strings,
new separator ('|' replaced with \u00A6) and updated
data from the latest CLDR CVS (including 16 new
locales).
* java/util/Currency.java:
(currencySymbol): Removed.
(getCurrencyCode()): Rewritten to call
getCurrencyCode(Locale.getDefault()).
(getCurrencyCode(java.util.Locale)): Rewritten to
lookup localized currency symbol from our locale data.
* java/util/Locale.java:
(getDisplayLanguage(java.util.Locale)): Now calls
method in LocaleHelper.
(getDisplayCountry(java.util.Locale)): Likewise.
(getDisplayVariant(java.util.Locale)): Likewise.
(getDisplayString()): Rewritten in LocaleHelper.
Members:
ChangeLog:1.3494->1.3495
libraries/javalib/Makefile.am:1.303->1.304
libraries/javalib/Makefile.in:1.387->1.388
libraries/javalib/all.files:1.85->1.86
libraries/javalib/gnu/java/locale/LocaleHelper.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_aa.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_aa_ET.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_af.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_am.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_am_ET.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ar.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_as.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_az.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_be.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_bg.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_bn.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_byn.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_byn_ER.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_ca.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_cs.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_cy.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_da.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_de.java:1.7->1.8
libraries/javalib/gnu/java/locale/LocaleInformation_de_AT.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_de_BE.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_de_CH.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_de_LU.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_dv.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_dz.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_dz_BT.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_el.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_el_GR.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_en.java:1.8->1.9
libraries/javalib/gnu/java/locale/LocaleInformation_en_AU.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_en_BE.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_en_CA.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_en_GB.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_en_HK.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_en_IE.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_en_MT.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_en_NZ.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_en_PH.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_en_SG.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_en_US.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_en_ZW.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_eo.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_es.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_es_AR.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_es_CL.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_es_CO.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_es_ES.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_es_MX.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_es_PR.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_et.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_eu.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_fa.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_fa_AF.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_fi.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_fo.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_fr.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_fr_CA.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_fr_LU.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_ga.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ga_IE.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_gez.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_gez_ER.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_gez_ET.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_gl.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_gu.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_gv.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_haw.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_haw_US.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_he.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_hi.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_hr.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_hu.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_hy.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_id.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_is.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_it.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_it_IT.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_iu.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ja.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ka.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_kk.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_kl.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_km.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_kn.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ko.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_kok.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_kok_IN.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_kw.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ky.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_lo.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_lt.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_lv.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_mk.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ml.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_mn.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_mn_MN.java:1.1->1.2
libraries/javalib/gnu/java/locale/LocaleInformation_mr.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ms.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ms_BN.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_mt.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_nb.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_nl.java:1.8->1.9
libraries/javalib/gnu/java/locale/LocaleInformation_nn.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_om.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_om_ET.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_or.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_pa.java:1.3->1.4
libraries/javalib/gnu/java/locale/LocaleInformation_pl.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ps.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_pt.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_pt_PT.java:1.4->1.5
libraries/javalib/gnu/java/locale/LocaleInformation_ro.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ru.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_sa.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_sid.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_sid_ET.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_sk.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_sl.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_so.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_so_DJ.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_so_ET.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_so_SO.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_sq.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_sr.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_sr_Latn.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_sv.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_sw.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_syr.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_syr_SY.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_ta.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_te.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_th.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ti.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ti_ER.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ti_ET.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_tig.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_tig_ER.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_tr.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_tt.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_uk.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_ur.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_uz.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_uz_AF.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_vi.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_wal.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_wal_ET.java:INITIAL->1.1
libraries/javalib/gnu/java/locale/LocaleInformation_zh.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_zh_HK_Hant.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_zh_Hant.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_zh_MO_Hant.java:1.2->1.3
libraries/javalib/gnu/java/locale/LocaleInformation_zh_SG_Hans.java:1.2->1.3
libraries/javalib/java/util/Currency.java:1.14->1.15
libraries/javalib/java/util/Locale.java:1.22->1.23
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3494 kaffe/ChangeLog:1.3495
--- kaffe/ChangeLog:1.3494 Mon Jan 31 19:06:46 2005
+++ kaffe/ChangeLog Mon Jan 31 19:22:40 2005
@@ -2,6 +2,187 @@
Resynced with GNU Classpath.
+ 2005-01-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * gnu/java/locale/LocaleHelper.java:
+ New utility class.
+ (getLocalizedString(java.util.Locale,
+ String, String, boolean, boolean)):
+ More generic version of what was
+ java.util.Locale.getDisplayString, now
+ available to all classes.
+ * gnu/java/locale/LocaleInformation.java,
+ gnu/java/locale/LocaleInformation_aa.java,
+ gnu/java/locale/LocaleInformation_aa_ET.java,
+ gnu/java/locale/LocaleInformation_af.java,
+ gnu/java/locale/LocaleInformation_am.java,
+ gnu/java/locale/LocaleInformation_am_ET.java,
+ gnu/java/locale/LocaleInformation_ar.java,
+ gnu/java/locale/LocaleInformation_as.java,
+ gnu/java/locale/LocaleInformation_az.java,
+ gnu/java/locale/LocaleInformation_be.java,
+ gnu/java/locale/LocaleInformation_bg.java,
+ gnu/java/locale/LocaleInformation_bn.java,
+ gnu/java/locale/LocaleInformation_byn.java
+ gnu/java/locale/LocaleInformation_byn_ER.java
+ gnu/java/locale/LocaleInformation_ca.java,
+ gnu/java/locale/LocaleInformation_cs.java,
+ gnu/java/locale/LocaleInformation_cy.java,
+ gnu/java/locale/LocaleInformation_da.java,
+ gnu/java/locale/LocaleInformation_de.java,
+ gnu/java/locale/LocaleInformation_de_AT.java,
+ gnu/java/locale/LocaleInformation_de_BE.java,
+ gnu/java/locale/LocaleInformation_de_CH.java,
+ gnu/java/locale/LocaleInformation_de_LU.java,
+ gnu/java/locale/LocaleInformation_dv.java,
+ gnu/java/locale/LocaleInformation_dz.java,
+ gnu/java/locale/LocaleInformation_dz_BT.java,
+ gnu/java/locale/LocaleInformation_el.java,
+ gnu/java/locale/LocaleInformation_el_GR.java,
+ gnu/java/locale/LocaleInformation_en.java,
+ gnu/java/locale/LocaleInformation_en_AU.java,
+ gnu/java/locale/LocaleInformation_en_BE.java,
+ gnu/java/locale/LocaleInformation_en_CA.java,
+ gnu/java/locale/LocaleInformation_en_GB.java,
+ gnu/java/locale/LocaleInformation_en_HK.java,
+ gnu/java/locale/LocaleInformation_en_IE.java,
+ gnu/java/locale/LocaleInformation_en_MT.java,
+ gnu/java/locale/LocaleInformation_en_NZ.java,
+ gnu/java/locale/LocaleInformation_en_PH.java,
+ gnu/java/locale/LocaleInformation_en_SG.java,
+ gnu/java/locale/LocaleInformation_en_US.java,
+ gnu/java/locale/LocaleInformation_en_ZW.java,
+ gnu/java/locale/LocaleInformation_eo.java,
+ gnu/java/locale/LocaleInformation_es.java,
+ gnu/java/locale/LocaleInformation_es_AR.java,
+ gnu/java/locale/LocaleInformation_es_CL.java,
+ gnu/java/locale/LocaleInformation_es_CO.java,
+ gnu/java/locale/LocaleInformation_es_ES.java,
+ gnu/java/locale/LocaleInformation_es_MX.java,
+ gnu/java/locale/LocaleInformation_es_PR.java,
+ gnu/java/locale/LocaleInformation_et.java,
+ gnu/java/locale/LocaleInformation_eu.java,
+ gnu/java/locale/LocaleInformation_fa.java,
+ gnu/java/locale/LocaleInformation_fa_AF.java,
+ gnu/java/locale/LocaleInformation_fi.java,
+ gnu/java/locale/LocaleInformation_fo.java,
+ gnu/java/locale/LocaleInformation_fr.java,
+ gnu/java/locale/LocaleInformation_fr_CA.java,
+ gnu/java/locale/LocaleInformation_fr_LU.java,
+ gnu/java/locale/LocaleInformation_ga.java,
+ gnu/java/locale/LocaleInformation_ga_IE.java,
+ gnu/java/locale/LocaleInformation_gez.java
+ gnu/java/locale/LocaleInformation_gez_ER.java
+ gnu/java/locale/LocaleInformation_gez_ET.java
+ gnu/java/locale/LocaleInformation_gl.java,
+ gnu/java/locale/LocaleInformation_gu.java,
+ gnu/java/locale/LocaleInformation_gv.java,
+ gnu/java/locale/LocaleInformation_haw.java
+ gnu/java/locale/LocaleInformation_haw_US.java
+ gnu/java/locale/LocaleInformation_he.java,
+ gnu/java/locale/LocaleInformation_hi.java,
+ gnu/java/locale/LocaleInformation_hr.java,
+ gnu/java/locale/LocaleInformation_hu.java,
+ gnu/java/locale/LocaleInformation_hy.java,
+ gnu/java/locale/LocaleInformation_id.java,
+ gnu/java/locale/LocaleInformation_is.java,
+ gnu/java/locale/LocaleInformation_it.java,
+ gnu/java/locale/LocaleInformation_it_IT.java,
+ gnu/java/locale/LocaleInformation_iu.java,
+ gnu/java/locale/LocaleInformation_ja.java,
+ gnu/java/locale/LocaleInformation_ka.java,
+ gnu/java/locale/LocaleInformation_kk.java,
+ gnu/java/locale/LocaleInformation_kl.java,
+ gnu/java/locale/LocaleInformation_km.java,
+ gnu/java/locale/LocaleInformation_kn.java,
+ gnu/java/locale/LocaleInformation_ko.java,
+ gnu/java/locale/LocaleInformation_kok.java
+ gnu/java/locale/LocaleInformation_kok_IN.java
+ gnu/java/locale/LocaleInformation_kw.java,
+ gnu/java/locale/LocaleInformation_ky.java,
+ gnu/java/locale/LocaleInformation_lo.java,
+ gnu/java/locale/LocaleInformation_lt.java,
+ gnu/java/locale/LocaleInformation_lv.java,
+ gnu/java/locale/LocaleInformation_mk.java,
+ gnu/java/locale/LocaleInformation_ml.java,
+ gnu/java/locale/LocaleInformation_mn.java,
+ gnu/java/locale/LocaleInformation_mn_MN.java,
+ gnu/java/locale/LocaleInformation_mr.java,
+ gnu/java/locale/LocaleInformation_ms.java,
+ gnu/java/locale/LocaleInformation_ms_BN.java,
+ gnu/java/locale/LocaleInformation_mt.java,
+ gnu/java/locale/LocaleInformation_nb.java,
+ gnu/java/locale/LocaleInformation_nl.java,
+ gnu/java/locale/LocaleInformation_nn.java,
+ gnu/java/locale/LocaleInformation_om.java,
+ gnu/java/locale/LocaleInformation_om_ET.java,
+ gnu/java/locale/LocaleInformation_or.java,
+ gnu/java/locale/LocaleInformation_pa.java,
+ gnu/java/locale/LocaleInformation_pl.java,
+ gnu/java/locale/LocaleInformation_ps.java,
+ gnu/java/locale/LocaleInformation_pt.java,
+ gnu/java/locale/LocaleInformation_pt_PT.java,
+ gnu/java/locale/LocaleInformation_ro.java,
+ gnu/java/locale/LocaleInformation_ru.java,
+ gnu/java/locale/LocaleInformation_sa.java,
+ gnu/java/locale/LocaleInformation_sid.java
+ gnu/java/locale/LocaleInformation_sid_ET.java
+ gnu/java/locale/LocaleInformation_sk.java,
+ gnu/java/locale/LocaleInformation_sl.java,
+ gnu/java/locale/LocaleInformation_so.java,
+ gnu/java/locale/LocaleInformation_so_DJ.java,
+ gnu/java/locale/LocaleInformation_so_ET.java,
+ gnu/java/locale/LocaleInformation_so_SO.java,
+ gnu/java/locale/LocaleInformation_sq.java,
+ gnu/java/locale/LocaleInformation_sr.java,
+ gnu/java/locale/LocaleInformation_sr_Latn.java,
+ gnu/java/locale/LocaleInformation_sv.java,
+ gnu/java/locale/LocaleInformation_sw.java,
+ gnu/java/locale/LocaleInformation_syr.java
+ gnu/java/locale/LocaleInformation_syr_SY.java
+ gnu/java/locale/LocaleInformation_ta.java,
+ gnu/java/locale/LocaleInformation_te.java,
+ gnu/java/locale/LocaleInformation_th.java,
+ gnu/java/locale/LocaleInformation_ti.java,
+ gnu/java/locale/LocaleInformation_ti_ER.java,
+ gnu/java/locale/LocaleInformation_ti_ET.java,
+ gnu/java/locale/LocaleInformation_tig.java
+ gnu/java/locale/LocaleInformation_tig_ER.java
+ gnu/java/locale/LocaleInformation_tr.java,
+ gnu/java/locale/LocaleInformation_tt.java,
+ gnu/java/locale/LocaleInformation_uk.java,
+ gnu/java/locale/LocaleInformation_ur.java,
+ gnu/java/locale/LocaleInformation_uz.java,
+ gnu/java/locale/LocaleInformation_uz_AF.java,
+ gnu/java/locale/LocaleInformation_vi.java,
+ gnu/java/locale/LocaleInformation_wal.java
+ gnu/java/locale/LocaleInformation_wal_ET.java
+ gnu/java/locale/LocaleInformation_zh.java,
+ gnu/java/locale/LocaleInformation_zh_HK_Hant.java,
+ gnu/java/locale/LocaleInformation_zh_Hant.java,
+ gnu/java/locale/LocaleInformation_zh_MO_Hant.java,
+ gnu/java/locale/LocaleInformation_zh_SG_Hans.java,
+ Locales updated with re-ordered zone strings,
+ new separator ('|' replaced with \u00A6) and updated
+ data from the latest CLDR CVS (including 16 new
+ locales).
+ * java/util/Currency.java:
+ (currencySymbol): Removed.
+ (getCurrencyCode()): Rewritten to call
+ getCurrencyCode(Locale.getDefault()).
+ (getCurrencyCode(java.util.Locale)): Rewritten to
+ lookup localized currency symbol from our locale data.
+ * java/util/Locale.java:
+ (getDisplayLanguage(java.util.Locale)): Now calls
+ method in LocaleHelper.
+ (getDisplayCountry(java.util.Locale)): Likewise.
+ (getDisplayVariant(java.util.Locale)): Likewise.
+ (getDisplayString()): Rewritten in LocaleHelper.
+
+2005-01-31 Dalibor Topic <robilad at kaffe.org>
+
+ Resynced with GNU Classpath.
+
2005-01-29 Quentin Anciaux <quentin.anciaux at advalvas.be>
* gnu/classpath/SystemProperties.java (static): Add all aliases
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.303 kaffe/libraries/javalib/Makefile.am:1.304
--- kaffe/libraries/javalib/Makefile.am:1.303 Mon Jan 31 19:06:51 2005
+++ kaffe/libraries/javalib/Makefile.am Mon Jan 31 19:22:45 2005
@@ -1102,6 +1102,7 @@
gnu/java/locale/Calendar_de.java \
gnu/java/locale/Calendar_en.java \
gnu/java/locale/Calendar_nl.java \
+ gnu/java/locale/LocaleHelper.java \
gnu/java/locale/LocaleInformation.java \
gnu/java/locale/LocaleInformation_aa.java \
gnu/java/locale/LocaleInformation_aa_DJ.java \
@@ -1137,6 +1138,8 @@
gnu/java/locale/LocaleInformation_bn_IN.java \
gnu/java/locale/LocaleInformation_br_FR.java \
gnu/java/locale/LocaleInformation_bs_BA.java \
+ gnu/java/locale/LocaleInformation_byn.java \
+ gnu/java/locale/LocaleInformation_byn_ER.java \
gnu/java/locale/LocaleInformation_ca.java \
gnu/java/locale/LocaleInformation_ca_ES.java \
gnu/java/locale/LocaleInformation_cs.java \
@@ -1224,12 +1227,17 @@
gnu/java/locale/LocaleInformation_fr_LU.java \
gnu/java/locale/LocaleInformation_ga.java \
gnu/java/locale/LocaleInformation_ga_IE.java \
+ gnu/java/locale/LocaleInformation_gez.java \
+ gnu/java/locale/LocaleInformation_gez_ER.java \
+ gnu/java/locale/LocaleInformation_gez_ET.java \
gnu/java/locale/LocaleInformation_gl.java \
gnu/java/locale/LocaleInformation_gl_ES.java \
gnu/java/locale/LocaleInformation_gu.java \
gnu/java/locale/LocaleInformation_gu_IN.java \
gnu/java/locale/LocaleInformation_gv.java \
gnu/java/locale/LocaleInformation_gv_GB.java \
+ gnu/java/locale/LocaleInformation_haw.java \
+ gnu/java/locale/LocaleInformation_haw_US.java \
gnu/java/locale/LocaleInformation_he.java \
gnu/java/locale/LocaleInformation_he_IL.java \
gnu/java/locale/LocaleInformation_hi.java \
@@ -1262,6 +1270,8 @@
gnu/java/locale/LocaleInformation_kn_IN.java \
gnu/java/locale/LocaleInformation_ko.java \
gnu/java/locale/LocaleInformation_ko_KR.java \
+ gnu/java/locale/LocaleInformation_kok.java \
+ gnu/java/locale/LocaleInformation_kok_IN.java \
gnu/java/locale/LocaleInformation_kw.java \
gnu/java/locale/LocaleInformation_kw_GB.java \
gnu/java/locale/LocaleInformation_ky.java \
@@ -1314,6 +1324,8 @@
gnu/java/locale/LocaleInformation_sa.java \
gnu/java/locale/LocaleInformation_sa_IN.java \
gnu/java/locale/LocaleInformation_se_NO.java \
+ gnu/java/locale/LocaleInformation_sid.java \
+ gnu/java/locale/LocaleInformation_sid_ET.java \
gnu/java/locale/LocaleInformation_sk.java \
gnu/java/locale/LocaleInformation_sk_SK.java \
gnu/java/locale/LocaleInformation_sl.java \
@@ -1332,6 +1344,8 @@
gnu/java/locale/LocaleInformation_sw.java \
gnu/java/locale/LocaleInformation_sw_KE.java \
gnu/java/locale/LocaleInformation_sw_TZ.java \
+ gnu/java/locale/LocaleInformation_syr.java \
+ gnu/java/locale/LocaleInformation_syr_SY.java \
gnu/java/locale/LocaleInformation_ta.java \
gnu/java/locale/LocaleInformation_ta_IN.java \
gnu/java/locale/LocaleInformation_te.java \
@@ -1342,6 +1356,8 @@
gnu/java/locale/LocaleInformation_ti.java \
gnu/java/locale/LocaleInformation_ti_ER.java \
gnu/java/locale/LocaleInformation_ti_ET.java \
+ gnu/java/locale/LocaleInformation_tig.java \
+ gnu/java/locale/LocaleInformation_tig_ER.java \
gnu/java/locale/LocaleInformation_tr.java \
gnu/java/locale/LocaleInformation_tr_TR.java \
gnu/java/locale/LocaleInformation_tt.java \
@@ -1352,6 +1368,8 @@
gnu/java/locale/LocaleInformation_uz.java \
gnu/java/locale/LocaleInformation_uz_AF.java \
gnu/java/locale/LocaleInformation_vi.java \
+ gnu/java/locale/LocaleInformation_wal.java \
+ gnu/java/locale/LocaleInformation_wal_ET.java \
gnu/java/locale/LocaleInformation_zh.java \
gnu/java/locale/LocaleInformation_zh_CN_Hans.java \
gnu/java/locale/LocaleInformation_zh_HK_Hant.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.387 kaffe/libraries/javalib/Makefile.in:1.388
--- kaffe/libraries/javalib/Makefile.in:1.387 Mon Jan 31 19:06:52 2005
+++ kaffe/libraries/javalib/Makefile.in Mon Jan 31 19:22:46 2005
@@ -1525,6 +1525,7 @@
gnu/java/locale/Calendar_de.java \
gnu/java/locale/Calendar_en.java \
gnu/java/locale/Calendar_nl.java \
+ gnu/java/locale/LocaleHelper.java \
gnu/java/locale/LocaleInformation.java \
gnu/java/locale/LocaleInformation_aa.java \
gnu/java/locale/LocaleInformation_aa_DJ.java \
@@ -1560,6 +1561,8 @@
gnu/java/locale/LocaleInformation_bn_IN.java \
gnu/java/locale/LocaleInformation_br_FR.java \
gnu/java/locale/LocaleInformation_bs_BA.java \
+ gnu/java/locale/LocaleInformation_byn.java \
+ gnu/java/locale/LocaleInformation_byn_ER.java \
gnu/java/locale/LocaleInformation_ca.java \
gnu/java/locale/LocaleInformation_ca_ES.java \
gnu/java/locale/LocaleInformation_cs.java \
@@ -1647,12 +1650,17 @@
gnu/java/locale/LocaleInformation_fr_LU.java \
gnu/java/locale/LocaleInformation_ga.java \
gnu/java/locale/LocaleInformation_ga_IE.java \
+ gnu/java/locale/LocaleInformation_gez.java \
+ gnu/java/locale/LocaleInformation_gez_ER.java \
+ gnu/java/locale/LocaleInformation_gez_ET.java \
gnu/java/locale/LocaleInformation_gl.java \
gnu/java/locale/LocaleInformation_gl_ES.java \
gnu/java/locale/LocaleInformation_gu.java \
gnu/java/locale/LocaleInformation_gu_IN.java \
gnu/java/locale/LocaleInformation_gv.java \
gnu/java/locale/LocaleInformation_gv_GB.java \
+ gnu/java/locale/LocaleInformation_haw.java \
+ gnu/java/locale/LocaleInformation_haw_US.java \
gnu/java/locale/LocaleInformation_he.java \
gnu/java/locale/LocaleInformation_he_IL.java \
gnu/java/locale/LocaleInformation_hi.java \
@@ -1685,6 +1693,8 @@
gnu/java/locale/LocaleInformation_kn_IN.java \
gnu/java/locale/LocaleInformation_ko.java \
gnu/java/locale/LocaleInformation_ko_KR.java \
+ gnu/java/locale/LocaleInformation_kok.java \
+ gnu/java/locale/LocaleInformation_kok_IN.java \
gnu/java/locale/LocaleInformation_kw.java \
gnu/java/locale/LocaleInformation_kw_GB.java \
gnu/java/locale/LocaleInformation_ky.java \
@@ -1737,6 +1747,8 @@
gnu/java/locale/LocaleInformation_sa.java \
gnu/java/locale/LocaleInformation_sa_IN.java \
gnu/java/locale/LocaleInformation_se_NO.java \
+ gnu/java/locale/LocaleInformation_sid.java \
+ gnu/java/locale/LocaleInformation_sid_ET.java \
gnu/java/locale/LocaleInformation_sk.java \
gnu/java/locale/LocaleInformation_sk_SK.java \
gnu/java/locale/LocaleInformation_sl.java \
@@ -1755,6 +1767,8 @@
gnu/java/locale/LocaleInformation_sw.java \
gnu/java/locale/LocaleInformation_sw_KE.java \
gnu/java/locale/LocaleInformation_sw_TZ.java \
+ gnu/java/locale/LocaleInformation_syr.java \
+ gnu/java/locale/LocaleInformation_syr_SY.java \
gnu/java/locale/LocaleInformation_ta.java \
gnu/java/locale/LocaleInformation_ta_IN.java \
gnu/java/locale/LocaleInformation_te.java \
@@ -1765,6 +1779,8 @@
gnu/java/locale/LocaleInformation_ti.java \
gnu/java/locale/LocaleInformation_ti_ER.java \
gnu/java/locale/LocaleInformation_ti_ET.java \
+ gnu/java/locale/LocaleInformation_tig.java \
+ gnu/java/locale/LocaleInformation_tig_ER.java \
gnu/java/locale/LocaleInformation_tr.java \
gnu/java/locale/LocaleInformation_tr_TR.java \
gnu/java/locale/LocaleInformation_tt.java \
@@ -1775,6 +1791,8 @@
gnu/java/locale/LocaleInformation_uz.java \
gnu/java/locale/LocaleInformation_uz_AF.java \
gnu/java/locale/LocaleInformation_vi.java \
+ gnu/java/locale/LocaleInformation_wal.java \
+ gnu/java/locale/LocaleInformation_wal_ET.java \
gnu/java/locale/LocaleInformation_zh.java \
gnu/java/locale/LocaleInformation_zh_CN_Hans.java \
gnu/java/locale/LocaleInformation_zh_HK_Hant.java \
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.85 kaffe/libraries/javalib/all.files:1.86
--- kaffe/libraries/javalib/all.files:1.85 Mon Jan 31 19:06:54 2005
+++ kaffe/libraries/javalib/all.files Mon Jan 31 19:22:49 2005
@@ -699,6 +699,7 @@
gnu/java/locale/Calendar_de.java
gnu/java/locale/Calendar_en.java
gnu/java/locale/Calendar_nl.java
+gnu/java/locale/LocaleHelper.java
gnu/java/locale/LocaleInformation.java
gnu/java/locale/LocaleInformation_aa.java
gnu/java/locale/LocaleInformation_aa_DJ.java
@@ -734,6 +735,8 @@
gnu/java/locale/LocaleInformation_bn_IN.java
gnu/java/locale/LocaleInformation_br_FR.java
gnu/java/locale/LocaleInformation_bs_BA.java
+gnu/java/locale/LocaleInformation_byn.java
+gnu/java/locale/LocaleInformation_byn_ER.java
gnu/java/locale/LocaleInformation_ca.java
gnu/java/locale/LocaleInformation_ca_ES.java
gnu/java/locale/LocaleInformation_cs.java
@@ -821,12 +824,17 @@
gnu/java/locale/LocaleInformation_fr_LU.java
gnu/java/locale/LocaleInformation_ga.java
gnu/java/locale/LocaleInformation_ga_IE.java
+gnu/java/locale/LocaleInformation_gez.java
+gnu/java/locale/LocaleInformation_gez_ER.java
+gnu/java/locale/LocaleInformation_gez_ET.java
gnu/java/locale/LocaleInformation_gl.java
gnu/java/locale/LocaleInformation_gl_ES.java
gnu/java/locale/LocaleInformation_gu.java
gnu/java/locale/LocaleInformation_gu_IN.java
gnu/java/locale/LocaleInformation_gv.java
gnu/java/locale/LocaleInformation_gv_GB.java
+gnu/java/locale/LocaleInformation_haw.java
+gnu/java/locale/LocaleInformation_haw_US.java
gnu/java/locale/LocaleInformation_he.java
gnu/java/locale/LocaleInformation_he_IL.java
gnu/java/locale/LocaleInformation_hi.java
@@ -859,6 +867,8 @@
gnu/java/locale/LocaleInformation_kn_IN.java
gnu/java/locale/LocaleInformation_ko.java
gnu/java/locale/LocaleInformation_ko_KR.java
+gnu/java/locale/LocaleInformation_kok.java
+gnu/java/locale/LocaleInformation_kok_IN.java
gnu/java/locale/LocaleInformation_kw.java
gnu/java/locale/LocaleInformation_kw_GB.java
gnu/java/locale/LocaleInformation_ky.java
@@ -911,6 +921,8 @@
gnu/java/locale/LocaleInformation_sa.java
gnu/java/locale/LocaleInformation_sa_IN.java
gnu/java/locale/LocaleInformation_se_NO.java
+gnu/java/locale/LocaleInformation_sid.java
+gnu/java/locale/LocaleInformation_sid_ET.java
gnu/java/locale/LocaleInformation_sk.java
gnu/java/locale/LocaleInformation_sk_SK.java
gnu/java/locale/LocaleInformation_sl.java
@@ -929,6 +941,8 @@
gnu/java/locale/LocaleInformation_sw.java
gnu/java/locale/LocaleInformation_sw_KE.java
gnu/java/locale/LocaleInformation_sw_TZ.java
+gnu/java/locale/LocaleInformation_syr.java
+gnu/java/locale/LocaleInformation_syr_SY.java
gnu/java/locale/LocaleInformation_ta.java
gnu/java/locale/LocaleInformation_ta_IN.java
gnu/java/locale/LocaleInformation_te.java
@@ -939,6 +953,8 @@
gnu/java/locale/LocaleInformation_ti.java
gnu/java/locale/LocaleInformation_ti_ER.java
gnu/java/locale/LocaleInformation_ti_ET.java
+gnu/java/locale/LocaleInformation_tig.java
+gnu/java/locale/LocaleInformation_tig_ER.java
gnu/java/locale/LocaleInformation_tr.java
gnu/java/locale/LocaleInformation_tr_TR.java
gnu/java/locale/LocaleInformation_tt.java
@@ -949,6 +965,8 @@
gnu/java/locale/LocaleInformation_uz.java
gnu/java/locale/LocaleInformation_uz_AF.java
gnu/java/locale/LocaleInformation_vi.java
+gnu/java/locale/LocaleInformation_wal.java
+gnu/java/locale/LocaleInformation_wal_ET.java
gnu/java/locale/LocaleInformation_zh.java
gnu/java/locale/LocaleInformation_zh_CN_Hans.java
gnu/java/locale/LocaleInformation_zh_HK_Hant.java
===================================================================
Checking out kaffe/libraries/javalib/gnu/java/locale/LocaleHelper.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/gnu/java/locale/LocaleHelper.java,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/java/locale/LocaleHelper.java Mon Jan 31 19:38:06 2005
@@ -0,0 +1,161 @@
+/* LocaleHelper.java -- helper routines for localization
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.java.locale;
+
+import java.util.Locale;
+import java.util.Hashtable;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * This class provides common helper methods
+ * for handling localized data.
+ *
+ * @author Andrew John Hughes (gnu_andrew at member.fsf.org)
+ * @see java.util.Locale
+ * @see java.util.ResourceBundle
+ */
+public class LocaleHelper
+{
+
+ /**
+ * This method is used by the localized name lookup methods to retrieve
+ * the localized name of a particular piece of locale data.
+ * If the display name can not be localized to the supplied
+ * locale, it will fall back on other output in the following order:
+ * </p>
+ * <ul>
+ * <li>the localized name in the default locale</li>
+ * <li>the localized name in English (optional)</li>
+ * <li>the localized name in the root locale bundle (optional)</li>
+ * <li>the localized input string</li>
+ * </ul>
+ * <p>
+ * If the supplied key is merely the empty string, then the empty string is
+ * returned.
+ * </p>
+ *
+ * @param inLocale the locale to use for formatting the display string.
+ * @param key the locale data used as a key to the localized lookup tables.
+ * @param name the name of the hashtable containing the localized data.
+ * @param checkEnglish true if the method should fall back on data
+ * from the English locale.
+ * @param checkRoot true if the method should fall back on data from the
+ * unlocalized root locale.
+ * @return a <code>String</code>, hopefully containing the localized
+ * variant of the input data.
+ * @throws NullPointerException if <code>inLocale</code> is null.
+ */
+ public static String getLocalizedString(Locale inLocale, String key,
+ String name, boolean checkEnglish,
+ boolean checkRoot)
+ {
+ String localizedString;
+ Hashtable table;
+
+ if (key.equals(""))
+ return "";
+ /* Localize to inLocale */
+ try
+ {
+ table = (Hashtable)
+ ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
+ inLocale).getObject(name);
+ localizedString = (String) table.get(key);
+ }
+ catch (MissingResourceException exception)
+ {
+ localizedString = null;
+ }
+ /* Localize to default locale */
+ if (localizedString == null)
+ {
+ try
+ {
+ ResourceBundle bundle;
+
+ bundle =
+ ResourceBundle.getBundle("gnu.java.locale.LocaleInformation");
+ table = (Hashtable) bundle.getObject(name);
+ localizedString = (String) table.get(key);
+ }
+ catch (MissingResourceException exception)
+ {
+ localizedString = null;
+ }
+ }
+ /* Localize to English */
+ if (localizedString == null && checkEnglish)
+ {
+ try
+ {
+ table = (Hashtable)
+ ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
+ Locale.ENGLISH).getObject(name);
+ localizedString= (String) table.get(key);
+ }
+ catch (MissingResourceException exception)
+ {
+ localizedString = null;
+ }
+ }
+ /* Return unlocalized version */
+ if (localizedString == null && checkRoot)
+ {
+ try
+ {
+ table = (Hashtable)
+ ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
+ new Locale("","","")).getObject(name);
+ localizedString= (String) table.get(key);
+ }
+ catch (MissingResourceException exception)
+ {
+ localizedString = null;
+ }
+ }
+ /* Return original input string */
+ if (localizedString == null)
+ {
+ localizedString = key;
+ }
+ return localizedString;
+ }
+}
+
Index: kaffe/libraries/javalib/gnu/java/locale/LocaleInformation.java
diff -u kaffe/libraries/javalib/gnu/java/locale/LocaleInformation.java:1.4 kaffe/libraries/javalib/gnu/java/locale/LocaleInformation.java:1.5
--- kaffe/libraries/javalib/gnu/java/locale/LocaleInformation.java:1.4 Mon Jan 24 15:47:15 2005
+++ kaffe/libraries/javalib/gnu/java/locale/LocaleInformation.java Mon Jan 31 19:22:50 2005
@@ -40,104 +40,145 @@
package gnu.java.locale;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
import java.util.ListResourceBundle;
public class LocaleInformation extends ListResourceBundle
{
- private static final String[] ampms = { "AM", "PM" };
+ private static final String currenciesDisplayNameKeys = "INR\u00A6JPY\u00A6ITL\u00A6EUR\u00A6GBP\u00A6USD";
- private static final String[][] zoneStrings =
- {
- { "GMT", "Greenwich Mean Time", "GMT",
- /**/ "Greenwich Mean Time", "GMT", "GMT" },
- { "PST", "Pacific Standard Time", "PST",
- /**/ "Pacific Daylight Time", "PDT", "San Francisco" },
- { "MST", "Mountain Standard Time", "MST",
- /**/ "Mountain Daylight Time", "MDT", "Denver" },
- { "PNT", "Mountain Standard Time", "MST",
- /**/ "Mountain Standard Time", "MST", "Phoenix" },
- { "CST", "Central Standard Time", "CST",
- /**/ "Central Daylight Time", "CDT", "Chicago" },
- { "EST", "Eastern Standard Time", "EST",
- /**/ "Eastern Daylight Time", "EDT", "Boston" },
- { "IET", "Eastern Standard Time", "EST",
- /**/ "Eastern Standard Time", "EST", "Indianapolis" },
- { "PRT", "Atlantic Standard Time", "AST",
- /**/ "Atlantic Daylight Time", "ADT", "Halifax" },
- { "CNT", "Newfoundland Standard Time", "NST",
- /**/ "Newfoundland Daylight Time", "NDT", "St. Johns" },
*** Patch too long, truncated ***
More information about the kaffe
mailing list