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>.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index ad56f27e0ffdf02bdd66a73bab5a34a1c0ee46a4..85c7f61f7d2143bacbf2744abcc55eeef57702f2 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,12 @@
+2015-06-29  Daiki Ueno  <ueno@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  <ueno@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 c5a3ce1f60c57056d872fb1a2beb0c972b472646..f85b83c2e45c385262f08fa14213de978c377049 100644 (file)
--- 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 */