about summary refs log tree commit diff
path: root/localedata/locales/tg_TJ
diff options
context:
space:
mode:
authorMike FABIAN <mfabian@redhat.com>2017-12-11 18:26:22 +0100
committerMike FABIAN <mfabian@redhat.com>2018-02-27 17:47:50 +0100
commit159738548130d5ac4fe6178977e940ed5f8cfdc4 (patch)
tree03f90b90e7bb794cfdbd4b3e66c9fff7ad6a9b24 /localedata/locales/tg_TJ
parentce6636b06b67d6bb9b3d6927bf2a926b9b7478f5 (diff)
downloadglibc-159738548130d5ac4fe6178977e940ed5f8cfdc4.tar.gz
glibc-159738548130d5ac4fe6178977e940ed5f8cfdc4.tar.xz
glibc-159738548130d5ac4fe6178977e940ed5f8cfdc4.zip
Adapt collation in several locales to the new iso14651_t1_common file
[BZ #22550] - es_ES locale (and other es_* locales): collation should
treat ñ as a primary different character, sync the collation
for Spanish with CLDR
[BZ #21547] - Tibetan script collation broken (Dzongkha and Tibetan)

	* localedata/Makefile: Add new test files.
	* localedata/lv_LV.UTF-8.in: Adapt test file to new collation order.
	* localedata/sv_SE.ISO-8859-1.in: Adapt test file to new collation order.
	* localedata/uk_UA.UTF-8.in: Adapt test file to new collation order.
	* localedata/am_ET.UTF-8.in: New test file.
	* localedata/az_AZ.UTF-8.in: Likewise.
	* localedata/be_BY.UTF-8.in: Likewise.
	* localedata/ber_DZ.UTF-8.in: Likewise.
	* localedata/ber_MA.UTF-8.in: Likewise.
	* localedata/bg_BG.UTF-8.in: Likewise.
	* localedata/br_FR.UTF-8.in: Likewise.
	* localedata/cmn_TW.UTF-8.in: Likewise.
	* localedata/crh_UA.UTF-8.in: Likewise.
	* localedata/csb_PL.UTF-8.in: Likewise.
	* localedata/cv_RU.UTF-8.in: Likewise.
	* localedata/cy_GB.UTF-8.in: Likewise.
	* localedata/dz_BT.UTF-8.in: Likewise.
	* localedata/eo.UTF-8.in: Likewise.
	* localedata/es_ES.UTF-8.in: Likewise.
	* localedata/fa_IR.UTF-8.in: Likewise.
	* localedata/fi_FI.UTF-8.in: Likewise.
	* localedata/fil_PH.UTF-8.in: Likewise.
	* localedata/fur_IT.UTF-8.in: Likewise.
	* localedata/gez_ER.UTF-8@abegede.in: Likewise.
	* localedata/ha_NG.UTF-8.in: Likewise.
	* localedata/ig_NG.UTF-8.in: Likewise.
	* localedata/ik_CA.UTF-8.in: Likewise.
	* localedata/kk_KZ.UTF-8.in: Likewise.
	* localedata/ku_TR.UTF-8.in: Likewise.
	* localedata/ky_KG.UTF-8.in: Likewise.
	* localedata/ln_CD.UTF-8.in: Likewise.
	* localedata/mi_NZ.UTF-8.in: Likewise.
	* localedata/ml_IN.UTF-8.in: Likewise.
	* localedata/mn_MN.UTF-8.in: Likewise.
	* localedata/mr_IN.UTF-8.in: Likewise.
	* localedata/mt_MT.UTF-8.in: Likewise.
	* localedata/nb_NO.UTF-8.in: Likewise.
	* localedata/om_KE.UTF-8.in: Likewise.
	* localedata/os_RU.UTF-8.in: Likewise.
	* localedata/ps_AF.UTF-8.in: Likewise.
	* localedata/ro_RO.UTF-8.in: Likewise.
	* localedata/ru_RU.UTF-8.in: Likewise.
	* localedata/sc_IT.UTF-8.in: Likewise.
	* localedata/se_NO.UTF-8.in: Likewise.
	* localedata/sq_AL.UTF-8.in: Likewise.
	* localedata/sv_SE.UTF-8.in: Likewise.
	* localedata/szl_PL.UTF-8.in: Likewise.
	* localedata/tg_TJ.UTF-8.in: Likewise.
	* localedata/tk_TM.UTF-8.in: Likewise.
	* localedata/tt_RU.UTF-8.in: Likewise.
	* localedata/tt_RU.UTF-8@iqtelif.in: Likewise.
	* localedata/ug_CN.UTF-8.in: Likewise.
	* localedata/uz_UZ.UTF-8.in: Likewise.
	* localedata/vi_VN.UTF-8.in: Likewise.
	* localedata/yi_US.UTF-8.in: Likewise.
	* localedata/yo_NG.UTF-8.in: Likewise.
	* localedata/zh_CN.UTF-8.in: Likewise.
	* localedata/locales/am_ET: Adapt collation rules to new iso14651_t1_common
        file and fix bugs in the collation.
	* localedata/locales/az_AZ: Likewise.
	* localedata/locales/be_BY: Likewise.
	* localedata/locales/ber_DZ: Likewise.
	* localedata/locales/ber_MA: Likewise.
	* localedata/locales/bg_BG: Likewise.
	* localedata/locales/br_FR: Likewise.
	* localedata/locales/br_FR@euro: Likewise.
	* localedata/locales/ca_ES: Likewise.
	* localedata/locales/cns11643_stroke: Likewise.
	* localedata/locales/crh_UA: Likewise.
	* localedata/locales/cs_CZ: Likewise.
	* localedata/locales/csb_PL: Likewise.
	* localedata/locales/cv_RU: Likewise.
	* localedata/locales/cy_GB: Likewise.
	* localedata/locales/da_DK: Likewise.
	* localedata/locales/dz_BT: Likewise.
	* localedata/locales/en_CA: Likewise.
	* localedata/locales/eo: Likewise.
	* localedata/locales/es_CU: Likewise.
	* localedata/locales/es_EC: Likewise.
	* localedata/locales/es_ES: Likewise.
	* localedata/locales/es_US: Likewise.
	* localedata/locales/et_EE: Likewise.
	* localedata/locales/fa_IR: Likewise.
	* localedata/locales/fi_FI: Likewise.
	* localedata/locales/fil_PH: Likewise.
	* localedata/locales/fur_IT: Likewise.
	* localedata/locales/gez_ER@abegede: Likewise.
	* localedata/locales/ha_NG: Likewise.
	* localedata/locales/hr_HR: Likewise.
	* localedata/locales/hsb_DE: Likewise.
	* localedata/locales/hu_HU: Likewise.
	* localedata/locales/ig_NG: Likewise.
	* localedata/locales/ik_CA: Likewise.
	* localedata/locales/is_IS: Likewise.
	* localedata/locales/iso14651_t1_pinyin: Likewise.
	* localedata/locales/kk_KZ: Likewise.
	* localedata/locales/ku_TR: Likewise.
	* localedata/locales/ky_KG: Likewise.
	* localedata/locales/ln_CD: Likewise.
	* localedata/locales/lt_LT: Likewise.
	* localedata/locales/lv_LV: Likewise.
	* localedata/locales/mi_NZ: Likewise.
	* localedata/locales/ml_IN: Likewise.
	* localedata/locales/mn_MN: Likewise.
	* localedata/locales/mr_IN: Likewise.
	* localedata/locales/mt_MT: Likewise.
	* localedata/locales/nb_NO: Likewise.
	* localedata/locales/om_KE: Likewise.
	* localedata/locales/os_RU: Likewise.
	* localedata/locales/pl_PL: Likewise.
	* localedata/locales/ps_AF: Likewise.
	* localedata/locales/ro_RO: Likewise.
	* localedata/locales/ru_RU: Likewise.
	* localedata/locales/ru_UA: Likewise.
	* localedata/locales/sc_IT: Likewise.
	* localedata/locales/se_NO: Likewise.
	* localedata/locales/si_LK: Likewise.
	* localedata/locales/sq_AL: Likewise.
	* localedata/locales/sv_FI: Likewise.
	* localedata/locales/sv_FI@euro: Likewise.
	* localedata/locales/sv_SE: Likewise.
	* localedata/locales/szl_PL: Likewise.
	* localedata/locales/tg_TJ: Likewise.
	* localedata/locales/ti_ER: Likewise.
	* localedata/locales/tk_TM: Likewise.
	* localedata/locales/tl_PH: Likewise.
	* localedata/locales/tr_TR: Likewise.
	* localedata/locales/tt_RU: Likewise.
	* localedata/locales/tt_RU@iqtelif: Likewise.
	* localedata/locales/ug_CN: Likewise.
	* localedata/locales/uk_UA: Likewise.
	* localedata/locales/uz_UZ: Likewise.
	* localedata/locales/uz_UZ@cyrillic: Likewise.
	* localedata/locales/vi_VN: Likewise.
	* localedata/locales/yi_US: Likewise.
	* localedata/locales/yo_NG: Likewise.
Diffstat (limited to 'localedata/locales/tg_TJ')
-rw-r--r--localedata/locales/tg_TJ106
1 files changed, 51 insertions, 55 deletions
diff --git a/localedata/locales/tg_TJ b/localedata/locales/tg_TJ
index a1ba45adbf..35dfca4574 100644
--- a/localedata/locales/tg_TJ
+++ b/localedata/locales/tg_TJ
@@ -61,65 +61,61 @@ END LC_CTYPE
 
 LC_COLLATE
 
+% There is no collation information for Tadjik in CLDR.
+%
 % Tadjik cyrillic alphabet is:
-% <U0430>, <U0431>, <U0432>, <U0433>, <U0493> (cyr ghe with stroke), <U0434>, <U0435>,
-% <U0451>, <U0436>, <U0437>, <U0438>, <U04E3> (cyr i with macron), <U0439>, <U043A>,
-% <U049B> (cyr k with descender), <U043B>, <U043C>, <U043D>, <U043E>, <U043F>, <U0440>,
-% <U0441>, <U0442>, <U0443>, <U04EF> (cyr u with macron), <U0444>, <U0445>,
-% <U04B3> (cyr ha with descender), <U0447>, <U04B7> (cyr che with descender),
-% <U0448>, <U044A> (cyr hard sign), <U044D>, <U044E>, <U044F>
+% а, б, в, г, ғ (cyr ghe with stroke), д, е,
+% ё, ж, з, и, ӣ (cyr i with macron), й, к,
+% қ (cyr k with descender), л, м, н, о, п, р,
+% с, т, у, ӯ (cyr u with macron), ф, х,
+% ҳ (cyr ha with descender), ч, ҷ (cyr che with descender),
+% ш, ъ (cyr hard sign), э, ю, я
+%
+% https://en.wikipedia.org/wiki/Tajik_alphabet#Cyrillic
+%
+% А а  Б б  В в  Г г  Ғ ғ  Д д  Е е  Ё ё  Ж ж  З з  И и  Ӣ ӣ
+% Й й  К к  Қ қ  Л л  М м  Н н  О о  П п  Р р  С с  Т т  У у
+% Ӯ ӯ  Ф ф  Х х  Ҳ ҳ  Ч ч  Ҷ ҷ  Ш ш  Ъ ъ  Э э  Ю ю  Я я
 
 copy "iso14651_t1"
 
-collating-symbol <g-=>
-collating-symbol <i-=>
-collating-symbol <k,=>
-collating-symbol <u-=>
-collating-symbol <h,=>
-collating-symbol <c%,=>
-
-reorder-after <CYR-GHE>
-<g-=>
-reorder-after <CYR-I>
-<i-=>
-reorder-after <CYR-KA>
-<k,=>
-reorder-after <CYR-OU>
-<u-=>
-reorder-after <CYR-HA>
-<h,=>
-reorder-after <CYR-CHE>
-<c%,=>
-
-reorder-after <U0433>
-<U0493> <g-=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0413>
-<U0492> <g-=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0438>
-<U04E3> <i-=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0418>
-<U04E2> <i-=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U043A>
-<U049B> <k,=>;<PCL>;<MIN>;IGNORE
-reorder-after <U041A>
-<U049A> <k,=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0443>
-<U04EF> <u-=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0423>
-<U04EE> <u-=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0445>
-<U04B3> <h,=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0425>
-<U04B2> <h,=>;<PCL>;<CAP>;IGNORE
-
-reorder-after <U0447>
-<U04B7> <c%,=>;<PCL>;<MIN>;IGNORE
-reorder-after <U0427>
-<U04B6> <c%,=>;<PCL>;<CAP>;IGNORE
+collating-symbol <ghe-with-stroke>
+collating-symbol <io>
+collating-symbol <i-with-macron>
+collating-symbol <k-descender>
+collating-symbol <u-macron>
+collating-symbol <ha-descender>
+collating-symbol <che-descender>
+
+reorder-after <S0433> % CYRILLIC SMALL LETTER GHE
+<ghe-with-stroke>
+reorder-after <S0435> % CYRILLIC SMALL LETTER IE
+<io>
+reorder-after <S0438> % CYRILLIC SMALL LETTER I
+<i-with-macron>
+reorder-after <S043A> % CYRILLIC SMALL LETTER KA
+<k-descender>
+reorder-after <S0443> % CYRILLIC SMALL LETTER U
+<u-macron>
+reorder-after <S0445> % CYRILLIC SMALL LETTER HA
+<ha-descender>
+reorder-after <S0447> % CYRILLIC SMALL LETTER CHE
+<che-descender>
+
+<U0493>   <ghe-with-stroke>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ғ
+<U0492>   <ghe-with-stroke>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ғ
+<U0451>                <io>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ё
+<U0401>                <io>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ё
+<U04E3>     <i-with-macron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ӣ
+<U04E2>     <i-with-macron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ӣ
+<U049B>       <k-descender>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % қ
+<U049A>       <k-descender>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Қ
+<U04EF>          <u-macron>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ӯ
+<U04EE>          <u-macron>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ӯ
+<U04B3>      <ha-descender>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ҳ
+<U04B2>      <ha-descender>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ҳ
+<U04B7>     <che-descender>;"<BASE><BASE>";"<MIN><MIN>";IGNORE % ҷ
+<U04B6>     <che-descender>;"<BASE><BASE>";"<CAP><MIN>";IGNORE % Ҷ
 
 reorder-end