From 935f3e6715f2f178159eef1501ae30ad53a68150 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 27 Apr 2005 04:33:01 +0000 Subject: * time/strptime_l.c (__strptime_internal): Handle 'z' to set tm_gmtoff. * time/Makefile (tests): Add tst-strptime2. * time/tst-strptime2.c: New file. --- localedata/locales/fa_IR | 211 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 154 insertions(+), 57 deletions(-) (limited to 'localedata/locales') diff --git a/localedata/locales/fa_IR b/localedata/locales/fa_IR index 8f65b1edd8..15fb535640 100644 --- a/localedata/locales/fa_IR +++ b/localedata/locales/fa_IR @@ -10,8 +10,8 @@ escape_char / % Fax: +98 21 6019568 % Language: fa % Territory: IR -% Revision: 2.4 -% Date: 2004-09-04 +% Revision: 3.0 +% Date: 2005-04-06 % Users: general % Repertoiremap: % Charset: UTF-8 @@ -28,28 +28,31 @@ tel "+98 21 6022372" fax "+98 21 6019568" language "Persian" territory "Iran" -revision "2.3" -date "2004-03-16" +revision "3.0" +date "2005-04-06" % -category "fa_IR:2004";LC_IDENTIFICATION -category "fa_IR:2004";LC_CTYPE -category "fa_IR:2004";LC_COLLATE -category "fa_IR:2004";LC_TIME -category "fa_IR:2004";LC_NUMERIC -category "fa_IR:2004";LC_MONETARY -category "fa_IR:2004";LC_MESSAGES -category "fa_IR:2004";LC_PAPER -category "fa_IR:2004";LC_NAME -category "fa_IR:2004";LC_ADDRESS -category "fa_IR:2004";LC_TELEPHONE +category "fa_IR:2005";LC_IDENTIFICATION +category "fa_IR:2005";LC_CTYPE +category "fa_IR:2005";LC_COLLATE +category "fa_IR:2005";LC_TIME +category "fa_IR:2005";LC_NUMERIC +category "fa_IR:2005";LC_MONETARY +category "fa_IR:2005";LC_MESSAGES +category "fa_IR:2005";LC_PAPER +category "fa_IR:2005";LC_NAME +category "fa_IR:2005";LC_ADDRESS +category "fa_IR:2005";LC_TELEPHONE END LC_IDENTIFICATION LC_CTYPE copy "i18n" +% Persian uses the alternate digits U+06F0..U+06F9 outdigit .. +% This is used in the scanf family of functions to read Persian numbers +% using "%Id" and such. map to_inpunct; / (,); / (,); / @@ -64,6 +67,8 @@ map to_inpunct; / (,); / (,) +% This is used in the printf family of functions to write Persian floating +% point numbers using "%If" and such. map to_outpunct; / (,); / (,) @@ -76,7 +81,7 @@ copy "iso14651_t1" % kinds), BEH, PEH, TEH, JEEM, TCHEH, HAH, KHAH, DAL, THAL, REH, ZAIN, JEH, % SEEN, SHEEN, SAD, DAD, TAH, ZAH, AIN, GHAIN, FEH, QAF, KAF, GAF, LAM, % MEEM, NOON, WAW, HEH, YEH. -% The various kind of HAMZA are sorted as ALEF WITH HAMZA ABOVE, ALEF WITH +% The various kinds of HAMZA are sorted as ALEF WITH HAMZA ABOVE, ALEF WITH % HAMZA BELOW, WAW WITH HAMZA ABOVE, YEH WITH HAMZA ABOVE. collating-symbol % accent hamza over yeh @@ -122,7 +127,7 @@ reorder-after -% Persian uses fatha, kasra, damma, fathatan, kasratan, dammatan order. +% Persian uses this order: Fatha, Kasra, Damma, Fathatan, Kasratan, Dammatan. reorder-after IGNORE;IGNORE;IGNORE; % @@ -148,7 +153,7 @@ reorder-after IGNORE;IGNORE;IGNORE; % IGNORE;IGNORE;IGNORE; % -% Persian digits are sorted before Arabic ones: they are the basic forms. +% The Persian digits are sorted before the Arabic ones: they are the basic forms. reorder-after <0>;;;IGNORE <0>;;;IGNORE @@ -292,14 +297,72 @@ grouping 3 END LC_NUMERIC LC_TIME -abday "";"";"";/ - "";"";"";/ - "" -day "";/ +% Alternative digits are used for Persian numerals in date and time. This is +% a hack, until a new prefix is defined for alternative digits. +alt_digits "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"";/ + "";"" +% Persian doesn't have abbreviations for weekdays and month names, so +% "abday" is the same as "day" and "abmon" is the same as "mon" +abday "";/ "";/ "";/ "";/ - "";/ + "";/ + "";/ + "" +day "";/ + "";/ + "";/ + "";/ + "";/ "";/ "" mon "";/ @@ -314,33 +377,68 @@ mon "";/ "";/ "";/ "" -abmon "";"";/ - "";"";/ - "";"";/ - "";"";/ - "";"";/ - "";"" -am_pm "";"" -d_t_fmt "/ -/ -" -d_fmt "" -t_fmt "" -t_fmt_ampm "/ -" -%date_fmt "/ -%/ -%" +abmon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +% Persian does not have the 12-hour format +am_pm "";"" +t_fmt_ampm "" +% +% Appropriate date representation (%x) +% "%Oy/%Om/%Od" +d_fmt "/ +/ +" +% +% Appropriate time representation (%X) +% "%OH:%OM:%OS" +t_fmt "/ +/ +" +% +% FIXME: need to add "HAMZA ABOVE" after January, February, May, July when used +% before a year +% +% Appropriate date and time representation (%c) +% "%A %Oe %B %Oy %OH:%OM:%OS" +d_t_fmt "/ +/ +/ +/ +/ +/ +" +% +% Appropriate date representation (date(1)) +% "%A %Oe %B %Oy %OH:%OM:%OS (%Z)" +date_fmt "/ +/ +/ +/ +/ +/ +/ +/ +" first_weekday 7 first_workday 7 cal_direction 3 -%week 7;19971206;4 -%time_zone "???" END LC_TIME LC_MESSAGES -yesexpr "" -noexpr "" +% This is "^[yYHf].*" +yesexpr "" +% This is "^[nNok].*" +noexpr "" END LC_MESSAGES LC_PAPER @@ -348,18 +446,6 @@ height 297 width 210 END LC_PAPER -LC_TELEPHONE -tel_int_fmt "/ -" -tel_dom_fmt "" -int_select "" -int_prefix "" -END LC_TELEPHONE - -LC_MEASUREMENT -measurement 1 -END LC_MEASUREMENT - LC_NAME name_gen "" name_miss "" @@ -371,7 +457,6 @@ name_fmt "/ END LC_NAME LC_ADDRESS -% FIXME postal_fmt "/ / / @@ -388,3 +473,15 @@ lang_ab "" lang_term "" lang_lib "" END LC_ADDRESS + +LC_TELEPHONE +tel_int_fmt "/ +" +tel_dom_fmt "" +int_select "" +int_prefix "" +END LC_TELEPHONE + +LC_MEASUREMENT +measurement 1 +END LC_MEASUREMENT -- cgit v1.2.3