oc_FR locale: Multiple updates (bug 23140, bug 23422).
Commit Message
Please review (CC: Carlos, as requested.)
This patch actually fixes two bugs because it is difficult to
split and attribute some of the changes to one or another bug.
Especially I will appreciate the corrections of the metadata
(commit comment, NEWS, etc.)
I am not sure if the author of the changes wants to be referred to
as "Los Provaires" because I guess this is a nick name. This may
be changed later if I receive any update before the final push.
OK for 2.28?
Regards,
Rafal
Comments
On 07/18/2018 06:48 AM, Rafal Luzynski wrote:
> Please review (CC: Carlos, as requested.)
>
> This patch actually fixes two bugs because it is difficult to
> split and attribute some of the changes to one or another bug.
>
> Especially I will appreciate the corrections of the metadata
> (commit comment, NEWS, etc.)
>
> I am not sure if the author of the changes wants to be referred to
> as "Los Provaires" because I guess this is a nick name. This may
> be changed later if I receive any update before the final push.
>
> OK for 2.28?
Please commit for 2.28.
You updated NEWS, which is good, and please don't forget to mark the
bugs with milestone for 2.28.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
> Regards,
>
> Rafal
>
>
> 0001-oc_FR-locale-Multiple-updates-bug-23140-bug-23422.patch
>
>
> From 9dcb6d369267ba2717f5d599f788a97783e805b2 Mon Sep 17 00:00:00 2001
> From: Los Provaires <provaires@quentino.fr>
> 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=UTF-8
> 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,
> use “copy "ca_ES"” as LC_COLLATE, and improve indentation.
>
> [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): All items updated.
> (day): Wednesday and Saturday updated (typo fixes).
> (abmon): Update all items, except May.
> (d_fmt): Updated "%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".
> ---
> NEWS | 2 +-
> localedata/locales/oc_FR | 64 ++++++++++++++++++++++++++++++------------------
> 2 files changed, 41 insertions(+), 25 deletions(-)
>
> diff --git a/NEWS b/NEWS
> index c2896a7..ef096e0 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -36,7 +36,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 d8c60a2..707927e 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
> -- 2.7.5
18.07.2018 15:35 Carlos O'Donell <carlos@redhat.com> wrote:
> On 07/18/2018 06:48 AM, Rafal Luzynski wrote:
> > [...]
> > I am not sure if the author of the changes wants to be referred to
> > as "Los Provaires" because I guess this is a nick name. This may
> > be changed later if I receive any update before the final push.
> >
> > OK for 2.28?
>
> Please commit for 2.28.
>
> You updated NEWS, which is good,
Thank you, it's pushed now with some improvements of the commit comment
+ the original author has agreed to use his name.
> and please don't forget to mark the
> bugs with milestone for 2.28.
That's what I always do, as far as I am aware. Please ping me if I forget
or just fix the issue.
I can't promise I will not have any other patches in the following days
but at least those two bugs are fixed.
Regards,
Rafal
From 9dcb6d369267ba2717f5d599f788a97783e805b2 Mon Sep 17 00:00:00 2001
From: Los Provaires <provaires@quentino.fr>
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=UTF-8
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,
use “copy "ca_ES"†as LC_COLLATE, and improve indentation.
[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): All items updated.
(day): Wednesday and Saturday updated (typo fixes).
(abmon): Update all items, except May.
(d_fmt): Updated "%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".
---
NEWS | 2 +-
localedata/locales/oc_FR | 64 ++++++++++++++++++++++++++++++------------------
2 files changed, 41 insertions(+), 25 deletions(-)
@@ -36,7 +36,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.
@@ -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
--
2.7.5