This patch adds support for el_GR@euro. It also updates el_GR, ur_IN and wal_ET to i18n:2012. These changes are a *subset* of this upstream patch and, therefore, should not be pushed upstream. commit 1a06eee86989d7058d317f3643355f8ec5e87efb Author: Mike Frysinger Date: Wed Apr 13 11:22:00 2016 -0400 localedata: LC_IDENTIFICATION.category: set to ISO 30112 2014 standard The ISO 30112 standard defines the valid values for the category keyword as only a few options: posix:1993 i18n:2004 i18n:2012 The vast majority of locales had changed the "i18n" string to the name of its own locale (e.g. "ak_GH:2013") as well as tweaking the date (presumably thinking it should be the date of submission). Convert all of them to "i18n:2012" for consistency. A follow up change will update localedef to actually check/validate the field. diff -Nrup a/localedata/locales/el_GR b/localedata/locales/el_GR --- a/localedata/locales/el_GR 2012-12-24 22:02:13.000000000 -0500 +++ b/localedata/locales/el_GR 2018-06-10 10:23:23.156283677 -0400 @@ -1,6 +1,13 @@ comment_char % -escape_char / -% +escape_char / + +% This file is part of the GNU C Library and contains locale data. +% The Free Software Foundation does not claim any copyright interest +% in the locale data contained in this file. The foregoing does not +% affect the license of the GNU C Library as a whole. It does not +% exempt you from the conditions of the license if your use would +% otherwise be governed by that license. + % Greek Language Locale for Greece % Source: RAP % Address: Sankt Jo//rgens Alle 8 @@ -15,8 +22,6 @@ escape_char / % Date: 1996-10-15 % Users: general % Charset: ISO-8859-7 -% Distribution and use is free, also -% for commercial purposes. LC_IDENTIFICATION title "Greek locale for Greece" @@ -30,19 +35,19 @@ language "Greek" territory "Greece" revision "1.0" date "2000-06-29" -% -category "el_GR:2000";LC_IDENTIFICATION -category "el_GR:2000";LC_CTYPE -category "el_GR:2000";LC_COLLATE -category "el_GR:2000";LC_TIME -category "el_GR:2000";LC_NUMERIC -category "el_GR:2000";LC_MONETARY -category "el_GR:2000";LC_MESSAGES -category "el_GR:2000";LC_PAPER -category "el_GR:2000";LC_NAME -category "el_GR:2000";LC_ADDRESS -category "el_GR:2000";LC_TELEPHONE +category "i18n:2012";LC_IDENTIFICATION +category "i18n:2012";LC_CTYPE +category "i18n:2012";LC_COLLATE +category "i18n:2012";LC_TIME +category "i18n:2012";LC_NUMERIC +category "i18n:2012";LC_MONETARY +category "i18n:2012";LC_MESSAGES +category "i18n:2012";LC_PAPER +category "i18n:2012";LC_NAME +category "i18n:2012";LC_ADDRESS +category "i18n:2012";LC_TELEPHONE +category "i18n:2012";LC_MEASUREMENT END LC_IDENTIFICATION LC_COLLATE @@ -58,8 +63,10 @@ translit_end END LC_CTYPE LC_MESSAGES -yesexpr "" -noexpr "" +yesexpr "" +noexpr "" +yesstr "" +nostr "" END LC_MESSAGES LC_MONETARY @@ -139,15 +146,12 @@ t_fmt_ampm " % % Appropriate date representation (date(1)) "%a %d %b %Y %r %Z" date_fmt "" -first_workday 2 +week 7;19971130;4 first_weekday 2 END LC_TIME LC_PAPER -% FIXME -height 297 -% FIXME -width 210 +copy "i18n" END LC_PAPER LC_TELEPHONE @@ -158,8 +162,7 @@ int_select "" END LC_TELEPHONE LC_MEASUREMENT -% FIXME -measurement 1 +copy "i18n" END LC_MEASUREMENT LC_NAME @@ -173,7 +176,18 @@ postal_fmt "/ / " +country_name "" country_ab2 "" country_ab3 "" country_num 300 +% GR +country_car "" +% ελληνικά +lang_name "" +% el +lang_ab "" +% ell +lang_term "" +% gre +lang_lib "" END LC_ADDRESS diff -Nrup a/localedata/locales/el_GR@euro b/localedata/locales/el_GR@euro --- a/localedata/locales/el_GR@euro 2012-12-24 22:02:13.000000000 -0500 +++ b/localedata/locales/el_GR@euro 2018-06-08 14:34:49.809871475 -0400 @@ -1,5 +1,12 @@ -escape_char / comment_char % +escape_char / + +% This file is part of the GNU C Library and contains locale data. +% The Free Software Foundation does not claim any copyright interest +% in the locale data contained in this file. The foregoing does not +% affect the license of the GNU C Library as a whole. It does not +% exempt you from the conditions of the license if your use would +% otherwise be governed by that license. LC_IDENTIFICATION title "Greek locale for Greece with Euro" @@ -13,19 +20,19 @@ language "Greek" territory "Greece" revision "1.0" date "2000-06-24" -% -category "el_GR@euro:2000";LC_IDENTIFICATION -category "el_GR@euro:2000";LC_CTYPE -category "el_GR@euro:2000";LC_COLLATE -category "el_GR@euro:2000";LC_TIME -category "el_GR@euro:2000";LC_NUMERIC -category "el_GR@euro:2000";LC_MONETARY -category "el_GR@euro:2000";LC_MESSAGES -category "el_GR@euro:2000";LC_PAPER -category "el_GR@euro:2000";LC_NAME -category "el_GR@euro:2000";LC_ADDRESS -category "el_GR@euro:2000";LC_TELEPHONE +category "i18n:2012";LC_IDENTIFICATION +category "i18n:2012";LC_CTYPE +category "i18n:2012";LC_COLLATE +category "i18n:2012";LC_TIME +category "i18n:2012";LC_NUMERIC +category "i18n:2012";LC_MONETARY +category "i18n:2012";LC_MESSAGES +category "i18n:2012";LC_PAPER +category "i18n:2012";LC_NAME +category "i18n:2012";LC_ADDRESS +category "i18n:2012";LC_TELEPHONE +category "i18n:2012";LC_MEASUREMENT END LC_IDENTIFICATION LC_CTYPE @@ -63,7 +70,6 @@ LC_NAME copy "el_GR" END LC_NAME - LC_ADDRESS copy "el_GR" END LC_ADDRESS diff -Nrup a/localedata/locales/ur_IN b/localedata/locales/ur_IN --- a/localedata/locales/ur_IN 2018-06-08 14:15:14.876886162 -0400 +++ b/localedata/locales/ur_IN 2018-06-08 15:20:51.893461943 -0400 @@ -1,5 +1,13 @@ -comment_char % -escape_char / +comment_char % +escape_char / + +% This file is part of the GNU C Library and contains locale data. +% The Free Software Foundation does not claim any copyright interest +% in the locale data contained in this file. The foregoing does not +% affect the license of the GNU C Library as a whole. It does not +% exempt you from the conditions of the license if your use would +% otherwise be governed by that license. + % Urdu language locale for India. % Contributed by Pravin Satpute and % Mrs. Nasreen Khan @@ -17,20 +25,19 @@ language "Urdu" territory "India" revision "1.0" date "2009,June,09" -% -category "ur_IN:2009";LC_IDENTIFICATION -category "ur_IN:2009";LC_CTYPE -category "ur_IN:2009";LC_COLLATE -category "ur_IN:2009";LC_TIME -category "ur_IN:2009";LC_NUMERIC -category "ur_IN:2009";LC_MONETARY -category "ur_IN:2009";LC_MESSAGES -category "ur_IN:2009";LC_PAPER -category "ur_IN:2009";LC_NAME -category "ur_IN:2009";LC_ADDRESS -category "ur_IN:2009";LC_TELEPHONE - +category "i18n:2012";LC_IDENTIFICATION +category "i18n:2012";LC_CTYPE +category "i18n:2012";LC_COLLATE +category "i18n:2012";LC_TIME +category "i18n:2012";LC_NUMERIC +category "i18n:2012";LC_MONETARY +category "i18n:2012";LC_MESSAGES +category "i18n:2012";LC_PAPER +category "i18n:2012";LC_NAME +category "i18n:2012";LC_ADDRESS +category "i18n:2012";LC_TELEPHONE +category "i18n:2012";LC_MEASUREMENT END LC_IDENTIFICATION @@ -132,20 +139,15 @@ t_fmt "/ " -% -% Appropriate date representation (date(1)) "%a %b %e %H:%M:%S %Z %Y" -date_fmt "/ -/ -" +week 7;19971130;1 END LC_TIME LC_MESSAGES -yesexpr "" -noexpr "" - -yesstr "" -nostr "" +yesexpr "" +noexpr "" +yesstr "" +nostr "" END LC_MESSAGES @@ -170,7 +172,20 @@ END LC_NAME LC_ADDRESS -copy "hi_IN" +postal_fmt "/ +" +country_name "" +country_ab2 "" +country_ab3 "" +country_num 356 +% IND +country_car "" +% ur +lang_ab "" +% urd +lang_term "" +% urd +lang_lib "" END LC_ADDRESS diff -Nrup a/localedata/locales/wal_ET b/localedata/locales/wal_ET --- a/localedata/locales/wal_ET 2012-12-24 22:02:13.000000000 -0500 +++ b/localedata/locales/wal_ET 2018-06-08 14:34:16.440637977 -0400 @@ -1,10 +1,16 @@ -comment_char % -escape_char / +comment_char % +escape_char / +% This file is part of the GNU C Library and contains locale data. +% The Free Software Foundation does not claim any copyright interest +% in the locale data contained in this file. The foregoing does not +% affect the license of the GNU C Library as a whole. It does not +% exempt you from the conditions of the license if your use would +% otherwise be governed by that license. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Sidama language locale for Ethiopia. +% Walaita language locale for Ethiopia. % % Charset: UTF-8 % @@ -27,24 +33,23 @@ contact "" email "locales@geez.org" tel "" fax "" -language "wal" -territory "ET" +language "Wolaytta" +territory "Ethiopia" revision "0.10" date "2004-04-25" -% -category "i18n:2000";LC_IDENTIFICATION -category "i18n:2000";LC_COLLATE -category "i18n:2000";LC_CTYPE -category "i18n:2000";LC_MEASUREMENT -category "i18n:2000";LC_MONETARY -category "posix:1993";LC_NUMERIC -category "i18n:2000";LC_PAPER -category "i18n:2000";LC_TELEPHONE -category "i18n:2000";LC_ADDRESS -category "i18n:2000";LC_MESSAGES -category "i18n:2000";LC_NAME -category "i18n:2000";LC_TIME -% + +category "i18n:2012";LC_IDENTIFICATION +category "i18n:2012";LC_COLLATE +category "i18n:2012";LC_CTYPE +category "i18n:2012";LC_MEASUREMENT +category "i18n:2012";LC_MONETARY +category "i18n:2012";LC_NUMERIC +category "i18n:2012";LC_PAPER +category "i18n:2012";LC_TELEPHONE +category "i18n:2012";LC_ADDRESS +category "i18n:2012";LC_MESSAGES +category "i18n:2012";LC_NAME +category "i18n:2012";LC_TIME END LC_IDENTIFICATION @@ -65,7 +70,7 @@ END LC_CTYPE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Ethiopia Specifc and Shared Data: +% Ethiopia Specific and Shared Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -92,7 +97,7 @@ END LC_TELEPHONE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Sidama Specific Data: +% Walaita Specific Data: % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -107,14 +112,12 @@ country_post "" country_ab2 "" country_ab3 "" country_num 231 % 210 found in at least one ISO 3166 doc -% country_car unknown +% ETH +country_car "" % country_isbn unknown, Need ISO 2108 lang_name "" lang_term "" lang_lib "" - - -% END LC_ADDRESS @@ -232,5 +235,5 @@ date_fmt "/ / " +week 7;19971130;1 END LC_TIME -% diff -Nrup a/localedata/SUPPORTED b/localedata/SUPPORTED --- a/localedata/SUPPORTED 2018-06-08 14:15:13.059877630 -0400 +++ b/localedata/SUPPORTED 2018-06-08 16:07:15.349302352 -0400 @@ -109,6 +109,7 @@ dv_MV/UTF-8 \ dz_BT/UTF-8 \ el_GR.UTF-8/UTF-8 \ el_GR/ISO-8859-7 \ +el_GR@euro/ISO-8859-7 \ el_CY.UTF-8/UTF-8 \ el_CY/ISO-8859-7 \ en_AG/UTF-8 \