summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2015-06-29 11:44:52 +0900
committerDaiki Ueno <ueno@gnu.org>2015-06-29 11:46:41 +0900
commit10b11a8df22090e23a10314219f838d6dbc3f4f0 (patch)
treec89b5ae1fc491181e25cd343985107351f269976
parent11ad7fcdb858c83d7aed5245761f2bc6f856980d (diff)
downloadexternal_gettext-10b11a8df22090e23a10314219f838d6dbc3f4f0.zip
external_gettext-10b11a8df22090e23a10314219f838d6dbc3f4f0.tar.gz
external_gettext-10b11a8df22090e23a10314219f838d6dbc3f4f0.tar.bz2
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>.
-rw-r--r--gettext-tools/src/ChangeLog9
-rw-r--r--gettext-tools/src/msginit.c3
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 <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 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 */