summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin PAGÈS <provaires@quentino.fr>2018-05-19 17:59:08 +0200
committerRafal Luzynski <digitalfreak@lingonborough.com>2018-07-18 23:17:17 +0200
commitdf467d229ac53098d06ffd7b86322a1e22bf6013 (patch)
tree32147debe6eaedd71b0941a222365c902eb1e29e
parent5c112f1b62b6fca7348c64a004e9fc4cfdaca1ad (diff)
oc_FR locale: Multiple updates (bug 23140, bug 23422).
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 <carlos@redhat.com>
-rw-r--r--ChangeLog20
-rw-r--r--NEWS2
-rw-r--r--localedata/locales/oc_FR64
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 <provaires@quentino.fr>
+
+ [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 <joseph@codesourcery.com>
* grp/tst_fgetgrent.c: Include <unistd.h>.
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 "Fran<U00E7>a"
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";/
- "j<U00F2>u";"ven";/
- "sab"
+abday "dg.";"dl.";"dm.";"dc.";"dj.";"dv.";"ds."
day "dimenge";/
"diluns";/
"dimars";/
- "dimecres";/
+ "dim<U00E8>cres";/
"dij<U00F3>us";/
"divendres";/
- "disabte"
-abmon "gen";"feb";/
- "mar";"abr";/
- "mai";"jun";/
- "jul";"ago";/
- "set";"oct";/
- "nov";"dec"
-mon "geni<U00E8>r";/
+ "dissabte"
+abmon "gen.";/
+ "febr.";/
+ "mar<U00E7>";/
+ "abr.";/
+ "mai";/
+ "junh";/
+ "jul.";/
+ "ago.";/
+ "set.";/
+ "oct.";/
+ "nov.";/
+ "dec."
+alt_mon "geni<U00E8>r";/
"febri<U00E8>r";/
"mar<U00E7>";/
"abrial";/
@@ -113,11 +116,23 @@ mon "geni<U00E8>r";/
"julhet";/
"agost";/
"setembre";/
- "octobre";/
+ "oct<U00F2>bre";/
"novembre";/
"decembre"
+mon "de geni<U00E8>r";/
+ "de febri<U00E8>r";/
+ "de mar<U00E7>";/
+ "d<U2019>abrial";/
+ "de mai";/
+ "de junh";/
+ "de julhet";/
+ "d<U2019>agost";/
+ "de setembre";/
+ "d<U2019>oct<U00F2>bre";/
+ "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