[v2] Fix Country name for xh_ZA

Message ID s9d60dmoc4j.fsf@redhat.com
State Not applicable
Delegated to: Mike Fabian
Headers

Commit Message

Mike FABIAN Aug. 17, 2017, 8:02 a.m. UTC
  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(-)
  

Patch

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