From 7db304be800c48b16a9a559c6a6160244ae346cc Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 1 May 2006 19:01:34 +0000 Subject: [PATCH] [BZ #531] 2006-01-07 Eddy Petrisor * locales/ro_RO: The sorting order of the letters a circumflex and a with breve was corrected according to the Romanian alphabet. Capital A with breve is in no longer used within day names. Romanian post-92 writing rules are used within day and abday fields. Fixed the international currency symbol because after the denomination (starting with the 1st of July 2005), the symbol is RON (1 RON = 10000 ROL). Grouping sign for thousands, which is ".", is used for Romanian. Numbers are grouped in sets of 3 digits. The short date format is %d.%m.%Y for Romanian in Romania. The year is placed before the time in date_fmt. %Z was replaced with %z in date formats because %Z is not used nor widely known in Romania, and Romania uses daylight saving and the difference is more obvious this way. abday for Saturday was changed because i> looks bad and is incorrect according to post-92 writing rules. In Romanian months' names are not capitalized. The same goes for the days' names. A4 is the prefered paper type and metric system is used; FIXMEs were removed. country_name, country_car, lang_name and lang_ab were added. name_mr, name_mrs, name_miss were added; name_ms omitted as there is no proper form it in Romanian. An explanation related to the cedilla/comma issue and the reson why the transliteration is a good idea was added. The default encoding was changed to UTF-8 because this is the only encoding that supports all Romanian specific symbols and dicritics. The name format was corrected while salutation abbreviation was omitted. postal_fmt was corrected according to the Romanian style of writing this information. * SUPPORTED (SUPPORTED-LOCALES): Add el_CY.ISO-8859-7 and el_CY.UTF-8. [BZ #531] * locales/el_CY: New file. --- localedata/ChangeLog | 40 ++++++++ localedata/SUPPORTED | 2 + localedata/locales/el_CY | 104 +++++++++++++++++++++ localedata/locales/ro_RO | 239 ++++++++++++++++++++++++++++++++++++++--------- 4 files changed, 341 insertions(+), 44 deletions(-) create mode 100644 localedata/locales/el_CY diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 37d8c66d94..000e08a0cc 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,5 +1,45 @@ +2006-01-07 Eddy Petrisor + + * locales/ro_RO: The sorting order of the letters a circumflex and + a with breve was corrected according to the Romanian alphabet. + Capital A with breve is in no longer used within day names. + Romanian post-92 writing rules are used within day and abday fields. + Fixed the international currency symbol because after the + denomination (starting with the 1st of July 2005), the symbol is + RON (1 RON = 10000 ROL). + Grouping sign for thousands, which is ".", is used for Romanian. + Numbers are grouped in sets of 3 digits. + The short date format is %d.%m.%Y for Romanian in Romania. + The year is placed before the time in date_fmt. + %Z was replaced with %z in date formats because %Z is not + used nor widely known in Romania, and Romania uses daylight saving + and the difference is more obvious this way. + abday for Saturday was changed because i> looks bad and is + incorrect according to post-92 writing rules. + In Romanian months' names are not capitalized. The same goes for + the days' names. + A4 is the prefered paper type and metric system is used; + FIXMEs were removed. + country_name, country_car, lang_name and lang_ab were added. + name_mr, name_mrs, name_miss were added; name_ms omitted as + there is no proper form it in Romanian. + An explanation related to the cedilla/comma issue and + the reson why the transliteration is a good idea was added. + The default encoding was changed to UTF-8 because this is the + only encoding that supports all Romanian specific symbols and + dicritics. + The name format was corrected while salutation abbreviation was + omitted. + postal_fmt was corrected according to the Romanian style of + writing this information. + 2006-05-01 Ulrich Drepper + * SUPPORTED (SUPPORTED-LOCALES): Add el_CY.ISO-8859-7 and el_CY.UTF-8. + + [BZ #531] + * locales/el_CY: New file. + [BZ #192] * locales/hu_HU: Better month name abbreviations. diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED index 8b239893c5..10b90a3bff 100644 --- a/localedata/SUPPORTED +++ b/localedata/SUPPORTED @@ -92,6 +92,8 @@ de_LU@euro/ISO-8859-15 \ dz_BT/UTF-8 \ el_GR.UTF-8/UTF-8 \ el_GR/ISO-8859-7 \ +el_CY.UTF-8/UTF-8 \ +el_CY/ISO-8859-7 \ en_AU.UTF-8/UTF-8 \ en_AU/ISO-8859-1 \ en_BW.UTF-8/UTF-8 \ diff --git a/localedata/locales/el_CY b/localedata/locales/el_CY new file mode 100644 index 0000000000..726ef2edb2 --- /dev/null +++ b/localedata/locales/el_CY @@ -0,0 +1,104 @@ +comment_char % +escape_char / +% +% Greek Language Locale for Cyprus +% Based on locale el_GR by Keld Simonsen. + +LC_IDENTIFICATION +title "Greek locale for Cyprus" +source "Greek Debian Translation Team" +address "Konstantinos Margaritis, M. Asias 50, Nafplion 21100, Greece" +contact "" +email "bug-glibc@gnu.org" +tel "" +fax "" +language "Greek" +territory "Cyprus" +revision "1.0" +date "2004-10-20" +% +category "el_CY:2000";LC_IDENTIFICATION +category "el_CY:2000";LC_CTYPE +category "el_CY:2000";LC_COLLATE +category "el_CY:2000";LC_TIME +category "el_CY:2000";LC_NUMERIC +category "el_CY:2000";LC_MONETARY +category "el_CY:2000";LC_MESSAGES +category "el_CY:2000";LC_PAPER +category "el_CY:2000";LC_NAME +category "el_CY:2000";LC_ADDRESS +category "el_CY:2000";LC_TELEPHONE + +END LC_IDENTIFICATION + +LC_COLLATE +copy "iso14651_t1" +END LC_COLLATE + +LC_CTYPE +copy "i18n" +END LC_CTYPE + +LC_MESSAGES +copy "el_GR" +END LC_MESSAGES + +LC_MONETARY +int_curr_symbol "" +currency_symbol "" +mon_decimal_point "" +mon_thousands_sep "" +mon_grouping 3 +positive_sign "" +negative_sign "" +int_frac_digits 4 +frac_digits 4 +p_cs_precedes 0 +p_sep_by_space 0 +n_cs_precedes 1 +n_sep_by_space 0 +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 +copy "el_GR" +END LC_TIME + +LC_PAPER +copy "el_GR" +END LC_PAPER + +LC_TELEPHONE +tel_int_fmt "/ +" +int_prefix "" +int_select "" +END LC_TELEPHONE + +LC_MEASUREMENT +% FIXME +measurement 1 +END LC_MEASUREMENT + +LC_NAME +name_fmt "/ +" +END LC_NAME + +LC_ADDRESS +postal_fmt "/ +/ +/ +/ +" +country_ab2 "" +country_ab3 "" +country_num 196 +END LC_ADDRESS diff --git a/localedata/locales/ro_RO b/localedata/locales/ro_RO index 6520255980..f258b7b6be 100644 --- a/localedata/locales/ro_RO +++ b/localedata/locales/ro_RO @@ -15,9 +15,13 @@ escape_char / % Date: 1996-10-15 % Application: general % Users: general -% Charset: ISO-8859-2 +% Charset: UTF-8 % Distribution and use is free, also % for commercial purposes. +% +% Corrections by: +% 2006-01-07 +% Eddy Petrisor LC_IDENTIFICATION title "Romanian locale for Romania" @@ -51,10 +55,11 @@ LC_COLLATE % Copy the template from ISO/IEC 14651 copy "iso14651_t1" -% a a> a( b c d e f g h i i> j k l m n o p q r s s, t t, u v w x y z +% The modern Romanian alphabet has 31 letters, ordered as below: +% a a( a> b c d e f g h i i> j k l m n o p q r s s, t t, u v w x y z -collating-symbol > collating-symbol +collating-symbol > collating-symbol > collating-symbol collating-symbol @@ -64,8 +69,8 @@ reorder-after reorder-after -> +> reorder-after > reorder-after @@ -74,11 +79,11 @@ reorder-after reorder-after - >;;;IGNORE ;;;IGNORE + >;;;IGNORE reorder-after - >;;;IGNORE ;;;IGNORE + >;;;IGNORE reorder-after >;;;IGNORE @@ -103,9 +108,22 @@ reorder-end END LC_COLLATE + + LC_CTYPE copy "i18n" +% +% Transliteration is _currently_ a good idea as most fonts/applications do not +% have the correct diacritics for "t comma bellow" (U021A, U021B) and +% "s comma bellow" (U0218, U0219). Thus we currently use and compromise with +% "t cedilla" (U0162, U0163) - which, actually, does not belong to any +% language - and "s cedilla" (U015E, U015F) - which is _not_ correct for +% Romanian, but is correct for Turkish. +% +% This issue should be fixed in the future, when enough font and application +% support will be provided in current operating systems. +% translit_start include "translit_combining";"" @@ -124,19 +142,31 @@ include "translit_combining";"" translit_end END LC_CTYPE + + LC_MESSAGES yesexpr "" noexpr "" END LC_MESSAGES + LC_MONETARY -int_curr_symbol "" +% Since the 1st of July 2005, the new currency is the ROmanian New leu +% the symbol is RON and 1 RON = 10000 ROL (old ROmanian Leu)... +int_curr_symbol "" +% but representing counted coins is made in the same way as before. currency_symbol "" +% decimal point is comma mon_decimal_point "" +% the separation of digits is made in groups of three +% and the separator between the groups is the full stop (dot) mon_thousands_sep "" mon_grouping 3;3 +% the positive sign is not usualy represented positive_sign "" +% while the negative one is negative_sign "" +% usualy one will display only two digits after the decimal point int_frac_digits 2 frac_digits 2 p_cs_precedes 1 @@ -147,80 +177,201 @@ p_sign_posn 1 n_sign_posn 1 END LC_MONETARY + LC_NUMERIC +% same rules as for monetary apply for regular figures: +% decimal point is comma decimal_point "" -thousands_sep "" -grouping 0;0 +% and the separator between groups is full stop +thousands_sep "" +% the separation of figures is made in groups of three +grouping 3;3 END LC_NUMERIC + LC_TIME +% abbreviated day names are (starting from Monday): Lu Ma Mi Jo Vi Sb Du abday "";"";"";"";/ - "";"";"" -day "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" + "";"";"" +% +% Because in 1992 the Romanian Academy stated that within words the +% writing of the letter i> (i circumflex - U00EE) should be replaced +% by a> (acircumflex - U00E2), we use the post92 writing. +% Note: The actual rule is more complex, but the case which applies for +% Satruday is covered by the exposed explanation above. +% +% Day names are not capitalized: +% duminic, luni, mari, +% miercuri, joi, vineri, +% smbt +% +% Note that Tuesday Romanian day should be using t comma, not t cedilla, +% but due to the low availability of the glyph (U021B) in fonts we use +% the "so called t cedilla" +day "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +% +% All month abbreviations are composed of the first three letters of the full +% Romanian names of the months, except for November, whose abbreviation comes +% from the Latin month name, thus the abbreviation is "nov" +% +% Month names are not capitalized: +% ian feb mar apr mai iun iul aug sep oct nov dec abmon "";"";/ "";"";/ "";"";/ "";"";/ "";"";/ "";"" -mon "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "";/ - "" -d_t_fmt "" -d_fmt "" +% +% Month names are _not_ capitalized in Romanian: +% ianuarie februarie martie +% aprilie mai iunie +% iulie august septembrie +% octombrie noiembrie decembrie +mon "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "";/ + "" +% Appropriate date and time representation (%c) +% Romania uses daylight saving and the names of the time zones are +% not widely known nor used +% "%a %d %b %Y %T %z" +d_t_fmt "/ +" +% +% Appropriate date representation (%x) +% "%d.%m.%Y" +d_fmt "" +% 24 hour format is used, t_fmt "" +% thus no am/pm markers are defined/used am_pm "";"" +% also am/pm hour display format is not used t_fmt_ampm "" -date_fmt "/ -/ -" +% %A %-e %B %Y, %H:%M:%S %z +date_fmt "/ +/ +" END LC_TIME + +% Romania uses A4 paper format LC_PAPER -% FIXME height 297 -% FIXME width 210 END LC_PAPER + LC_TELEPHONE tel_int_fmt "/ " int_prefix "" END LC_TELEPHONE + +% Romania uses the metric system LC_MEASUREMENT -% FIXME measurement 1 END LC_MEASUREMENT + LC_NAME -name_fmt "/ -" +% Format of a name, taken from the glibc locale for Ukrainian. +% %f Family names. +% %F Family names in uppercase. +% %g First given name. +% %G First given initial. +% %l First given name with Latin letters. +% %o Other shorter name. +% %m Additional given names. +% %M Initials for additional given names. +% %p Profession. +% %s Salutation, such as "Doctor" +% %S Abbreviated salutation, such as "Mr." or "Dr." +% %d Salutation, using the FDCC-sets conventions +% 1 for the name_gen +% 2 for name_mr +% 3 for name_mrs +% 4 for name_miss +% 5 for name_ms +% %t If the preceding field descriptor resulted in an empty string, +% then the empty string, else a . +% +% FIXME: There are two prefered ways: +% %d%t%s%t%g%t%f and %d%t%s%t%f%t%g%t%m +% The current tendency is to use the first form, while the second is the most +% popular form, it is widespread and widely known. +% Now we stick to the traditional/old/second form: %d%t%s%t%f%t%g%t%m +name_fmt "/ +/ +" +% Dl. +name_mr "" +% D-na. +name_mrs "" +% D-ra. +name_miss "" END LC_NAME LC_ADDRESS -postal_fmt "/ -/ -/ -/ -" +% Format of an address. The fields have the following meaning +% (inspired originaly by glibc locale for Ukranian): + +% %n Person's name, possibly constructed with the LC_NAME +% "name_fmt" keyword. (it appears to be invalid) +% %a Care of person, or organization. +% %f Firm name. +% %d Department name. +% %b Building name. +% %s Street or block (eg. Japanese) name. +% %h House number or designation. +% %N Insert an if the previous descriptor +% value was not an empty string; otherwise ignore. +% %t Insert a if the previous descriptor value +% was not an empty string; otherwise ignore. +% %r Room number, door designation. +% %e Floor number. +% %C Country designation, from the keyword. +% %l Local township within town or city. (it appears to be invalid) +% %z Zip number, postal code. +% %T Town, city. +% %S State, province, or prefecture. +% %c Country, as taken from data record. +% +% FIXME: it appears that %n and %l are not working; correct form is: +% %n%N%f%N%a%d%N%s%t%h%N%b%t%e%t%r%N%l%z%t%T%N%S%t%c%N +% implemented form: +% %f%N%a%d%N%s%t%h%N%b%t%e%t%r%N%z%t%T%N%S%t%c%N +postal_fmt "/ +/ +/ +/ +/ +/ +" +% Country names are capitalized: Roma>nia +country_name "" country_ab2 "" country_ab3 "" country_num 642 +country_car "" +% language names are not capitalized in Romanian ( roma>na( ) +lang_name "" +lang_ab "" +lang_term "" +lang_lib "" END LC_ADDRESS -- 2.11.4.GIT