diff options
author | Mike FABIAN <mfabian@redhat.com> | 2017-11-30 15:57:25 +0100 |
---|---|---|
committer | Mike FABIAN <mfabian@redhat.com> | 2017-11-30 16:03:22 +0100 |
commit | fbb5fd03d3189c626a002029e599d7e44e623c1e (patch) | |
tree | 1b1b76807f1417aef7d0d122d38201295e529c6b /localedata/locales | |
parent | 5e56e937c9144e70a16793d2c5aa22d1bd0b2c18 (diff) | |
download | glibc-fbb5fd03d3189c626a002029e599d7e44e623c1e.tar.gz glibc-fbb5fd03d3189c626a002029e599d7e44e623c1e.tar.xz glibc-fbb5fd03d3189c626a002029e599d7e44e623c1e.zip |
sr_RS and bs_BA locales: make collation rules the same as for hr_HR [BZ #22534]
According to CLDR, collation rules for Serbian and Bosnian should be the same as for Croatian. [BZ #22534] * localedata/Makefile: Add sr_RS.UTF-8 and bs_BA.UTF-8 to test-input and to the list of locales to be built for testing. * localedata/bs_BA.UTF-8.in: New file (same as hr_HR.UTF-8.in). * localedata/sr_RS.UTF-8.in: New file (same as hr_HR.UTF-8.in). * localedata/locales/bs_BA (LC_COLLATE): Use “copy "hr_HR"”. * localedata/locales/sr_RS (LC_COLLATE): Use “copy "hr_HR"”.
Diffstat (limited to 'localedata/locales')
-rw-r--r-- | localedata/locales/bs_BA | 100 | ||||
-rw-r--r-- | localedata/locales/sr_RS | 116 |
2 files changed, 23 insertions, 193 deletions
diff --git a/localedata/locales/bs_BA b/localedata/locales/bs_BA index b9399c6f27..3b18056881 100644 --- a/localedata/locales/bs_BA +++ b/localedata/locales/bs_BA @@ -49,97 +49,15 @@ category "i18n:2012";LC_MESSAGES END LC_IDENTIFICATION LC_COLLATE -copy "iso14651_t1" - -% a b c c' c< d dz< d// e f g h i j k l lj m n nj o p -% q r s s< t u v w x y z z< - -collating-symbol <d-z-sh> -collating-element <D-Z<> from "<U0044><U017D>" -collating-element <D-z<> from "<U0044><U017E>" -collating-element <d-Z<> from "<U0064><U017D>" -collating-element <d-z<> from "<U0064><U017E>" -collating-symbol <l-j-sh> -collating-element <L-J> from "<U004C><U004A>" -collating-element <L-j> from "<U004C><U006A>" -collating-element <l-J> from "<U006C><U004A>" -collating-element <l-j> from "<U006C><U006A>" -collating-symbol <n-j-sh> -collating-element <N-J> from "<U004E><U004A>" -collating-element <N-j> from "<U004E><U006A>" -collating-element <n-J> from "<U006E><U004A>" -collating-element <n-j> from "<U006E><U006A>" -collating-symbol <cacute> -collating-symbol <ccaron> -collating-symbol <d//> -collating-symbol <scaron> -collating-symbol <zcaron> - -collating-symbol <CAP-MIN> -collating-symbol <MIN-CAP> - -reorder-after <MIN> -<MIN-CAP> -reorder-after <CAP> -<CAP-MIN> - -reorder-after <c> -<cacute> -<ccaron> -<d> -<d-z-sh> -<d//> -reorder-after <l> -<l-j-sh> -reorder-after <n> -<n-j-sh> -reorder-after <s> -<scaron> -reorder-after <z> -<zcaron> - -reorder-after <U0063> -<U0107> <cacute>;<PCT>;<MIN>;IGNORE -<U010D> <ccaron>;<PCT>;<MIN>;IGNORE -reorder-after <U0043> -<U0106> <cacute>;<PCT>;<CAP>;IGNORE -<U010C> <ccaron>;<PCT>;<CAP>;IGNORE - -reorder-after <U0064> -<d-z<> <d-z-sh>;<PCT>;<MIN>;IGNORE -<d-Z<> <d-z-sh>;<PCT>;<MIN-CAP>;IGNORE -<U0111> <d//>;<PCT>;<MIN>;IGNORE -reorder-after <U0044> -<D-Z<> <d-z-sh>;<PCT>;<CAP>;IGNORE -<D-z<> <d-z-sh>;<PCT>;<CAP-MIN>;IGNORE -<U0110> <d//>;<PCT>;<CAP>;IGNORE - -reorder-after <U006C> -<l-j> <l-j-sh>;<PCT>;<MIN>;IGNORE -<l-J> <l-j-sh>;<PCT>;<MIN-CAP>;IGNORE -reorder-after <U004C> -<L-J> <l-j-sh>;<PCT>;<CAP>;IGNORE -<L-j> <l-j-sh>;<PCT>;<CAP-MIN>;IGNORE - -reorder-after <U006E> -<n-j> <n-j-sh>;<PCT>;<MIN>;IGNORE -<n-J> <n-j-sh>;<PCT>;<MIN-CAP>;IGNORE -reorder-after <U004E> -<N-J> <n-j-sh>;<PCT>;<CAP>;IGNORE -<N-j> <n-j-sh>;<PCT>;<CAP-MIN>;IGNORE - -reorder-after <U0073> -<U0161> <scaron>;<PCT>;<MIN>;IGNORE -reorder-after <U0053> -<U0160> <scaron>;<PCT>;<CAP>;IGNORE - -reorder-after <U007A> -<U017E> <zcaron>;<PCT>;<MIN>;IGNORE -reorder-after <U005A> -<U017D> <zcaron>;<PCT>;<CAP>;IGNORE - -reorder-end - +% According to CLDR, collation rules +% for Bosnian are the same as for Croatian, see: +% +% https://unicode.org/cldr/trac/browser/trunk/common/collation/bs.xml +% +% it contains only +% +% “[import hr]” +copy "hr_HR" END LC_COLLATE LC_CTYPE diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS index da31de75e2..eeddac8636 100644 --- a/localedata/locales/sr_RS +++ b/localedata/locales/sr_RS @@ -131,108 +131,20 @@ END LC_CTYPE LC_COLLATE - -copy "iso14651_t1" - -collating-element <D-Z<> from "<U0044><U017D>" -collating-element <D-z<> from "<U0044><U017E>" -collating-element <d-Z<> from "<U0064><U017D>" -collating-element <d-z<> from "<U0064><U017E>" - -collating-element <L-J> from "<U004C><U004A>" -collating-element <L-j> from "<U004C><U006A>" -collating-element <l-J> from "<U006C><U004A>" -collating-element <l-j> from "<U006C><U006A>" - -collating-element <N-J> from "<U004E><U004A>" -collating-element <N-j> from "<U004E><U006A>" -collating-element <n-J> from "<U006E><U004A>" -collating-element <n-j> from "<U006E><U006A>" - -collating-symbol <d-z-sh> -collating-symbol <l-j-sh> -collating-symbol <n-j-sh> - -collating-symbol <cacute> -collating-symbol <ccaron> -collating-symbol <d//> -collating-symbol <scaron> -collating-symbol <zcaron> - -collating-symbol <CAP-MIN> -collating-symbol <MIN-CAP> - -reorder-after <MIN> -<MIN-CAP> -reorder-after <CAP> -<CAP-MIN> - -reorder-after <c> -<cacute> -<ccaron> -<d> -<d-z-sh> -<d//> -reorder-after <l> -<l-j-sh> -reorder-after <n> -<n-j-sh> -reorder-after <s> -<scaron> -reorder-after <z> -<zcaron> - -reorder-after <U0063> -<U0107> <cacute>;<PCT>;<MIN>;IGNORE -<U010D> <ccaron>;<PCT>;<MIN>;IGNORE -reorder-after <U0043> -<U0106> <cacute>;<PCT>;<CAP>;IGNORE -<U010C> <ccaron>;<PCT>;<CAP>;IGNORE - -reorder-after <U0064> -<d-z<> <d-z-sh>;<PCT>;<MIN>;IGNORE -<U01C6> <d-z-sh>;<PCT>;<MIN>;IGNORE -<d-Z<> <d-z-sh>;<PCT>;<MIN-CAP>;IGNORE -<U0111> <d//>;<PCT>;<MIN>;IGNORE -reorder-after <U0044> -<D-Z<> <d-z-sh>;<PCT>;<CAP>;IGNORE -<U01C4> <d-z-sh>;<PCT>;<CAP>;IGNORE -<D-z<> <d-z-sh>;<PCT>;<CAP-MIN>;IGNORE -<U01C5> <d-z-sh>;<PCT>;<CAP-MIN>;IGNORE -<U0110> <d//>;<PCT>;<CAP>;IGNORE - -reorder-after <U006C> -<l-j> <l-j-sh>;<PCT>;<MIN>;IGNORE -<U01C9> <l-j-sh>;<PCT>;<MIN>;IGNORE -<l-J> <l-j-sh>;<PCT>;<MIN-CAP>;IGNORE -reorder-after <U004C> -<L-J> <l-j-sh>;<PCT>;<CAP>;IGNORE -<U01C7> <l-j-sh>;<PCT>;<CAP>;IGNORE -<L-j> <l-j-sh>;<PCT>;<CAP-MIN>;IGNORE -<U01C8> <l-j-sh>;<PCT>;<CAP-MIN>;IGNORE - -reorder-after <U006E> -<n-j> <n-j-sh>;<PCT>;<MIN>;IGNORE -<U01CC> <n-j-sh>;<PCT>;<MIN>;IGNORE -<n-J> <n-j-sh>;<PCT>;<MIN-CAP>;IGNORE -reorder-after <U004E> -<N-J> <n-j-sh>;<PCT>;<CAP>;IGNORE -<U01CA> <n-j-sh>;<PCT>;<CAP>;IGNORE -<N-j> <n-j-sh>;<PCT>;<CAP-MIN>;IGNORE -<U01CB> <n-j-sh>;<PCT>;<CAP-MIN>;IGNORE - -reorder-after <U0073> -<U0161> <scaron>;<PCT>;<MIN>;IGNORE -reorder-after <U0053> -<U0160> <scaron>;<PCT>;<CAP>;IGNORE - -reorder-after <U007A> -<U017E> <zcaron>;<PCT>;<MIN>;IGNORE -reorder-after <U005A> -<U017D> <zcaron>;<PCT>;<CAP>;IGNORE - -reorder-end - +% According to CLDR, collation rules +% for Bosnian are the same as for Serbian, see: +% +% https://unicode.org/cldr/trac/browser/trunk/common/collation/sr_Latn.xml +% +% it contains only +% +% “[import hr]” +% +% and the cyrillic version of the Serbian locale has no special collation +% rules at all in CLDR: +% +% https://unicode.org/cldr/trac/browser/trunk/common/collation/sr.xml +copy "hr_HR" END LC_COLLATE LC_MONETARY |