From df467d229ac53098d06ffd7b86322a1e22bf6013 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Quentin=20PAG=C3=88S?= Date: Sat, 19 May 2018 17:59:08 +0200 Subject: [PATCH] oc_FR locale: Multiple updates (bug 23140, bug 23422). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Multiple updates for Occitan language including alternative month names, update abday and abmon, fix typos in day, fix d_fmt, correct LC_NAME, and use “copy "ca_ES"” as LC_COLLATE. [BZ #23140] * localedata/locales/oc_FR (mon): Rename to... (alt_mon): This, then update October (typo fix). (mon): New content (genitive case, month names preceded by "de" or "d’"). [BZ #23422] * localedata/locales/oc_FR (abday): Update all items. (day): Update Wednesday and Saturday (typo fixes). (abmon): Update all items, except May. (d_fmt): Update "%d.%m.%Y" -> "%d/%m/%Y". (LC_IDENTIFICATION): Bump the revision number and date. Keep the "category" entries in alphabetic order. (LC_ADDRESS): Remove no longer needed comment. (LC_COLLATE): Use “copy "ca_ES"”. (LC_NAME): Set the correct values of "name_fmt", "name_mr", and "name_mrs". Reviewed-by: Carlos O'Donell --- ChangeLog | 20 +++++++++++++++ NEWS | 2 +- localedata/locales/oc_FR | 64 ++++++++++++++++++++++++++++++------------------ 3 files changed, 61 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index a678087880..c40efb6177 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2018-07-18 Quentin PAGÈS + + [BZ #23140] + * localedata/locales/oc_FR (mon): Rename to... + (alt_mon): This, then update October (typo fix). + (mon): New content (genitive case, month names preceded by + "de" or "d’"). + + [BZ #23422] + * localedata/locales/oc_FR (abday): Update all items. + (day): Update Wednesday and Saturday (typo fixes). + (abmon): Update all items, except May. + (d_fmt): Update "%d.%m.%Y" -> "%d/%m/%Y". + (LC_IDENTIFICATION): Bump the revision number and date. + Keep the "category" entries in alphabetic order. + (LC_ADDRESS): Remove no longer needed comment. + (LC_COLLATE): Use “copy "ca_ES"”. + (LC_NAME): Set the correct values of "name_fmt", "name_mr", and + "name_mrs". + 2018-07-18 Joseph Myers * grp/tst_fgetgrent.c: Include . diff --git a/NEWS b/NEWS index daef815ae7..a23d0a7d33 100644 --- a/NEWS +++ b/NEWS @@ -46,7 +46,7 @@ Major new features: fMxdivfNx functions. * Nominative and genitive month names are now supported for the following - languages: Armenian, Asturian, Catalan, Czech, Kashubian, Ossetian, + languages: Armenian, Asturian, Catalan, Czech, Kashubian, Occitan, Ossetian, Scottish Gaelic, Upper Sorbian, and Walloon. The following languages now support abbreviated alternative month names: Catalan, Greek, and Kashubian. diff --git a/localedata/locales/oc_FR b/localedata/locales/oc_FR index d8c60a2788..707927ee26 100644 --- a/localedata/locales/oc_FR +++ b/localedata/locales/oc_FR @@ -18,25 +18,25 @@ tel "" fax "" language "Occitan" territory "France" -revision "0.2" -date "2000-11-15" +revision "0.3" +date "2018-04-12" category "i18n:2012";LC_IDENTIFICATION -category "i18n:2012";LC_COLLATE +category "i18n:2012";LC_ADDRESS category "i18n:2012";LC_CTYPE +category "i18n:2012";LC_COLLATE category "i18n:2012";LC_MESSAGES category "i18n:2012";LC_MONETARY +category "i18n:2012";LC_NAME category "i18n:2012";LC_NUMERIC -category "i18n:2012";LC_TIME category "i18n:2012";LC_PAPER category "i18n:2012";LC_MEASUREMENT +category "i18n:2012";LC_TIME category "i18n:2012";LC_TELEPHONE -category "i18n:2012";LC_ADDRESS END LC_IDENTIFICATION LC_ADDRESS postal_fmt "%d%N%f%N%d%N%b%N%s %h 5e %r%N%C%z %T%N%c%N" -% https://oc.wikipedia.org/wiki/Fran%C3%A7a França country_name "Frana" country_post "F" country_ab2 "FR" @@ -58,7 +58,7 @@ translit_end END LC_CTYPE LC_COLLATE -copy "en_DK" +copy "ca_ES" END LC_COLLATE LC_MESSAGES @@ -87,24 +87,27 @@ copy "fr_FR" END LC_TELEPHONE LC_TIME -abday "dim";"lun";/ - "mar";"mec";/ - "ju";"ven";/ - "sab" +abday "dg.";"dl.";"dm.";"dc.";"dj.";"dv.";"ds." day "dimenge";/ "diluns";/ "dimars";/ - "dimecres";/ + "dimcres";/ "dijus";/ "divendres";/ - "disabte" -abmon "gen";"feb";/ - "mar";"abr";/ - "mai";"jun";/ - "jul";"ago";/ - "set";"oct";/ - "nov";"dec" -mon "genir";/ + "dissabte" +abmon "gen.";/ + "febr.";/ + "mar";/ + "abr.";/ + "mai";/ + "junh";/ + "jul.";/ + "ago.";/ + "set.";/ + "oct.";/ + "nov.";/ + "dec." +alt_mon "genir";/ "febrir";/ "mar";/ "abrial";/ @@ -113,11 +116,23 @@ mon "genir";/ "julhet";/ "agost";/ "setembre";/ - "octobre";/ + "octbre";/ "novembre";/ "decembre" +mon "de genir";/ + "de febrir";/ + "de mar";/ + "dabrial";/ + "de mai";/ + "de junh";/ + "de julhet";/ + "dagost";/ + "de setembre";/ + "doctbre";/ + "de novembre";/ + "de decembre" d_t_fmt "%a %d %b %Y %T %Z" -d_fmt "%d.%m.%Y" +d_fmt "%d//%m//%Y" t_fmt "%T" am_pm "";"" t_fmt_ampm "" @@ -126,6 +141,7 @@ first_weekday 2 END LC_TIME LC_NAME -% FIXME -copy "fr_FR" +name_fmt "%d%t%g%t%m%t%f" +name_mr "En" +name_mrs "Na" END LC_NAME -- 2.11.4.GIT