From 601ffaf13c090b87833b7b8f97eff0517c03e330 Mon Sep 17 00:00:00 2001 From: John Emmons Date: Fri, 8 Oct 2010 06:01:05 +0000 Subject: [PATCH] ICU-7597 Make validSublocales be based on included locales in icu-config.xml X-SVN-Rev: 28775 --- icu4c/source/data/build.xml | 2 + icu4c/source/data/coll/colfiles.mk | 9 +- icu4c/source/data/coll/st_LS.txt | 17 -- icu4c/source/data/coll/st_ZA.txt | 17 -- icu4c/source/data/coll/xh.txt | 17 -- icu4c/source/data/coll/xh_ZA.txt | 17 -- icu4c/source/data/icu-config.xml | 1 + .../data/{coll/st.txt => locales/bs_BA.txt} | 12 +- icu4c/source/data/locales/resfiles.mk | 154 +++++++++--------- 9 files changed, 87 insertions(+), 159 deletions(-) delete mode 100644 icu4c/source/data/coll/st_LS.txt delete mode 100644 icu4c/source/data/coll/st_ZA.txt delete mode 100644 icu4c/source/data/coll/xh.txt delete mode 100644 icu4c/source/data/coll/xh_ZA.txt rename icu4c/source/data/{coll/st.txt => locales/bs_BA.txt} (68%) mode change 100644 => 100755 diff --git a/icu4c/source/data/build.xml b/icu4c/source/data/build.xml index 8cb01bf0267..5dcde982b0b 100644 --- a/icu4c/source/data/build.xml +++ b/icu4c/source/data/build.xml @@ -238,6 +238,8 @@ + + &icu-config; diff --git a/icu4c/source/data/coll/colfiles.mk b/icu4c/source/data/coll/colfiles.mk index 7a551cde9e4..ef10657e018 100644 --- a/icu4c/source/data/coll/colfiles.mk +++ b/icu4c/source/data/coll/colfiles.mk @@ -78,11 +78,10 @@ COLLATION_EMPTY_SOURCE = af_NA.txt af_ZA.txt ar_AE.txt ar_BH.txt\ pt_BR.txt pt_PT.txt ro_MD.txt ro_RO.txt ru_MD.txt\ ru_RU.txt ru_UA.txt si_LK.txt sk_SK.txt sl_SI.txt\ sq_AL.txt sr_Cyrl.txt sr_Cyrl_BA.txt sr_Cyrl_ME.txt sr_Cyrl_RS.txt\ - sr_Latn_BA.txt sr_Latn_ME.txt sr_Latn_RS.txt st.txt st_LS.txt\ - st_ZA.txt sv_FI.txt sv_SE.txt sw.txt sw_KE.txt\ - sw_TZ.txt ta_IN.txt ta_LK.txt te_IN.txt th_TH.txt\ - tr_TR.txt uk_UA.txt ur_IN.txt ur_PK.txt vi_VN.txt\ - xh.txt xh_ZA.txt yo_NG.txt zh_Hans.txt zh_Hans_CN.txt\ + sr_Latn_BA.txt sr_Latn_ME.txt sr_Latn_RS.txt sv_FI.txt sv_SE.txt\ + sw.txt sw_KE.txt sw_TZ.txt ta_IN.txt ta_LK.txt\ + te_IN.txt th_TH.txt tr_TR.txt uk_UA.txt ur_IN.txt\ + ur_PK.txt vi_VN.txt yo_NG.txt zh_Hans.txt zh_Hans_CN.txt\ zh_Hans_SG.txt zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt zu.txt\ zu_ZA.txt diff --git a/icu4c/source/data/coll/st_LS.txt b/icu4c/source/data/coll/st_LS.txt deleted file mode 100644 index 823f2e04cb2..00000000000 --- a/icu4c/source/data/coll/st_LS.txt +++ /dev/null @@ -1,17 +0,0 @@ -// *************************************************************************** -// * -// * Copyright (C) 2010 International Business Machines -// * Corporation and others. All Rights Reserved. -// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File:/icu-config.xml & build.xml -// * -// *************************************************************************** -/** - * validSubLocale of "root" - */ -st_LS{ - /** - * so genrb doesn't issue warnings - */ - ___{""} -} diff --git a/icu4c/source/data/coll/st_ZA.txt b/icu4c/source/data/coll/st_ZA.txt deleted file mode 100644 index 4bc125f7603..00000000000 --- a/icu4c/source/data/coll/st_ZA.txt +++ /dev/null @@ -1,17 +0,0 @@ -// *************************************************************************** -// * -// * Copyright (C) 2010 International Business Machines -// * Corporation and others. All Rights Reserved. -// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File:/icu-config.xml & build.xml -// * -// *************************************************************************** -/** - * validSubLocale of "root" - */ -st_ZA{ - /** - * so genrb doesn't issue warnings - */ - ___{""} -} diff --git a/icu4c/source/data/coll/xh.txt b/icu4c/source/data/coll/xh.txt deleted file mode 100644 index b3076204340..00000000000 --- a/icu4c/source/data/coll/xh.txt +++ /dev/null @@ -1,17 +0,0 @@ -// *************************************************************************** -// * -// * Copyright (C) 2010 International Business Machines -// * Corporation and others. All Rights Reserved. -// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File:/icu-config.xml & build.xml -// * -// *************************************************************************** -/** - * validSubLocale of "root" - */ -xh{ - /** - * so genrb doesn't issue warnings - */ - ___{""} -} diff --git a/icu4c/source/data/coll/xh_ZA.txt b/icu4c/source/data/coll/xh_ZA.txt deleted file mode 100644 index 2c969d3faf4..00000000000 --- a/icu4c/source/data/coll/xh_ZA.txt +++ /dev/null @@ -1,17 +0,0 @@ -// *************************************************************************** -// * -// * Copyright (C) 2010 International Business Machines -// * Corporation and others. All Rights Reserved. -// * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File:/icu-config.xml & build.xml -// * -// *************************************************************************** -/** - * validSubLocale of "root" - */ -xh_ZA{ - /** - * so genrb doesn't issue warnings - */ - ___{""} -} diff --git a/icu4c/source/data/icu-config.xml b/icu4c/source/data/icu-config.xml index 1d293ded021..5eb272f79af 100644 --- a/icu4c/source/data/icu-config.xml +++ b/icu4c/source/data/icu-config.xml @@ -60,6 +60,7 @@ + diff --git a/icu4c/source/data/coll/st.txt b/icu4c/source/data/locales/bs_BA.txt old mode 100644 new mode 100755 similarity index 68% rename from icu4c/source/data/coll/st.txt rename to icu4c/source/data/locales/bs_BA.txt index 31705bf3086..cb8d8f8bc93 --- a/icu4c/source/data/coll/st.txt +++ b/icu4c/source/data/locales/bs_BA.txt @@ -3,15 +3,9 @@ // * Copyright (C) 2010 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: com.ibm.icu.dev.tool.cldr.LDML2ICUConverter.java -// * Source File:/icu-config.xml & build.xml +// * Source File:/common/main/bs_BA.xml // * // *************************************************************************** -/** - * validSubLocale of "root" - */ -st{ - /** - * so genrb doesn't issue warnings - */ - ___{""} +bs_BA{ + Version{"2.0.41.23"} } diff --git a/icu4c/source/data/locales/resfiles.mk b/icu4c/source/data/locales/resfiles.mk index 863d21e5b9d..8119a3de3bd 100644 --- a/icu4c/source/data/locales/resfiles.mk +++ b/icu4c/source/data/locales/resfiles.mk @@ -52,81 +52,81 @@ GENRB_SOURCE = af.txt af_NA.txt af_ZA.txt ak.txt\ be.txt be_BY.txt bem.txt bem_ZM.txt bez.txt\ bez_TZ.txt bg.txt bg_BG.txt bm.txt bm_ML.txt\ bn.txt bn_BD.txt bn_IN.txt bo.txt bo_CN.txt\ - bo_IN.txt bs.txt ca.txt ca_ES.txt cgg.txt\ - cgg_UG.txt chr.txt chr_US.txt cs.txt cs_CZ.txt\ - cy.txt cy_GB.txt da.txt da_DK.txt dav.txt\ - dav_KE.txt de.txt de_AT.txt de_BE.txt de_CH.txt\ - de_DE.txt de_LI.txt de_LU.txt ebu.txt ebu_KE.txt\ - ee.txt ee_GH.txt ee_TG.txt el.txt el_CY.txt\ - el_GR.txt en.txt en_AS.txt en_AU.txt en_BE.txt\ - en_BW.txt en_BZ.txt en_CA.txt en_GB.txt en_GU.txt\ - en_HK.txt en_IE.txt en_IN.txt en_JM.txt en_MH.txt\ - en_MP.txt en_MT.txt en_MU.txt en_NA.txt en_NZ.txt\ - en_PH.txt en_PK.txt en_SG.txt en_TT.txt en_UM.txt\ - en_US.txt en_US_POSIX.txt en_VI.txt en_ZA.txt en_ZW.txt\ - eo.txt es.txt es_419.txt es_AR.txt es_BO.txt\ - es_CL.txt es_CO.txt es_CR.txt es_DO.txt es_EC.txt\ - es_ES.txt es_GQ.txt es_GT.txt es_HN.txt es_MX.txt\ - es_NI.txt es_PA.txt es_PE.txt es_PR.txt es_PY.txt\ - es_SV.txt es_US.txt es_UY.txt es_VE.txt et.txt\ - et_EE.txt eu.txt eu_ES.txt fa.txt fa_AF.txt\ - fa_IR.txt ff.txt ff_SN.txt fi.txt fi_FI.txt\ - fil.txt fil_PH.txt fo.txt fo_FO.txt fr.txt\ - fr_BE.txt fr_BF.txt fr_BI.txt fr_BJ.txt fr_BL.txt\ - fr_CA.txt fr_CD.txt fr_CF.txt fr_CG.txt fr_CH.txt\ - fr_CI.txt fr_CM.txt fr_DJ.txt fr_FR.txt fr_GA.txt\ - fr_GN.txt fr_GP.txt fr_GQ.txt fr_KM.txt fr_LU.txt\ - fr_MC.txt fr_MF.txt fr_MG.txt fr_ML.txt fr_MQ.txt\ - fr_NE.txt fr_RE.txt fr_RW.txt fr_SN.txt fr_TD.txt\ - fr_TG.txt ga.txt ga_IE.txt gl.txt gl_ES.txt\ - gsw.txt gsw_CH.txt gu.txt gu_IN.txt guz.txt\ - guz_KE.txt gv.txt gv_GB.txt ha.txt ha_Latn.txt\ - ha_Latn_GH.txt ha_Latn_NE.txt ha_Latn_NG.txt haw.txt haw_US.txt\ - he.txt he_IL.txt hi.txt hi_IN.txt hr.txt\ - hr_HR.txt hu.txt hu_HU.txt hy.txt hy_AM.txt\ - id.txt id_ID.txt ig.txt ig_NG.txt ii.txt\ - ii_CN.txt is.txt is_IS.txt it.txt it_CH.txt\ - it_IT.txt ja.txt ja_JP.txt jmc.txt jmc_TZ.txt\ - ka.txt ka_GE.txt kab.txt kab_DZ.txt kam.txt\ - kam_KE.txt kde.txt kde_TZ.txt kea.txt kea_CV.txt\ - khq.txt khq_ML.txt ki.txt ki_KE.txt kk.txt\ - kk_Cyrl.txt kk_Cyrl_KZ.txt kl.txt kl_GL.txt kln.txt\ - kln_KE.txt km.txt km_KH.txt kn.txt kn_IN.txt\ - ko.txt ko_KR.txt kok.txt kok_IN.txt kw.txt\ - kw_GB.txt lag.txt lag_TZ.txt lg.txt lg_UG.txt\ - lt.txt lt_LT.txt luo.txt luo_KE.txt luy.txt\ - luy_KE.txt lv.txt lv_LV.txt mas.txt mas_KE.txt\ - mas_TZ.txt mer.txt mer_KE.txt mfe.txt mfe_MU.txt\ - mg.txt mg_MG.txt mk.txt mk_MK.txt ml.txt\ - ml_IN.txt mr.txt mr_IN.txt ms.txt ms_BN.txt\ - ms_MY.txt mt.txt mt_MT.txt naq.txt naq_NA.txt\ - nb.txt nb_NO.txt nd.txt nd_ZW.txt ne.txt\ - ne_IN.txt ne_NP.txt nl.txt nl_BE.txt nl_NL.txt\ - nn.txt nn_NO.txt nyn.txt nyn_UG.txt om.txt\ - om_ET.txt om_KE.txt or.txt or_IN.txt pa.txt\ - pa_Arab.txt pa_Arab_PK.txt pa_Guru.txt pa_Guru_IN.txt pl.txt\ - pl_PL.txt ps.txt ps_AF.txt pt.txt pt_BR.txt\ - pt_GW.txt pt_MZ.txt pt_PT.txt rm.txt rm_CH.txt\ - ro.txt ro_MD.txt ro_RO.txt rof.txt rof_TZ.txt\ - ru.txt ru_MD.txt ru_RU.txt ru_UA.txt rw.txt\ - rw_RW.txt rwk.txt rwk_TZ.txt saq.txt saq_KE.txt\ - seh.txt seh_MZ.txt ses.txt ses_ML.txt sg.txt\ - sg_CF.txt shi.txt shi_Latn.txt shi_Latn_MA.txt shi_Tfng.txt\ - shi_Tfng_MA.txt si.txt si_LK.txt sk.txt sk_SK.txt\ - sl.txt sl_SI.txt sn.txt sn_ZW.txt so.txt\ - so_DJ.txt so_ET.txt so_KE.txt so_SO.txt sq.txt\ - sq_AL.txt sr.txt sr_Cyrl.txt sr_Cyrl_BA.txt sr_Cyrl_ME.txt\ - sr_Cyrl_RS.txt sr_Latn.txt sr_Latn_BA.txt sr_Latn_ME.txt sr_Latn_RS.txt\ - sv.txt sv_FI.txt sv_SE.txt sw.txt sw_KE.txt\ - sw_TZ.txt ta.txt ta_IN.txt ta_LK.txt te.txt\ - te_IN.txt teo.txt teo_KE.txt teo_UG.txt th.txt\ - th_TH.txt ti.txt ti_ER.txt ti_ET.txt to.txt\ - to_TO.txt tr.txt tr_TR.txt tzm.txt tzm_Latn.txt\ - tzm_Latn_MA.txt uk.txt uk_UA.txt ur.txt ur_IN.txt\ - ur_PK.txt uz.txt uz_Arab.txt uz_Arab_AF.txt uz_Cyrl.txt\ - uz_Cyrl_UZ.txt uz_Latn.txt uz_Latn_UZ.txt vi.txt vi_VN.txt\ - vun.txt vun_TZ.txt xog.txt xog_UG.txt yo.txt\ - yo_NG.txt zh.txt zh_Hans.txt zh_Hans_CN.txt zh_Hans_HK.txt\ - zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt\ - zh_Hant_TW.txt zu.txt zu_ZA.txt + bo_IN.txt bs.txt bs_BA.txt ca.txt ca_ES.txt\ + cgg.txt cgg_UG.txt chr.txt chr_US.txt cs.txt\ + cs_CZ.txt cy.txt cy_GB.txt da.txt da_DK.txt\ + dav.txt dav_KE.txt de.txt de_AT.txt de_BE.txt\ + de_CH.txt de_DE.txt de_LI.txt de_LU.txt ebu.txt\ + ebu_KE.txt ee.txt ee_GH.txt ee_TG.txt el.txt\ + el_CY.txt el_GR.txt en.txt en_AS.txt en_AU.txt\ + en_BE.txt en_BW.txt en_BZ.txt en_CA.txt en_GB.txt\ + en_GU.txt en_HK.txt en_IE.txt en_IN.txt en_JM.txt\ + en_MH.txt en_MP.txt en_MT.txt en_MU.txt en_NA.txt\ + en_NZ.txt en_PH.txt en_PK.txt en_SG.txt en_TT.txt\ + en_UM.txt en_US.txt en_US_POSIX.txt en_VI.txt en_ZA.txt\ + en_ZW.txt eo.txt es.txt es_419.txt es_AR.txt\ + es_BO.txt es_CL.txt es_CO.txt es_CR.txt es_DO.txt\ + es_EC.txt es_ES.txt es_GQ.txt es_GT.txt es_HN.txt\ + es_MX.txt es_NI.txt es_PA.txt es_PE.txt es_PR.txt\ + es_PY.txt es_SV.txt es_US.txt es_UY.txt es_VE.txt\ + et.txt et_EE.txt eu.txt eu_ES.txt fa.txt\ + fa_AF.txt fa_IR.txt ff.txt ff_SN.txt fi.txt\ + fi_FI.txt fil.txt fil_PH.txt fo.txt fo_FO.txt\ + fr.txt fr_BE.txt fr_BF.txt fr_BI.txt fr_BJ.txt\ + fr_BL.txt fr_CA.txt fr_CD.txt fr_CF.txt fr_CG.txt\ + fr_CH.txt fr_CI.txt fr_CM.txt fr_DJ.txt fr_FR.txt\ + fr_GA.txt fr_GN.txt fr_GP.txt fr_GQ.txt fr_KM.txt\ + fr_LU.txt fr_MC.txt fr_MF.txt fr_MG.txt fr_ML.txt\ + fr_MQ.txt fr_NE.txt fr_RE.txt fr_RW.txt fr_SN.txt\ + fr_TD.txt fr_TG.txt ga.txt ga_IE.txt gl.txt\ + gl_ES.txt gsw.txt gsw_CH.txt gu.txt gu_IN.txt\ + guz.txt guz_KE.txt gv.txt gv_GB.txt ha.txt\ + ha_Latn.txt ha_Latn_GH.txt ha_Latn_NE.txt ha_Latn_NG.txt haw.txt\ + haw_US.txt he.txt he_IL.txt hi.txt hi_IN.txt\ + hr.txt hr_HR.txt hu.txt hu_HU.txt hy.txt\ + hy_AM.txt id.txt id_ID.txt ig.txt ig_NG.txt\ + ii.txt ii_CN.txt is.txt is_IS.txt it.txt\ + it_CH.txt it_IT.txt ja.txt ja_JP.txt jmc.txt\ + jmc_TZ.txt ka.txt ka_GE.txt kab.txt kab_DZ.txt\ + kam.txt kam_KE.txt kde.txt kde_TZ.txt kea.txt\ + kea_CV.txt khq.txt khq_ML.txt ki.txt ki_KE.txt\ + kk.txt kk_Cyrl.txt kk_Cyrl_KZ.txt kl.txt kl_GL.txt\ + kln.txt kln_KE.txt km.txt km_KH.txt kn.txt\ + kn_IN.txt ko.txt ko_KR.txt kok.txt kok_IN.txt\ + kw.txt kw_GB.txt lag.txt lag_TZ.txt lg.txt\ + lg_UG.txt lt.txt lt_LT.txt luo.txt luo_KE.txt\ + luy.txt luy_KE.txt lv.txt lv_LV.txt mas.txt\ + mas_KE.txt mas_TZ.txt mer.txt mer_KE.txt mfe.txt\ + mfe_MU.txt mg.txt mg_MG.txt mk.txt mk_MK.txt\ + ml.txt ml_IN.txt mr.txt mr_IN.txt ms.txt\ + ms_BN.txt ms_MY.txt mt.txt mt_MT.txt naq.txt\ + naq_NA.txt nb.txt nb_NO.txt nd.txt nd_ZW.txt\ + ne.txt ne_IN.txt ne_NP.txt nl.txt nl_BE.txt\ + nl_NL.txt nn.txt nn_NO.txt nyn.txt nyn_UG.txt\ + om.txt om_ET.txt om_KE.txt or.txt or_IN.txt\ + pa.txt pa_Arab.txt pa_Arab_PK.txt pa_Guru.txt pa_Guru_IN.txt\ + pl.txt pl_PL.txt ps.txt ps_AF.txt pt.txt\ + pt_BR.txt pt_GW.txt pt_MZ.txt pt_PT.txt rm.txt\ + rm_CH.txt ro.txt ro_MD.txt ro_RO.txt rof.txt\ + rof_TZ.txt ru.txt ru_MD.txt ru_RU.txt ru_UA.txt\ + rw.txt rw_RW.txt rwk.txt rwk_TZ.txt saq.txt\ + saq_KE.txt seh.txt seh_MZ.txt ses.txt ses_ML.txt\ + sg.txt sg_CF.txt shi.txt shi_Latn.txt shi_Latn_MA.txt\ + shi_Tfng.txt shi_Tfng_MA.txt si.txt si_LK.txt sk.txt\ + sk_SK.txt sl.txt sl_SI.txt sn.txt sn_ZW.txt\ + so.txt so_DJ.txt so_ET.txt so_KE.txt so_SO.txt\ + sq.txt sq_AL.txt sr.txt sr_Cyrl.txt sr_Cyrl_BA.txt\ + sr_Cyrl_ME.txt sr_Cyrl_RS.txt sr_Latn.txt sr_Latn_BA.txt sr_Latn_ME.txt\ + sr_Latn_RS.txt sv.txt sv_FI.txt sv_SE.txt sw.txt\ + sw_KE.txt sw_TZ.txt ta.txt ta_IN.txt ta_LK.txt\ + te.txt te_IN.txt teo.txt teo_KE.txt teo_UG.txt\ + th.txt th_TH.txt ti.txt ti_ER.txt ti_ET.txt\ + to.txt to_TO.txt tr.txt tr_TR.txt tzm.txt\ + tzm_Latn.txt tzm_Latn_MA.txt uk.txt uk_UA.txt ur.txt\ + ur_IN.txt ur_PK.txt uz.txt uz_Arab.txt uz_Arab_AF.txt\ + uz_Cyrl.txt uz_Cyrl_UZ.txt uz_Latn.txt uz_Latn_UZ.txt vi.txt\ + vi_VN.txt vun.txt vun_TZ.txt xog.txt xog_UG.txt\ + yo.txt yo_NG.txt zh.txt zh_Hans.txt zh_Hans_CN.txt\ + zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt\ + zh_Hant_MO.txt zh_Hant_TW.txt zu.txt zu_ZA.txt