From 032c510db06cee5ee2b254611c44b3744660417a Mon Sep 17 00:00:00 2001 From: Pravin Satpute Date: Wed, 15 Jul 2015 16:06:17 +0530 Subject: Correcting language code for Bhili and Tulu locales (bug 17475) Bhili [1] and Tulu [2] language does not have iso-639-1 codes. Patch moves locale file with correct code and also fix iso-639.def. 1. http://www-01.sil.org/iso639-3/documentation.asp?id=bhb 2. http://www-01.sil.org/iso639-3/documentation.asp?id=tcy localedata/ChangeLog: 2015-07-02 Pravin Satpute [BZ #17475] * locales/tu_IN: renamed to tcy_IN * locales/bh_IN: renamed to bhb_IN Changelog: 2015-03-05 Pravin Satpute [BZ #17475] * locale/iso-639.def: Update Bhili and Tulu language codes as per iso639-3. --- ChangeLog | 6 ++ NEWS | 30 +++---- locale/iso-639.def | 4 +- localedata/ChangeLog | 6 ++ localedata/locales/bh_IN | 179 ------------------------------------------ localedata/locales/bhb_IN | 179 ++++++++++++++++++++++++++++++++++++++++++ localedata/locales/tcy_IN | 195 ++++++++++++++++++++++++++++++++++++++++++++++ localedata/locales/tu_IN | 195 ---------------------------------------------- 8 files changed, 403 insertions(+), 391 deletions(-) delete mode 100644 localedata/locales/bh_IN create mode 100644 localedata/locales/bhb_IN create mode 100644 localedata/locales/tcy_IN delete mode 100644 localedata/locales/tu_IN diff --git a/ChangeLog b/ChangeLog index 3d07c118b4..ffeb4d387f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-07-15 Pravin Satpute + + [BZ #17475] + * locale/iso-639.def: Update Bhili and Tulu language codes as + per iso639-3. + 2015-07-15 Arjun Shankar * elf/tst-leaks1.c (main): Converted to ... diff --git a/NEWS b/NEWS index 2cfc43e16a..13e324e713 100644 --- a/NEWS +++ b/NEWS @@ -13,21 +13,21 @@ Version 2.22 14292, 14841, 14906, 14958, 15319, 15467, 15790, 15969, 16159, 16339, 16350, 16351, 16352, 16353, 16361, 16512, 16526, 16538, 16559, 16560, 16704, 16783, 16850, 17053, 17090, 17195, 17269, 17293, 17322, 17403, - 17523, 17542, 17569, 17581, 17588, 17596, 17620, 17621, 17628, 17631, - 17692, 17711, 17715, 17776, 17779, 17792, 17833, 17836, 17841, 17912, - 17916, 17930, 17932, 17944, 17949, 17964, 17965, 17967, 17969, 17977, - 17978, 17987, 17991, 17996, 17998, 17999, 18007, 18019, 18020, 18029, - 18030, 18032, 18034, 18036, 18038, 18039, 18042, 18043, 18046, 18047, - 18049, 18068, 18080, 18093, 18100, 18104, 18110, 18111, 18116, 18125, - 18128, 18138, 18185, 18196, 18197, 18206, 18210, 18211, 18217, 18219, - 18220, 18221, 18234, 18244, 18245, 18247, 18287, 18319, 18324, 18333, - 18346, 18371, 18383, 18397, 18400, 18409, 18410, 18412, 18134, 18418, - 18422, 18434, 18444, 18468, 18469, 18470, 18479, 18483, 18495, 18496, - 18497, 18498, 18502, 18507, 18508, 18512, 18513, 18519, 18520, 18522, - 18527, 18528, 18529, 18530, 18532, 18533, 18534, 18536, 18539, 18540, - 18542, 18544, 18545, 18546, 18547, 18549, 18553, 18557, 18558, 18569, - 18583, 18585, 18586, 18592, 18593, 18594, 18602, 18612, 18613, 18619, - 18633, 18641, 18643, 18648. + 17475, 17523, 17542, 17569, 17581, 17588, 17596, 17620, 17621, 17628, + 17631, 17692, 17711, 17715, 17776, 17779, 17792, 17833, 17836, 17841, + 17912, 17916, 17930, 17932, 17944, 17949, 17964, 17965, 17967, 17969, + 17977, 17978, 17987, 17991, 17996, 17998, 17999, 18007, 18019, 18020, + 18029, 18030, 18032, 18034, 18036, 18038, 18039, 18042, 18043, 18046, + 18047, 18049, 18068, 18080, 18093, 18100, 18104, 18110, 18111, 18116, + 18125, 18128, 18138, 18185, 18196, 18197, 18206, 18210, 18211, 18217, + 18219, 18220, 18221, 18234, 18244, 18245, 18247, 18287, 18319, 18324, + 18333, 18346, 18371, 18383, 18397, 18400, 18409, 18410, 18412, 18134, + 18418, 18422, 18434, 18444, 18468, 18469, 18470, 18479, 18483, 18495, + 18496, 18497, 18498, 18502, 18507, 18508, 18512, 18513, 18519, 18520, + 18522, 18527, 18528, 18529, 18530, 18532, 18533, 18534, 18536, 18539, + 18540, 18542, 18544, 18545, 18546, 18547, 18549, 18553, 18557, 18558, + 18569, 18583, 18585, 18586, 18592, 18593, 18594, 18602, 18612, 18613, + 18619, 18633, 18641, 18643, 18648. * Cache information can be queried via sysconf() function on s390 e.g. with _SC_LEVEL1_ICACHE_SIZE as argument. diff --git a/locale/iso-639.def b/locale/iso-639.def index 2529425a96..4bea116180 100644 --- a/locale/iso-639.def +++ b/locale/iso-639.def @@ -65,7 +65,7 @@ DEFINE_LANGUAGE_CODE ("Belarusian", be, bel, bel) DEFINE_LANGUAGE_CODE3 ("Bemba", bem, bem) DEFINE_LANGUAGE_CODE ("Bengali", bn, ben, ben) DEFINE_LANGUAGE_CODE3 ("Berber (Other)", ber, ber) -DEFINE_LANGUAGE_CODE ("Bhili", bh, bhb, bhb) +DEFINE_LANGUAGE_CODE3 ("Bhili", bhb, bhb) DEFINE_LANGUAGE_CODE3 ("Bhojpuri", bho, bho) DEFINE_LANGUAGE_CODE ("Bihari", bh, bih, bih) DEFINE_LANGUAGE_CODE3 ("Bikol", bik, bik) @@ -475,7 +475,7 @@ DEFINE_LANGUAGE_CODE ("Tonga (Tonga Islands)", to, ton, ton) DEFINE_LANGUAGE_CODE3 ("Tsimshian", tsi, tsi) DEFINE_LANGUAGE_CODE ("Tsonga", ts, tso, tso) DEFINE_LANGUAGE_CODE ("Tswana", tn, tsn, tsn) -DEFINE_LANGUAGE_CODE ("Tulu", tu, tcy, tcy) +DEFINE_LANGUAGE_CODE3 ("Tulu", tcy, tcy) DEFINE_LANGUAGE_CODE3 ("Tumbuka", tum, tum) DEFINE_LANGUAGE_CODE3 ("Tupi languages", tup, tup) DEFINE_LANGUAGE_CODE3 ("Turkish, Ottoman (1500-1928)", ota, ota) diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 1f2577de3e..8a10346b08 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,9 @@ +2015-07-15 Pravin Satpute + + [BZ #17475] + * locales/tu_IN: renamed to tcy_IN + * locales/bh_IN: renamed to bhb_IN + 2015-05-16 Carlos O'Donell * Makefile (INSTALL-SUPPORTED-LOCALES): Fail if localedef fails. diff --git a/localedata/locales/bh_IN b/localedata/locales/bh_IN deleted file mode 100644 index a345637964..0000000000 --- a/localedata/locales/bh_IN +++ /dev/null @@ -1,179 +0,0 @@ -comment_char % -escape_char / -% Bhili(devanagari) language locale for India. -% Contributed by Alexey Merzliakov - -LC_IDENTIFICATION -title "Bhili(devanagari) language locale for India" -source "Samsung Electronics Co., Ltd." -address "" -contact "" -email "alexey.merzlyakov@samsung.com" -tel "" -fax "" -language "Bhili" -territory "India" -revision "0.1" -date "2014-09-30" -% -category "bh_IN:2014";LC_IDENTIFICATION -category "bh_IN:2014";LC_CTYPE -category "bh_IN:2014";LC_COLLATE -category "bh_IN:2014";LC_TIME -category "bh_IN:2014";LC_NUMERIC -category "bh_IN:2014";LC_MONETARY -category "bh_IN:2014";LC_MESSAGES -category "bh_IN:2014";LC_PAPER -category "bh_IN:2014";LC_NAME -category "bh_IN:2014";LC_ADDRESS -category "bh_IN:2014";LC_TELEPHONE -category "bh_IN:2014";LC_MEASUREMENT - -END LC_IDENTIFICATION - -LC_CTYPE -copy "ks_IN" -END LC_CTYPE - -LC_COLLATE -copy "iso14651_t1" -END LC_COLLATE - -LC_MONETARY -copy "ks_IN" -END LC_MONETARY - - -LC_NUMERIC -copy "hi_IN" -END LC_NUMERIC - - -LC_TIME -% This is the POSIX Locale definition for the LC_TIME category. -% These are generated based on XML base Locale definition file -% for IBM Class for Unicode/Java -% -% Abbreviated weekday names (%a) -abday "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -% -% Full weekday names (%A) -day "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -% -% Abbreviated month names (%b) -abmon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -% -% Full month names (%B) -mon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -% -% Equivalent of AM PM -am_pm "";/ - "" -% -% Appropriate date and time representation -% %A %d %b %Y%I:%M:%S %Z -d_t_fmt "/ -/ -" -% -% Appropriate date representation -% %A %d %b %Y -d_fmt "/ -" -% -% Appropriate time representation -% %I:%M:%S %Z -t_fmt "/ -" -% -% Appropriate 12 h time representation (%r) -t_fmt_ampm "/ -" -% -date_fmt "/ -/ -" -% -END LC_TIME - - -LC_MESSAGES -yesexpr "" -noexpr "" -END LC_MESSAGES - - -LC_PAPER -copy "hi_IN" -END LC_PAPER - - -LC_NAME -name_fmt "/ -" -name_gen "" -name_mr "" -name_mrs "" -name_miss "" -name_ms "" - -END LC_NAME - - -LC_ADDRESS -% This is the ISO_IEC TR14652 Locale definition for the LC_ADDRESS category -% generated by IBM Basic CountryPack Transformer. -postal_fmt "" -country_ab2 "" -country_ab3 "" -country_car "" -country_num 356 -lang_name "" -lang_ab "" -lang_term "" -lang_lib "" -END LC_ADDRESS - - -LC_TELEPHONE -copy "hi_IN" -END LC_TELEPHONE - - -LC_MEASUREMENT -copy "hi_IN" -END LC_MEASUREMENT diff --git a/localedata/locales/bhb_IN b/localedata/locales/bhb_IN new file mode 100644 index 0000000000..8521257bfc --- /dev/null +++ b/localedata/locales/bhb_IN @@ -0,0 +1,179 @@ +comment_char % +escape_char / +% Bhili(devanagari) language locale for India. +% Contributed by Alexey Merzliakov + +LC_IDENTIFICATION +title "Bhili(devanagari) language locale for India" +source "Samsung Electronics Co., Ltd." +address "" +contact "" +email "alexey.merzlyakov@samsung.com" +tel "" +fax "" +language "Bhili" +territory "India" +revision "0.1" +date "2014-09-30" +% +category "bhb_IN:2014";LC_IDENTIFICATION +category "bhb_IN:2014";LC_CTYPE +category "bhb_IN:2014";LC_COLLATE +category "bhb_IN:2014";LC_TIME +category "bhb_IN:2014";LC_NUMERIC +category "bhb_IN:2014";LC_MONETARY +category "bhb_IN:2014";LC_MESSAGES +category "bhb_IN:2014";LC_PAPER +category "bhb_IN:2014";LC_NAME +category "bhb_IN:2014";LC_ADDRESS +category "bhb_IN:2014";LC_TELEPHONE +category "bhb_IN:2014";LC_MEASUREMENT + +END LC_IDENTIFICATION + +LC_CTYPE +copy "ks_IN" +END LC_CTYPE + +LC_COLLATE +copy "iso14651_t1" +END LC_COLLATE + +LC_MONETARY +copy "ks_IN" +END LC_MONETARY + + +LC_NUMERIC +copy "hi_IN" +END LC_NUMERIC + + +LC_TIME +% This is the POSIX Locale definition for the LC_TIME category. +% These are generated based on XML base Locale definition file +% for IBM Class for Unicode/Java +% +% Abbreviated weekday names (%a) +abday "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +% +% Full weekday names (%A) +day "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +% +% Abbreviated month names (%b) +abmon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +% +% Full month names (%B) +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +% +% Equivalent of AM PM +am_pm "";/ + "" +% +% Appropriate date and time representation +% %A %d %b %Y%I:%M:%S %Z +d_t_fmt "/ +/ +" +% +% Appropriate date representation +% %A %d %b %Y +d_fmt "/ +" +% +% Appropriate time representation +% %I:%M:%S %Z +t_fmt "/ +" +% +% Appropriate 12 h time representation (%r) +t_fmt_ampm "/ +" +% +date_fmt "/ +/ +" +% +END LC_TIME + + +LC_MESSAGES +yesexpr "" +noexpr "" +END LC_MESSAGES + + +LC_PAPER +copy "hi_IN" +END LC_PAPER + + +LC_NAME +name_fmt "/ +" +name_gen "" +name_mr "" +name_mrs "" +name_miss "" +name_ms "" + +END LC_NAME + + +LC_ADDRESS +% This is the ISO_IEC TR14652 Locale definition for the LC_ADDRESS category +% generated by IBM Basic CountryPack Transformer. +postal_fmt "" +country_ab2 "" +country_ab3 "" +country_car "" +country_num 356 +lang_name "" +lang_ab "" +lang_term "" +lang_lib "" +END LC_ADDRESS + + +LC_TELEPHONE +copy "hi_IN" +END LC_TELEPHONE + + +LC_MEASUREMENT +copy "hi_IN" +END LC_MEASUREMENT diff --git a/localedata/locales/tcy_IN b/localedata/locales/tcy_IN new file mode 100644 index 0000000000..3fc1e1a94a --- /dev/null +++ b/localedata/locales/tcy_IN @@ -0,0 +1,195 @@ +comment_char % +escape_char / +% Tulu (kannada) language locale for India. + +% *** Below just modify to suit your language. I have modified for Kannada +% *** other language codes - Gujarati - gu, Punjabi - pa, Oriya - or + +LC_IDENTIFICATION +title "Tulu language locale for India" +source "IndLinux.org, Samsung Electronics Co., Ltd." +address "" +contact "" +email "alexey.merzlyakov@samsung.com" +tel "" +fax "" +language "Tulu" +territory "India" +revision "0.1" +date "2014-09-30" +% +category "tcy_IN:2014";LC_IDENTIFICATION +category "tcy_IN:2014";LC_CTYPE +category "tcy_IN:2014";LC_COLLATE +category "tcy_IN:2014";LC_TIME +category "tcy_IN:2014";LC_NUMERIC +category "tcy_IN:2014";LC_MONETARY +category "tcy_IN:2014";LC_MESSAGES +category "tcy_IN:2014";LC_PAPER +category "tcy_IN:2014";LC_NAME +category "tcy_IN:2014";LC_ADDRESS +category "tcy_IN:2014";LC_TELEPHONE +category "tcy_IN:2014";LC_MEASUREMENT + +END LC_IDENTIFICATION + +LC_CTYPE +copy "kn_IN" +END LC_CTYPE + +LC_COLLATE + +% Copy the template from ISO/IEC 14651 +copy "iso14651_t1" + +END LC_COLLATE + +LC_MONETARY +copy "kn_IN" +END LC_MONETARY + + +LC_NUMERIC +copy "hi_IN" +END LC_NUMERIC + + +% *** Modify them for Kannada - eg write down on paper - see what all unicode +% *** characters are needed, look up their codes & put them here - Kannada + +LC_TIME +% This is the POSIX Locale definition for the LC_TIME category. +% These are generated based on XML base Locale definition file +% for IBM Class for Unicode/Java +% +% Abbreviated weekday names (%a) +abday "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +% +% Full weekday names (%A) +day "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +% +% Abbreviated month names (%b) +abmon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +% +% Full month names (%B) +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +% +% Equivalent of AM PM +am_pm "";/ + "" + +% *** There arent any Devanagari characters below, so for time being +% *** maintain same for Kannada also, Karunakar + +% +% Appropriate date and time representation +% %A %d %b %Y%I:%M:%S %Z +d_t_fmt "/ +/ +" +% +% Appropriate date representation +% %A %d %b %Y +d_fmt "/ +" +% +% Appropriate time representation +% %I:%M:%S %Z +t_fmt "/ +" +% +% Appropriate 12 h time representation (%r) +t_fmt_ampm "/ +" +% +date_fmt "/ +/ +" +END LC_TIME + + +LC_MESSAGES +yesexpr "" +noexpr "" +END LC_MESSAGES + + +LC_PAPER +copy "hi_IN" +END LC_PAPER + + +LC_NAME +% This is the ISO_IEC TR14652 Locale definition for the +% LC_NAME category. +% +name_fmt "/ +" +name_gen "" +name_mr "" +name_mrs "" +name_miss "" +name_ms "" + +END LC_NAME + + +LC_ADDRESS +% This is the ISO_IEC TR14652 Locale definition for the +% LC_ADDRESS +postal_fmt "/ +" + +country_ab2 "" +country_ab3 "" +country_car "" +country_num 356 +lang_name "" +lang_ab "" +lang_term "" +lang_lib "" +END LC_ADDRESS + + +LC_TELEPHONE +copy "hi_IN" +END LC_TELEPHONE + + +LC_MEASUREMENT +copy "hi_IN" +END LC_MEASUREMENT diff --git a/localedata/locales/tu_IN b/localedata/locales/tu_IN deleted file mode 100644 index 0201bbd0ab..0000000000 --- a/localedata/locales/tu_IN +++ /dev/null @@ -1,195 +0,0 @@ -comment_char % -escape_char / -% Tulu (kannada) language locale for India. - -% *** Below just modify to suit your language. I have modified for Kannada -% *** other language codes - Gujarati - gu, Punjabi - pa, Oriya - or - -LC_IDENTIFICATION -title "Tulu language locale for India" -source "IndLinux.org, Samsung Electronics Co., Ltd." -address "" -contact "" -email "alexey.merzlyakov@samsung.com" -tel "" -fax "" -language "Tulu" -territory "India" -revision "0.1" -date "2014-09-30" -% -category "tu_IN:2014";LC_IDENTIFICATION -category "tu_IN:2014";LC_CTYPE -category "tu_IN:2014";LC_COLLATE -category "tu_IN:2014";LC_TIME -category "tu_IN:2014";LC_NUMERIC -category "tu_IN:2014";LC_MONETARY -category "tu_IN:2014";LC_MESSAGES -category "tu_IN:2014";LC_PAPER -category "tu_IN:2014";LC_NAME -category "tu_IN:2014";LC_ADDRESS -category "tu_IN:2014";LC_TELEPHONE -category "tu_IN:2014";LC_MEASUREMENT - -END LC_IDENTIFICATION - -LC_CTYPE -copy "kn_IN" -END LC_CTYPE - -LC_COLLATE - -% Copy the template from ISO/IEC 14651 -copy "iso14651_t1" - -END LC_COLLATE - -LC_MONETARY -copy "kn_IN" -END LC_MONETARY - - -LC_NUMERIC -copy "hi_IN" -END LC_NUMERIC - - -% *** Modify them for Kannada - eg write down on paper - see what all unicode -% *** characters are needed, look up their codes & put them here - Kannada - -LC_TIME -% This is the POSIX Locale definition for the LC_TIME category. -% These are generated based on XML base Locale definition file -% for IBM Class for Unicode/Java -% -% Abbreviated weekday names (%a) -abday "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -% -% Full weekday names (%A) -day "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -% -% Abbreviated month names (%b) -abmon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -% -% Full month names (%B) -mon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -% -% Equivalent of AM PM -am_pm "";/ - "" - -% *** There arent any Devanagari characters below, so for time being -% *** maintain same for Kannada also, Karunakar - -% -% Appropriate date and time representation -% %A %d %b %Y%I:%M:%S %Z -d_t_fmt "/ -/ -" -% -% Appropriate date representation -% %A %d %b %Y -d_fmt "/ -" -% -% Appropriate time representation -% %I:%M:%S %Z -t_fmt "/ -" -% -% Appropriate 12 h time representation (%r) -t_fmt_ampm "/ -" -% -date_fmt "/ -/ -" -END LC_TIME - - -LC_MESSAGES -yesexpr "" -noexpr "" -END LC_MESSAGES - - -LC_PAPER -copy "hi_IN" -END LC_PAPER - - -LC_NAME -% This is the ISO_IEC TR14652 Locale definition for the -% LC_NAME category. -% -name_fmt "/ -" -name_gen "" -name_mr "" -name_mrs "" -name_miss "" -name_ms "" - -END LC_NAME - - -LC_ADDRESS -% This is the ISO_IEC TR14652 Locale definition for the -% LC_ADDRESS -postal_fmt "/ -" - -country_ab2 "" -country_ab3 "" -country_car "" -country_num 356 -lang_name "" -lang_ab "" -lang_term "" -lang_lib "" -END LC_ADDRESS - - -LC_TELEPHONE -copy "hi_IN" -END LC_TELEPHONE - - -LC_MEASUREMENT -copy "hi_IN" -END LC_MEASUREMENT -- cgit v1.2.3