From patchwork Mon Mar 24 03:52:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Conrad X-Patchwork-Id: 332952 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7D72C2C00B2 for ; Mon, 24 Mar 2014 14:52:49 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=D/tRJB8C+nwsc2D6U0d9gwlXckbq5 govIv8RniInPpHDWpfFiVfjrkEzPGMii+KCBOqcgjJ+gccf641l7xJiNYu3UoQlT ryZSky3HWIfV+ip3GBp+WzFWJoRBUit0xKCJBTYeAyQ1Qiz5i4lOMVSVPYDbe7f9 HkFI3XZYYztslo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=yYvwHN6TPpEFQBzrdpjfUVtRSHg=; b=odD uSUcZC4dSfrfvQ01aipq6dEOkFSUwQ9o2t55M4tlZdCNStbnKyWCV9d65Ca1bm5K ZYlHrncpbT8G5r0qtvWoHvujm2IO44jfwWTKO3fFMuLJc45IRL31g4NHi3W1u4Kt 1hz8ylUtQSs7Tb49n31Ng9xrEjU9wjVP2NjInoww= Received: (qmail 19989 invoked by alias); 24 Mar 2014 03:52:43 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 19978 invoked by uid 89); 24 Mar 2014 03:52:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=2.1 required=5.0 tests=AWL, BAYES_50, FOREIGN_BODY1, RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: loki.0c3.net Date: Sun, 23 Mar 2014 21:52:39 -0600 From: Adam Conrad To: libc-alpha@sourceware.org Subject: [PATCH] Revert removal of XDR currency from locale/iso-4217.def Message-ID: <20140324035239.GG21819@0c3.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) In 7447ccd98ee3944a95247ae23284dfac1de6c2aa, the XDR currency was removed from locale/iso-4217.def, despite the fact that it's both still a part of the standard, according to the official table: http://www.currency-iso.org/dam/downloads/table_a1.xml ... and, more importantly, is referenced from localedata/i18n, so any quick-and-dirty locale definition that uses "copy i18n" for LC_MONETARY won't work anymore. Okay to commit? --- --- diff --git a/ChangeLog b/ChangeLog index 720183f..46ca8ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-03-23 Adam Conrad + + * locale/iso-4217.def: Reintroduce XDR currency. + 2014-03-21 Joseph Myers * sysdeps/mips/bits/wordsize.h: Include . diff --git a/locale/iso-4217.def b/locale/iso-4217.def index bcc170b..414f69b 100644 --- a/locale/iso-4217.def +++ b/locale/iso-4217.def @@ -162,6 +162,7 @@ DEFINE_INT_CURR("VUV") /* Vanuatu Vatu */ DEFINE_INT_CURR("WST") /* Samoa Tala */ DEFINE_INT_CURR("XAF") /* Central African Franc (United Republic of Cameroon, Central African Republic, Chad, Congo, Gabon) */ DEFINE_INT_CURR("XCD") /* East Caribbean Dollar (Antiqua, Dominica, Grenada, Montserrat, St. Kitts-Nevis-Anguilla, Saint Lucia, Saint Vincent and the Grenadines) */ +DEFINE_INT_CURR("XDR") /* International Monetary Fund */ DEFINE_INT_CURR("XOF") /* West African Franc (Benin, Ivory Coast, Niger, Senegal, Togo, Upper Volta) */ DEFINE_INT_CURR("XPF") /* French polynesia, New Caledonia, Wallis and Futuna Islands */ DEFINE_INT_CURR("YER") /* Yemeni Rial */