Jakub Wilk <jw...@jwilk.net> writes: > The locales_with_principal_territory table in > gettext-tools/src/msginit.c includes two items with country codes that > have been deleted from ISO 3166-1: > > "pap_AN", /* Papiamento Netherlands Antilles */ > "sr_YU", /* Serbian Yugoslavia - this line can be removed in 2010 > */ > > As the comment says. the sr_YU entry should be removed. > > I'm not sure about the pap_AN entry; it should be either removed too, > or scheduled for removal at some point in the future.
Thanks, I've installed the attached change. For "pap_AN", I noted that it can be removed in 2018, when a five-year transitional period passes after the withdrawal of ISO 3166-1:2006. As I'm not an expert in that area, let me know if the comment is not reasonable. Regards, -- Daiki Ueno
>From 10b11a8df22090e23a10314219f838d6dbc3f4f0 Mon Sep 17 00:00:00 2001 From: Daiki Ueno <u...@gnu.org> Date: Mon, 29 Jun 2015 11:44:52 +0900 Subject: [PATCH] msginit: Remove obsolete country codes * gettext-tools/src/msginit.c (catalogname_for_locale): Remove sr_YU, which were removed from ISO 3166-1:1997. Add comment saying that pap_AN, which were removed from ISO 3166-1:2006, can be removed in the future. Reported by Jakub Wilk in: <https://lists.gnu.org/archive/html/bug-gettext/2015-06/msg00057.html>. --- gettext-tools/src/ChangeLog | 9 +++++++++ gettext-tools/src/msginit.c | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index ad56f27..85c7f61 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,12 @@ +2015-06-29 Daiki Ueno <u...@gnu.org> + + * msginit.c (catalogname_for_locale): Remove sr_YU, which were + removed from ISO 3166-1:1997. Add comment saying that pap_AN, + which were removed from ISO 3166-1:2006, can be removed in the + future. + Reported by Jakub Wilk in: + <https://lists.gnu.org/archive/html/bug-gettext/2015-06/msg00057.html>. + 2015-06-25 Daiki Ueno <u...@gnu.org> * x-c.c (literalstring_parse): Bail out if C == NUL. Also adjust diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c index c5a3ce1..f85b83c 100644 --- a/gettext-tools/src/msginit.c +++ b/gettext-tools/src/msginit.c @@ -649,7 +649,7 @@ catalogname_for_locale (const char *locale) "pa_IN", /* Punjabi India */ "pag_PH", /* Pangasinan Philippines */ "pam_PH", /* Pampanga Philippines */ - "pap_AN", /* Papiamento Netherlands Antilles */ + "pap_AN", /* Papiamento Netherlands Antilles - this line can be removed in 2018 */ "pbb_CO", /* Páez Colombia */ "pl_PL", /* Polish Poland */ "ps_AF", /* Pashto Afghanistan */ @@ -676,7 +676,6 @@ catalogname_for_locale (const char *locale) "so_SO", /* Somali Somalia */ "sq_AL", /* Albanian Albania */ "sr_RS", /* Serbian Serbia */ - "sr_YU", /* Serbian Yugoslavia - this line can be removed in 2010 */ "srr_SN", /* Serer Senegal */ "suk_TZ", /* Sukuma Tanzania */ "sus_GN", /* Susu Guinea */ -- 2.4.2
