From patchwork Thu Aug 17 08:02:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mike FABIAN X-Patchwork-Id: 802413 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-83311-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="tcTHUCoV"; dkim-atps=neutral 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 3xXzGf0QRxz9t3Z for ; Thu, 17 Aug 2017 18:02:49 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type:content-transfer-encoding; q=dns; s=default; b=WRV2NYFoFpFquqlQWq5tJ9Rcup86LB0JdNOJjaRj/3t FmO1XIJD89OtjAMOn9QPPKTKncwg6rINNpOUAuB178cEMbxCxAeHdnu8UzlCxd/s /hU+wWgbAueZHeTcMvC1rnS3T/GLPxLs9Efq9vfE+3q4OAwwVRX22uPxrPMc9GHE = 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:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type:content-transfer-encoding; s=default; bh=zCrycEwLRrmvlFcR5vYkQqIhQTY=; b=tcTHUCoVMx0nKOhXE Xyl10acMFYm8q/0lAfqS+GsiKz6ZhA03r/2dKZQ/ZOLS9RVfSCm6IdelCESijqfi 3irZXYhv4aDbQK+pEtnugg4U+lQ5RgKQCs80TBD2N+hZyEwwDaWRps4q3QUuFdkj y5XTOs9cH/fNytm5ZW/dGq6H14= Received: (qmail 28452 invoked by alias); 17 Aug 2017 08:02:42 -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 28430 invoked by uid 89); 17 Aug 2017 08:02:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS, T_FILL_THIS_FORM_SHORT autolearn=ham version=3.3.2 spammy=Hx-languages-length:1785, Country X-HELO: mx1.redhat.com DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8C8479014D Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=mfabian@redhat.com From: Mike FABIAN To: Akhilesh Kumar Cc: libc-alpha@sourceware.org Subject: Re: [PATCH v2] Fix Country name for xh_ZA References: <1502886713-32937-1-git-send-email-akhilesh.k@samsung.com> Date: Thu, 17 Aug 2017 10:02:36 +0200 In-Reply-To: <1502886713-32937-1-git-send-email-akhilesh.k@samsung.com> (Akhilesh Kumar's message of "Wed, 16 Aug 2017 18:01:53 +0530") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) MIME-Version: 1.0 Akhilesh Kumar wrote: > [BZ #21959] > locales/xh_ZA: Fix country_name > > --- > localedata/locales/xh_ZA | 5 ++--- > localedata/locales/zu_ZA | 4 ++-- > 2 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/localedata/locales/xh_ZA b/localedata/locales/xh_ZA > index e01a620..8fb69da 100644 > --- a/localedata/locales/xh_ZA > +++ b/localedata/locales/xh_ZA > @@ -217,9 +217,8 @@ name_ms "" > END LC_NAME > > LC_ADDRESS > -% Country name in Xhosa - "Mzantsi Afrika" > -country_name "/ > -" > +% https://xh.wikipedia.org/wiki/UMzantsi_Afrika > +country_name "UMzantsi Afrika" > % > % Abbreviated country postal name - "ZA" Your patch doesn’t apply, it is one line too short: $ git am akhilesh-kumar.mbox Applying: Fix Country name for xh_ZA error: corrupt patch at line 22 Patch failed at 0001 Fix Country name for xh_ZA It should look like this, then it would apply: [BZ #21959] locales/xh_ZA: Fix country_name --- localedata/locales/xh_ZA | 5 ++--- localedata/locales/zu_ZA | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/localedata/locales/xh_ZA b/localedata/locales/xh_ZA index e01a620..8fb69da 100644 --- a/localedata/locales/xh_ZA +++ b/localedata/locales/xh_ZA @@ -217,9 +217,8 @@ name_ms "" END LC_NAME LC_ADDRESS -% Country name in Xhosa - "Mzantsi Afrika" -country_name "/ -" +% https://xh.wikipedia.org/wiki/UMzantsi_Afrika +country_name "UMzantsi Afrika" % % Abbreviated country postal name - "ZA" country_post ""