This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH v2] Fix Country name for xh_ZA
- From: Mike FABIAN <mfabian at redhat dot com>
- To: Akhilesh Kumar <akhilesh dot k at samsung dot com>
- Cc: libc-alpha at sourceware dot org
- Date: Thu, 17 Aug 2017 10:02:36 +0200
- Subject: Re: [PATCH v2] Fix Country name for xh_ZA
- Authentication-results: sourceware.org; auth=none
- 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 at redhat dot com
- Dmarc-filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8C8479014D
- References: <CGME20170816123644epcas5p3402705653868eb7053f41ed8871c3cfd@epcas5p3.samsung.com> <1502886713-32937-1-git-send-email-akhilesh.k@samsung.com>
Akhilesh Kumar <akhilesh.k@samsung.com> 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 "<U004D><U007A><U0061><U006E><U0074><U0073><U0069><U0020>/
> -<U0041><U0066><U0072><U0069><U006B><U0061>"
> +% 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 "<U004D><U007A><U0061><U006E><U0074><U0073><U0069><U0020>/
-<U0041><U0066><U0072><U0069><U006B><U0061>"
+% https://xh.wikipedia.org/wiki/UMzantsi_Afrika
+country_name "UMzantsi Afrika"
%
% Abbreviated country postal name - "ZA"
country_post "<U005A><U0041>"
--
Mike FABIAN <mfabian@redhat.com>