diff options
| author | Robert Buj <robert.buj@gmail.com> | 2018-03-06 22:51:29 +0100 |
|---|---|---|
| committer | Rafal Luzynski <digitalfreak@lingonborough.com> | 2018-03-15 01:05:19 +0100 |
| commit | a00bffe8b531693d3b26c1e87afe4b9eac84474c (patch) | |
| tree | 7fb0b7e0df54187c420f92ae7c825e8230be2ed2 | |
| parent | bdc3009b8ff0effdbbfb05eb6b10966753cbf9b8 (diff) | |
| download | glibc-a00bffe8b531693d3b26c1e87afe4b9eac84474c.tar.gz glibc-a00bffe8b531693d3b26c1e87afe4b9eac84474c.tar.xz glibc-a00bffe8b531693d3b26c1e87afe4b9eac84474c.zip | |
ca_ES locale: Update LC_TIME (bug 22848).
Add/fix alternative month names, long & short formats, am_pm, abday settings, and improve indentation for Catalan. [BZ #22848] * localedata/locales/ca_ES (abmon): Rename to... (ab_alt_mon): This, then synchronize with CLDR (nominative case). (mon): Rename to... (alt_mon): This. (abmon): Import from CLDR (genitive case, month names preceded by "de" or "d’"). (mon): Likewise. (abday): Synchronize with CLDR. (d_t_fmt): Likewise. (d_fmt): Likewise. (am_pm): Likewise. (LC_TIME): Improve indentation. (LC_TELEPHONE): Likewise. (LC_NAME): Likewise. (LC_ADDRESS): Likewise.
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | localedata/locales/ca_ES | 111 |
2 files changed, 91 insertions, 40 deletions
diff --git a/ChangeLog b/ChangeLog index a54848bcab..9471933d88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2018-03-15 Robert Buj <robert.buj@gmail.com> + + [BZ #22848] + * localedata/locales/ca_ES (abmon): Rename to... + (ab_alt_mon): This, then synchronize with CLDR (nominative case). + (mon): Rename to... + (alt_mon): This. + (abmon): Import from CLDR (genitive case, month names preceded by + "de" or "d’"). + (mon): Likewise. + (abday): Synchronize with CLDR. + (d_t_fmt): Likewise. + (d_fmt): Likewise. + (am_pm): Likewise. + + (LC_TIME): Improve indentation. + (LC_TELEPHONE): Likewise. + (LC_NAME): Likewise. + (LC_ADDRESS): Likewise. + 2018-03-14 Joseph Myers <joseph@codesourcery.com> * sysdeps/x86/fpu/bits/mathinline.h [!__GNUC_PREREQ (3, 4)] diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES index c20d393c2a..5d8297823e 100644 --- a/localedata/locales/ca_ES +++ b/localedata/locales/ca_ES @@ -92,36 +92,67 @@ grouping 0;0 END LC_NUMERIC LC_TIME -abday "dg";"dl";"dt";"dc";"dj";"dv";"ds" -day "diumenge";/ - "dilluns";/ - "dimarts";/ - "dimecres";/ - "dijous";/ - "divendres";/ - "dissabte" -abmon "gen";"feb";/ - "mar";"abr";/ - "mai";"jun";/ - "jul";"ago";/ - "set";"oct";/ - "nov";"des" -mon "gener";/ - "febrer";/ - "mar<U00E7>";/ - "abril";/ - "maig";/ - "juny";/ - "juliol";/ - "agost";/ - "setembre";/ - "octubre";/ - "novembre";/ - "desembre" -d_t_fmt "%a %d %b %Y %T %Z" -d_fmt "%d//%m//%y" -t_fmt "%T" -am_pm "";"" +abday "dg.";"dl.";"dt.";"dc.";"dj.";"dv.";"ds." +day "diumenge";/ + "dilluns";/ + "dimarts";/ + "dimecres";/ + "dijous";/ + "divendres";/ + "dissabte" +ab_alt_mon "gen.";/ + "febr.";/ + "mar<U00E7>";/ + "abr.";/ + "maig";/ + "juny";/ + "jul.";/ + "ag.";/ + "set.";/ + "oct.";/ + "nov.";/ + "des." +abmon "de gen.";/ + "de febr.";/ + "de mar<U00E7>";/ + "d<U2019>abr.";/ + "de maig";/ + "de juny";/ + "de jul.";/ + "d<U2019>ag.";/ + "de set.";/ + "d<U2019>oct.";/ + "de nov.";/ + "de des." +alt_mon "gener";/ + "febrer";/ + "mar<U00E7>";/ + "abril";/ + "maig";/ + "juny";/ + "juliol";/ + "agost";/ + "setembre";/ + "octubre";/ + "novembre";/ + "desembre" +mon "de gener";/ + "de febrer";/ + "de mar<U00E7>";/ + "d<U2019>abril";/ + "de maig";/ + "de juny";/ + "de juliol";/ + "d<U2019>agost";/ + "de setembre";/ + "d<U2019>octubre";/ + "de novembre";/ + "de desembre" +d_t_fmt "%A, %-d %B de %Y, %T %Z" +d_fmt "%-d//%-m//%y" +t_fmt "%T" +am_pm "a. m.";/ + "p. m." t_fmt_ampm "" week 7;19971130;4 first_weekday 2 @@ -132,9 +163,9 @@ copy "i18n" END LC_PAPER LC_TELEPHONE -tel_int_fmt "+%c %a %l" -int_prefix "34" -int_select "00" +tel_int_fmt "+%c %a %l" +int_prefix "34" +int_select "00" END LC_TELEPHONE LC_MEASUREMENT @@ -142,19 +173,19 @@ copy "i18n" END LC_MEASUREMENT LC_NAME -name_fmt "%d%t%g%t%m%t%f" +name_fmt "%d%t%g%t%m%t%f" END LC_NAME LC_ADDRESS -postal_fmt "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N" +postal_fmt "%f%N%a%N%d%N%b%N%s %h %e %r%N%z %T%N%c%N" country_name "Espanya" -country_ab2 "ES" -country_ab3 "ESP" -country_num 724 -country_car "E" +country_ab2 "ES" +country_ab3 "ESP" +country_num 724 +country_car "E" % català lang_name "catal<U00E0>" lang_ab "ca" lang_term "cat" -lang_lib "cat" +lang_lib "cat" END LC_ADDRESS |