From 5be068fc154b697b56cce171a73eccf572f86937 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 26 Oct 2000 17:17:13 +0000 Subject: [PATCH] Update. 2000-10-26 Ulrich Drepper * locales/fa_IR: Fix many problems and change to use UTF-8. Patch by Roozbeh Pournader . * SUPPORTED: Add fa_IR.UTF-8. --- localedata/ChangeLog | 6 + localedata/SUPPORTED | 1 + localedata/locales/fa_IR | 552 ++++++++--------------------------------------- 3 files changed, 92 insertions(+), 467 deletions(-) diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 5f64e62..1553f0f 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,9 @@ +2000-10-26 Ulrich Drepper + + * locales/fa_IR: Fix many problems and change to use UTF-8. + Patch by Roozbeh Pournader . + * SUPPORTED: Add fa_IR.UTF-8. + 2000-10-22 Bruno Haible * charmaps/BIG5HKSCS: Add 9 commented irreversible mappings. diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index a015422..a596e1c 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -70,6 +70,7 @@ es_VE ISO-8859-1 et_EE ISO-8859-1 eu_ES ISO-8859-1 eu_ES@euro ISO-8859-15 +fa_IR UTF-8 fi_FI ISO-8859-1 fi_FI@euro ISO-8859-15 fo_FO ISO-8859-1 diff --git a/localedata/locales/fa_IR b/localedata/locales/fa_IR index 4f2faf2..7a658f4 100644 --- a/localedata/locales/fa_IR +++ b/localedata/locales/fa_IR @@ -1,41 +1,36 @@ comment_char % escape_char / % -% Persian Language Locale for Iran with ISIRI-3342 character set +% Persian Language Locale for Iran with UTF-8 character set % Source: The Persian Internet Project -% Address: Computing Center, Sharif University of Technology, +% Address: Computing Center, Sharif University of Technology % Azadi Ave, Tehran, Iran % Contact: Roozbeh Pournader % Email: roozbeh@sina.sharif.ac.ir % Tel: +98 21 6022378 -% Fax: +% Fax: +98 21 6019568 % Language: fa % Territory: IR -% Revision: 0.0 -% Date: 1999-12-11 +% Revision: 2.0 +% Date: 2000-10-17 % Users: general % Repertoiremap: -% Charset: ISIRI-3342 +% Charset: UTF-8 % Distribution and use is free, also % for commercial purposes. -% Note that the following can not be used for character sets -% other than ISIRI-3342. It is dependent to the ISIRI-3342 -% BIDI behaviour which is not the same as Unicode BIDI behaviour. -% So, another versions will be needed for UTF-8 and IRAN-SYSTEM. - LC_IDENTIFICATION title "Persian locale for Iran" source "The Persian Internet Project" -address "Computing Center, Sharif University of Technology,, Azadi Ave, Tehran, Iran" -contact "" -email "bug-glibc@gnu.org" -tel "" -fax "" +address "Computing Center, Sharif University of Technology, Azadi Ave, Tehran, Iran" +contact "Roozbeh Pournader" +email "roozbeh@sina.sharif.ac.ir" +tel "+98 21 6022378" +fax "+98 21 6019568" language "Persian" territory "Iran" -revision "1.0" -date "2000-06-29" +revision "2.0" +date "2000-10-17" % category "fa_IR:2000";LC_IDENTIFICATION category "fa_IR:2000";LC_CTYPE @@ -52,517 +47,140 @@ category "fa_IR:2000";LC_TELEPHONE END LC_IDENTIFICATION LC_CTYPE -% -upper ;;;;;;;;;;;;;/ - ;;;;;;;;;;;; -% -lower ;;;;;;;;;;;;;/ - ;;;;;;;;;;;; -% -alpha ;;;;;;;;;;;;;/ - ;;;;;;;;;;;;;/ - ;;;;;;;;;;;;;/ - ;;;;;;;;;;;;;/ - ;;;;;;;;;;/ - ;;;;;;;;;;/ - ;;;;;;;;;;/ - ;;;;;;;;;; -% -% I'm not sure how can I make Persian digits get accepted -% as digits. -% -digit ...;/ - ... -% -xdigit ;;;;;/ - ;;;;;/ - ;;;;;;/ - ;;;;; -% -blank ;;; -% -space ;;;;;;/ - ;;;;; -% -cntrl ;;;;;;/ - ;;;;;;/ - ;;;;;;/ - ;;;;;;/ - ;;;;;;/ - ;;/ - ;;;;;;/ - ;;;;;;/ - ;;;;;;/ - ;;;;;;/ - ;;;;;;/ - ;;/ - ; -% -punct ;;;;;;;/ - ;;;;;;;/ - ;;;;;;;/ - ;;;;;/ - ;;;;;;/ - ;;<%+>;;<,f>;<(+>;/ - <)+>;<*X+>;<+f>;;<-f>;<.f>;/ - ;<:f>;;f>;<=f>;/ - <;;<<(+>;<)/>+>;<(!+>;/ - ;;;<*+>;;/ - ;;;;;/ - ;;;; -% -tolower (,);(,);(,);(,);(,);/ - (,);(,);(,);(,);(,);/ - (,);(,);(,);(,);(,);/ - (,);(,);(,);(,);(,);/ - (,);(,);(,);(,);(,);(,) -% -toupper (,);(,);(,);(,);(,);/ - (,);(,);(,);(,);(,);/ - (,);(,);(,);(,);(,);/ - (,);(,);(,);(,);(,);/ - (,);(,);(,);(,);(,);(,) +copy "i18n" END LC_CTYPE - + LC_COLLATE - -% Based on en_DK collation specifications. -% Many lines are deleted because ISIRI-3342 does -% not support any Latin character not in ASCII. -% The four part sorting is preserved to maintain -% compatiblity with original en_DK.P - -% Ordering algorithm: -% 1. Spaces and hyphen (but not soft -% hyphen) before punctuation -% characters, punctuation characters -% before numbers, -% umbers before letters. -% 2. A distinction is made with regards -% to case as noted below. -% 3. Special characters are ignored -% when comparing letters, but then -% they are considered -% 4. Latin script is sorted before Arabic -% to attract notice in index, etc. -% -% collating symbols - -collating-symbol -collating-symbol - -collating-symbol -collating-symbol - -% Latin collation order: -% letter;accent;case;specials -% which becomes -% letter;variant;harekat;specials -% for Persian. - -order_start forward;forward;forward;position - -% or letters first: - - - - -% Accents: - - - - - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; -<-f> IGNORE;IGNORE;IGNORE;<-f> - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; -<:f> IGNORE;IGNORE;IGNORE;<:f> - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; -<)+> IGNORE;IGNORE;IGNORE;<)+> - IGNORE;IGNORE;IGNORE; -<(+> IGNORE;IGNORE;IGNORE;<(+> - IGNORE;IGNORE;IGNORE; -<)/>+> IGNORE;IGNORE;IGNORE;<)/>+> - IGNORE;IGNORE;IGNORE; -<<(+> IGNORE;IGNORE;IGNORE;<<(+> - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; -<(!+> IGNORE;IGNORE;IGNORE;<(!+> - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; -<*+> IGNORE;IGNORE;IGNORE;<*+> - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; -<+f> IGNORE;IGNORE;IGNORE;<+f> -<*X+> IGNORE;IGNORE;IGNORE;<*X+> - IGNORE;IGNORE;IGNORE; -< IGNORE;IGNORE;IGNORE;< - IGNORE;IGNORE;IGNORE; -<=f> IGNORE;IGNORE;IGNORE;<=f> - IGNORE;IGNORE;IGNORE; -f> IGNORE;IGNORE;IGNORE;f> - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; -UNDEFINED IGNORE;IGNORE;IGNORE - - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - ;;;IGNORE - -% Persian digits have equal weight to Latin ones, -% but sorted after them if the strings are equal. - -<0f> ;<0f>;IGNORE;IGNORE -<1f> ;<1f>;IGNORE;IGNORE -<2f> ;<2f>;IGNORE;IGNORE -<3f> ;<3f>;IGNORE;IGNORE -<4f> ;<4f>;IGNORE;IGNORE -<5f> ;<5f>;IGNORE;IGNORE -<6f> ;<6f>;IGNORE;IGNORE -<7f> ;<7f>;IGNORE;IGNORE -<8f> ;<8f>;IGNORE;IGNORE -<9f> ;<9f>;IGNORE;IGNORE - - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; - IGNORE;IGNORE;IGNORE; -<%+> IGNORE;IGNORE;IGNORE;<%+> - -% I am not sure where should I put the next two characters. -<.f> IGNORE;IGNORE;IGNORE;<.f> -<,f> IGNORE;IGNORE;IGNORE;<,f> - -% Rial sign is considered as a sequence of its composing letters. -% If equal, it comes first. - - "";"";IGNORE;IGNORE - - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - ;;IGNORE;IGNORE - - IGNORE;IGNORE;;IGNORE - IGNORE;IGNORE;;IGNORE - IGNORE;IGNORE;;IGNORE - IGNORE;IGNORE;;IGNORE - IGNORE;IGNORE;;IGNORE - IGNORE;IGNORE;;IGNORE - IGNORE;IGNORE;;IGNORE - IGNORE;IGNORE;;IGNORE - -order_end - -END LC_COLLATE +copy "iso14651_t1" +END LC_COLLATE LC_MONETARY int_curr_symbol "" -currency_symbol "" -mon_decimal_point "<.f>" -mon_thousands_sep "<,f>" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" mon_grouping 3 positive_sign "" -negative_sign "<-f>" +negative_sign "" int_frac_digits 0 frac_digits 0 -% -% The POSIX standard does not allow different formats for -% displaying currency as local and international. -% When they were different, following order specifies -% the conventions of local currency display. -% -% The following positioning is based on ISIRI-3342 BIDI, and should not be -% used when using Unicode BIDI. -% +% The following positioning is based on Unicode 3.0 bidirectional algorithm, +% with a "base direction" of right-to-left. p_cs_precedes 0 -p_sep_by_space 2 +p_sep_by_space 1 n_cs_precedes 0 -n_sep_by_space 2 -p_sign_posn 3 -n_sign_posn 3 +n_sep_by_space 1 +p_sign_posn 1 +n_sign_posn 1 +% The following positioning is based on Unicode 3.0 bidirectional algorithm, +% with a "base direction" of left-to-right. +int_p_cs_precedes 0 +int_p_sep_by_space 1 +int_n_cs_precedes 0 +int_n_sep_by_space 1 +int_p_sign_posn 1 +int_n_sign_posn 1 END LC_MONETARY LC_NUMERIC -decimal_point "<.f>" -thousands_sep "<,f>" +decimal_point "" +thousands_sep "" grouping 3 END LC_NUMERIC LC_TIME -abday "";"";"";/ - "";"";"";/ - "" -% -day "";/ +abday "";"";"";/ + "";"";"";/ + "" +day "";/ "";/ - "";/ + "";/ "";/ - "";/ + "";/ "";/ "" -% -mon "";/ - "";/ +mon "";/ + "";/ "";/ - "";/ + "";/ "";/ "";/ - "";/ + "";/ "";/ "";/ "";/ "";/ "" -% abmon "";"";/ "";"";/ "";"";/ - "";"";/ + "";"";/ "";"";/ "";"" -% am_pm "";"" -% -% The following date and time formats are based on ISIRI-3342 BIDI, and -% should not be used when using Unicode BIDI. -% -d_t_fmt "<:f><:f>/ -" -% -d_fmt "" -% -t_fmt "<:f><:f>" -% -t_fmt_ampm "<:f><:f>" -% +d_t_fmt "/ +/ +" +d_fmt "" +t_fmt "" +t_fmt_ampm "/ +" +first_weekday 7 +first_workday 7 +cal_direction 3 +%week 7;19971206;4 +%time_zone "???" END LC_TIME -% for , for , -% for , for . -% and are placeholders for and -% in Persian standard keyboard (revised ISIRI-2901). LC_MESSAGES -yesexpr "" +yesexpr "" noexpr "" END LC_MESSAGES LC_PAPER -% FIXME height 297 -% FIXME width 210 END LC_PAPER LC_TELEPHONE -tel_int_fmt "/ -" +tel_int_fmt "/ +" +tel_dom_fmt "" +int_select "" int_prefix "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME measurement 1 END LC_MEASUREMENT LC_NAME -name_fmt "/ -" +name_gen "" +name_miss "" +name_ms "" +name_mrs "" +name_mr "" +name_fmt "/ +" END LC_NAME LC_ADDRESS +% FIXME postal_fmt "/ / / / " +country_name "" +%country_post "???" +country_ab2 "" +country_ab3 "" +country_num 364 +% right? +country_car "" +country_isbn "" +lang_name "" +lang_ab "" +lang_term "" +lang_lib "" END LC_ADDRESS -- 2.7.4