From 617ee610bd00598c0c7d232029ea93fd99cd7ce3 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 12 Jul 2007 14:54:28 +0000 Subject: 2007-02-16 Ulrich Drepper * locale/iso-3166.def: Add entry for Serbia. * locale/iso-4217.def: Define RSD. 2007-02-17 Ulrich Drepper [BZ #3334] * locales/sr_ME: Update from maintainer. 2007-02-16 Ulrich Drepper [BZ #3322] * SUPPORTED (SUPPORTED-LOCALES): Add sr_RS and sr_RS@latin. * locales/sr_RS: New file. * locales/sr_RS@latin: New file. --- ChangeLog | 5 + locale/iso-3166.def | 1 + locale/iso-4217.def | 1 + localedata/ChangeLog | 12 ++ localedata/SUPPORTED | 2 + localedata/locales/sr_ME | 81 ++++++---- localedata/locales/sr_RS | 360 +++++++++++++++++++++++++++++++++++++++++ localedata/locales/sr_RS@latin | 174 ++++++++++++++++++++ 8 files changed, 608 insertions(+), 28 deletions(-) create mode 100644 localedata/locales/sr_RS create mode 100644 localedata/locales/sr_RS@latin diff --git a/ChangeLog b/ChangeLog index 00a38c2ffa..3f480904af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-02-16 Ulrich Drepper + + * locale/iso-3166.def: Add entry for Serbia. + * locale/iso-4217.def: Define RSD. + 2007-02-15 Ulrich Drepper * nscd/nscd_helper.c (open_socket): Don't send padding bytes from diff --git a/locale/iso-3166.def b/locale/iso-3166.def index bae42caed2..a0dd56385a 100644 --- a/locale/iso-3166.def +++ b/locale/iso-3166.def @@ -198,6 +198,7 @@ DEFINE_COUNTRY_CODE ("SAO TOME AND PRINCIPE", ST, STP, 678) DEFINE_COUNTRY_CODE ("SAUDI ARABIA", SA, SAU, 682) DEFINE_COUNTRY_CODE ("SENEGAL", SN, SEN, 686) DEFINE_COUNTRY_CODE ("SERBIA AND MONTENEGRO", CS, SCG, 891) +DEFINE_COUNTRY_CODE ("SERBIA", RS, SRB, 688) DEFINE_COUNTRY_CODE ("SEYCHELLES", SC, SYC, 690) DEFINE_COUNTRY_CODE ("SIERRA LEONE", SL, SLE, 694) DEFINE_COUNTRY_CODE ("SINGAPORE", SG, SGP, 702) diff --git a/locale/iso-4217.def b/locale/iso-4217.def index 1af6ef4496..8f2c9acaf5 100644 --- a/locale/iso-4217.def +++ b/locale/iso-4217.def @@ -129,6 +129,7 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ DEFINE_INT_CURR("RON") /* Romanian New Leu */ +DEFINE_INT_CURR("RSD") /* Serbian Dinars */ DEFINE_INT_CURR("RUB") /* Russian Ruble */ DEFINE_INT_CURR("RWF") /* Rwanda Franc */ DEFINE_INT_CURR("SAR") /* Saudi Arabia Riyal */ diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 2125169af1..20d03a09f7 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,15 @@ +2007-02-17 Ulrich Drepper + + [BZ #3334] + * locales/sr_ME: Update from maintainer. + +2007-02-16 Ulrich Drepper + + [BZ #3322] + * SUPPORTED (SUPPORTED-LOCALES): Add sr_RS and sr_RS@latin. + * locales/sr_RS: New file. + * locales/sr_RS@latin: New file. + 2007-02-02 Bruno Haible * charmaps/EUC-KR: Add mapping for 0xA2 0xE8. diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index dff286997e..4eff7115ec 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -321,6 +321,8 @@ sq_AL/ISO-8859-1 \ sr_CS.UTF-8/UTF-8 \ sr_CS/ISO-8859-5 \ sr_ME/UTF-8 \ +sr_RS/UTF-8 \ +sr_RS@latin/UTF-8 \ ss_ZA/UTF-8 \ st_ZA.UTF-8/UTF-8 \ st_ZA/ISO-8859-1 \ diff --git a/localedata/locales/sr_ME b/localedata/locales/sr_ME index 30afe44b61..5c0961f60c 100644 --- a/localedata/locales/sr_ME +++ b/localedata/locales/sr_ME @@ -1,42 +1,38 @@ comment_char % escape_char / % -% Serbian Language in Jekavian dialect Locale for Serbia and Montenegro -% Source: sr_YU locale +% Serbian Language locale for Montenegro +% Source: sr_YU, sr_CS locale % Address: % % Contact: Danilo Segan -% Email: dsegan@gmx.net -% Tel: +381 63 8626082 +% Email: danilo@gnome.org +% Tel: +381 63 323456 % Fax: none % Language: sr -% Territory: CS -% Revision: 1.0 -% Date: 2003-08-13 +% Territory: ME +% Revision: 1.2 +% Date: 2006-10-11 % Application: general % Users: general % Charset: UTF-8, ISO-8859-5 % Distribution and use is free, also % for commercial purposes. -% -% TODO: -% -- fix LC_COLLATE to work correctly for latin alphabet too -% LC_IDENTIFICATION -title "Serbian locale for Serbia and Montenegro" -source "sr_YU locale" +title "Serbian locale for Montenegro" +source "sr_YU, sr_CS locale" address "" contact "Danilo Segan" email "bug-glibc@gnu.org" tel "" fax "" language "Serbian" -territory "Serbia and Montenegro" -revision "1.1" -date "2004-01-10" +territory "Montenegro" +revision "1.2" +date "2006-10-11" audience "general" -application "" +application "GNU locale" abbreviation "" % category i18n:1997;LC_IDENTIFICATION @@ -54,19 +50,33 @@ category i18n:1997;LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE -copy "sr_CS" +copy "i18n" END LC_CTYPE LC_COLLATE -copy "sr_CS" +copy "sr_RS" END LC_COLLATE LC_MONETARY -copy "sr_CS" +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3;3 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 0 +p_sep_by_space 1 +n_cs_precedes 0 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 END LC_MONETARY LC_NUMERIC -copy "sr_CS" +copy "sr_RS" END LC_NUMERIC LC_TIME @@ -110,31 +120,46 @@ t_fmt_ampm "" date_fmt "/ / " -week 7;19971201;4 +% week 7;19971201;4 first_weekday 2 first_workday 2 END LC_TIME LC_MESSAGES -copy "sr_CS" +copy "sr_RS" END LC_MESSAGES LC_PAPER -copy "sr_CS" +copy "sr_RS" END LC_PAPER LC_NAME -copy "sr_CS" +copy "sr_RS" END LC_NAME LC_ADDRESS -copy "sr_CS" +postal_fmt "/ +/ +/ +/ +" +country_ab2 "" +country_ab3 "" +country_post "" +country_name "" +country_num 499 +country_car "" +country_isbn "" +lang_name "" +lang_term "" +lang_lib "" +lang_ab "" END LC_ADDRESS LC_TELEPHONE -copy "sr_CS" +copy "sr_RS" END LC_TELEPHONE LC_MEASUREMENT -copy "sr_CS" +copy "sr_RS" END LC_MEASUREMENT diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS new file mode 100644 index 0000000000..b818592c0e --- /dev/null +++ b/localedata/locales/sr_RS @@ -0,0 +1,360 @@ +comment_char % +escape_char / +% +% Serbian Language Locale for Serbia +% Source: sr_YU, sr_CS locales +% Address: +% +% Contact: Danilo Segan +% Email: danilo@gnome.org +% Tel: +381 63 323456 +% Fax: none +% Language: sr +% Territory: RS +% Revision: 1.3 +% Date: 2006-10-09 +% Application: general +% Users: general +% Charset: UTF-8 +% Distribution and use is free, also +% for commercial purposes. +% + +LC_IDENTIFICATION +title "Serbian locale for Serbia" +source "sr_YU, sr_CS locale" +address "" +contact "Danilo Segan" +email "bug-glibc-locales@gnu.org" +tel "" +fax "" +language "Serbian" +territory "Serbia" +revision "1.3" +date "2006-10-09" +audience "general" +application "GNU locale" +abbreviation "" +% +category "i18n:1997";LC_IDENTIFICATION +category "i18n:1997";LC_CTYPE +category "i18n:1997";LC_COLLATE +category "i18n:1997";LC_MONETARY +category "i18n:1997";LC_NUMERIC +category "i18n:1997";LC_TIME +category "i18n:1997";LC_MESSAGES +category "i18n:1997";LC_PAPER +category "i18n:1997";LC_NAME +category "i18n:1997";LC_ADDRESS +category "i18n:1997";LC_TELEPHONE +category "i18n:1997";LC_MEASUREMENT +END LC_IDENTIFICATION + +LC_CTYPE +copy "i18n" +translit_start +include "translit_combining";"" + +% cyrillic -> latin + "";"" % d- + "" % gj + "" % dz + "" % j + "" % lj + "" % nj + "";"" % c' + "" % kj + "";"" % dz< + + "";"" % D- + "" % Gj + "" % Dz + "" % J + "" % Lj + "" % Nj + "";"" % C' + "" % Kj + "";"" % Dz< + + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "";"" % z< + "";"" % s< + "";"" % c< + + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "";"" % z< + "";"" % s< + "";"" % c< + +translit_end +END LC_CTYPE + + +LC_COLLATE + +copy "iso14651_t1" + +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" + +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" + +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" + +collating-symbol +collating-symbol +collating-symbol + +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol + +collating-symbol +collating-symbol + +reorder-after + +reorder-after + + +reorder-after + + + + + +reorder-after + +reorder-after + +reorder-after + +reorder-after + + +reorder-after + ;;;IGNORE + ;;;IGNORE +reorder-after + ;;;IGNORE + ;;;IGNORE + +reorder-after + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE +reorder-after + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + +reorder-after + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE +reorder-after + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + +reorder-after + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE +reorder-after + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + +reorder-after + ;;;IGNORE +reorder-after + ;;;IGNORE + +reorder-after + ;;;IGNORE +reorder-after + ;;;IGNORE + +reorder-end + +END LC_COLLATE + +LC_MONETARY +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3;3 +positive_sign "" +negative_sign "" +int_frac_digits 2 +frac_digits 2 +p_cs_precedes 0 +p_sep_by_space 1 +n_cs_precedes 0 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +END LC_MONETARY + +LC_NUMERIC +decimal_point "" +thousands_sep "" +grouping 0;0 +END LC_NUMERIC + +LC_TIME + +abday "";"";/ + "";"";/ + "";"";/ + "" +day "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +abmon "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"" +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" + +d_t_fmt "/ +/ +" +d_fmt "" +t_fmt "" +am_pm "";"" +t_fmt_ampm "" +date_fmt "/ +/ +" +% week 7;19971201;4 +first_weekday 2 +first_workday 2 +END LC_TIME + +LC_MESSAGES +yesexpr "" +noexpr "" +END LC_MESSAGES + +LC_PAPER +height 297 +width 210 +END LC_PAPER + +LC_NAME +name_fmt "/ +" +name_gen "" +name_mr "" +name_mrs "" +name_miss "" +name_ms "" +END LC_NAME + +LC_ADDRESS +postal_fmt "/ +/ +/ +/ +" +country_ab2 "" +country_ab3 "" +% FIXME: country_post is probably incorrect +country_post "" +country_name "" +country_num 688 +country_car "" +% FIXME: ISBN code is what? "86" that preceedes all the numbers? +country_isbn "" +lang_name "" +lang_term "" +lang_lib "" +lang_ab "" +END LC_ADDRESS + +LC_TELEPHONE +tel_int_fmt "/ +" +tel_dom_fmt "" +int_prefix "" +int_select "" +END LC_TELEPHONE + +LC_MEASUREMENT +measurement 1 +END LC_MEASUREMENT diff --git a/localedata/locales/sr_RS@latin b/localedata/locales/sr_RS@latin new file mode 100644 index 0000000000..d9b9133268 --- /dev/null +++ b/localedata/locales/sr_RS@latin @@ -0,0 +1,174 @@ +comment_char % +escape_char / +% +% Serbian Language Locale for Serbia +% Source: sr_YU, sr_CS locales +% Address: +% +% Contact: Danilo Segan +% Email: danilo@gnome.org +% Tel: +381 63 323456 +% Fax: none +% Language: sr +% Territory: RS +% Revision: 1.3 +% Date: 2006-10-09 +% Application: general +% Users: general +% Charset: UTF-8, ISO-8859-2 +% Distribution and use is free, also +% for commercial purposes. +% + +LC_IDENTIFICATION +title "Serbian Latin locale for Serbia" +source "sr_YU, sr_CS locale" +address "" +contact "Danilo Segan" +email "bug-glibc-locales@gnu.org" +tel "" +fax "" +language "Serbian" +territory "Serbia" +revision "1.3" +date "2006-10-09" +audience "general" +application "GNU locale" +abbreviation "" +% +category "i18n:1997";LC_IDENTIFICATION +category "i18n:1997";LC_CTYPE +category "i18n:1997";LC_COLLATE +category "i18n:1997";LC_MONETARY +category "i18n:1997";LC_NUMERIC +category "i18n:1997";LC_TIME +category "i18n:1997";LC_MESSAGES +category "i18n:1997";LC_PAPER +category "i18n:1997";LC_NAME +category "i18n:1997";LC_ADDRESS +category "i18n:1997";LC_TELEPHONE +category "i18n:1997";LC_MEASUREMENT +END LC_IDENTIFICATION + +LC_CTYPE +copy "i18n" +END LC_CTYPE + +LC_COLLATE +copy "sr_RS" +END LC_COLLATE + +LC_MONETARY +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3;3 +positive_sign "" +negative_sign "" +int_frac_digits 0 +frac_digits 0 +p_cs_precedes 1 +p_sep_by_space 1 +n_cs_precedes 1 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +END LC_MONETARY + +LC_NUMERIC +copy "sr_RS" +END LC_NUMERIC + +LC_TIME +abday "";"";/ + "";"";/ + "";"";/ + "" +day "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +abmon "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"" +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" + +d_t_fmt "/ +/ +" +d_fmt "" +t_fmt "" +am_pm "";"" +t_fmt_ampm "" +date_fmt "/ +/ +" +% week 7;19971201;4 +first_weekday 2 +first_workday 2 +END LC_TIME + +LC_MESSAGES +yesexpr "" +noexpr "" +END LC_MESSAGES + +LC_PAPER +copy "sr_RS" +END LC_PAPER + +LC_NAME +name_fmt "/ +" +name_gen "" +name_mr "" +name_mrs "" +name_miss "" +name_ms "" +END LC_NAME + +LC_ADDRESS +postal_fmt "/ +/ +/ +/ +" +country_ab2 "" +country_ab3 "" +country_post "" +country_name "/ +" +country_num 688 +country_car "" +country_isbn "" +lang_name "" +lang_term "" +lang_lib "" +lang_ab "" +END LC_ADDRESS + +LC_TELEPHONE +copy "sr_RS" +END LC_TELEPHONE + +LC_MEASUREMENT +copy "sr_RS" +END LC_MEASUREMENT -- cgit v1.2.3-70-g09d2