From 238d60a1fb5081450ca57d3e20f6c1c27df9afb5 Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@archlinux.org>
Date: Thu, 7 Mar 2019 17:40:02 +0800
Subject: [PATCH] localedata: Add Minguo calendar support to Taiwanese locales
 [BZ #24293]

Minguo calendar is the official calendar system, and very widely used in
Taiwan. This commit adds its support into glibc.

Some background information: The government website (www.gov.tw) uses it,
popular public services like Taiwan HSR also use this calendar system.

Link to Wikipedia: https://en.wikipedia.org/wiki/Minguo_calendar

        [BZ #24293]
        * localedata/locales/zh_TW (era): Add, support Minguo calendar.
        * localedata/locales/cmn_TW (era): Likewise.
        * localedata/locales/hak_TW (era): Likewise.
        * localedata/locales/lzh_TW (era): Likewise.
        * localedata/locales/nan_TW (era): Likewise.
---
 ChangeLog                 | 9 +++++++++
 localedata/locales/cmn_TW | 4 ++++
 localedata/locales/hak_TW | 4 ++++
 localedata/locales/lzh_TW | 4 ++++
 localedata/locales/nan_TW | 4 ++++
 localedata/locales/zh_TW  | 4 ++++
 6 files changed, 29 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f422a7e308..73420219f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2019-03-15  Felix Yan  <felixonmars@archlinux.org>
+
+	[BZ #24293]
+	* localedata/locales/zh_TW (era): Add, support Minguo calendar.
+	* localedata/locales/cmn_TW (era): Likewise.
+	* localedata/locales/hak_TW (era): Likewise.
+	* localedata/locales/lzh_TW (era): Likewise.
+	* localedata/locales/nan_TW (era): Likewise.
+
 2019-03-14  Florian Weimer  <fweimer@redhat.com>
 
 	Remove obsolete, never-implemented XSI STREAMS declarations.
diff --git a/localedata/locales/cmn_TW b/localedata/locales/cmn_TW
index cca7cc19af..9d9aca0f9e 100644
--- a/localedata/locales/cmn_TW
+++ b/localedata/locales/cmn_TW
@@ -119,6 +119,10 @@ am_pm         "<U4E0A><U5348>";/
 t_fmt_ampm    "%p %I<U9EDE>%M<U5206>%S<U79D2>"
 % %Y年 %b %-d號 %A %H:%M:%S %Z
 date_fmt      "%Y<U5E74> %b %-d<U865F> %A %H:%M:%S %Z"
+
+era "+:2:1913//01//01:+*:<U6C11><U570B>:%EC%Ey<U5E74>";/
+    "+:1:1912//01//01:1912//12//31:<U6C11><U570B>:%EC<U5143><U5E74>";/
+    "+:1:1911//12//31:-*:<U6C11><U524D>:%EC%Ey<U5E74>"
 END LC_TIME
 
 LC_NUMERIC
diff --git a/localedata/locales/hak_TW b/localedata/locales/hak_TW
index f62937e91b..ec86e985d1 100644
--- a/localedata/locales/hak_TW
+++ b/localedata/locales/hak_TW
@@ -116,6 +116,10 @@ t_fmt_ampm    "%p %I<U9EDE>%M<U5206>%S<U79D2>"
 % %Y年 %b %e日 %A %H:%M:%S %Z
 date_fmt      "%Y<U5E74> %b %e<U65E5> %A %H:%M:%S %Z"
 week 7;19971130;1
+
+era "+:2:1913//01//01:+*:<U6C11><U570B>:%EC%Ey<U5E74>";/
+    "+:1:1912//01//01:1912//12//31:<U6C11><U570B>:%EC<U5143><U5E74>";/
+    "+:1:1911//12//31:-*:<U6C11><U524D>:%EC%Ey<U5E74>"
 END LC_TIME
 
 LC_NUMERIC
diff --git a/localedata/locales/lzh_TW b/localedata/locales/lzh_TW
index 9654463d42..4740418a83 100644
--- a/localedata/locales/lzh_TW
+++ b/localedata/locales/lzh_TW
@@ -150,6 +150,10 @@ alt_digits    "<U3007>";/
             "<U5345><U4E00>"
 %
 week 7;19971130;1
+
+era "+:2:1913//01//01:+*:<U6C11><U570B>:%EC%Ey<U5E74>";/
+    "+:1:1912//01//01:1912//12//31:<U6C11><U570B>:%EC<U5143><U5E74>";/
+    "+:1:1911//12//31:-*:<U6C11><U524D>:%EC%Ey<U5E74>"
 END LC_TIME
 
 LC_NUMERIC
diff --git a/localedata/locales/nan_TW b/localedata/locales/nan_TW
index f5bc5d1642..0f19c66c86 100644
--- a/localedata/locales/nan_TW
+++ b/localedata/locales/nan_TW
@@ -117,6 +117,10 @@ t_fmt_ampm    "%p %I<U9EDE>%M<U5206>%S<U79D2>"
 % %Y年 %b %e日 %A %H:%M:%S %Z
 date_fmt      "%Y<U5E74> %b %e<U65E5> %A %H:%M:%S %Z"
 week 7;19971130;1
+
+era "+:2:1913//01//01:+*:<U6C11><U570B>:%EC%Ey<U5E74>";/
+    "+:1:1912//01//01:1912//12//31:<U6C11><U570B>:%EC<U5143><U5E74>";/
+    "+:1:1911//12//31:-*:<U6C11><U524D>:%EC%Ey<U5E74>"
 END LC_TIME
 
 LC_NUMERIC
diff --git a/localedata/locales/zh_TW b/localedata/locales/zh_TW
index 92b04b083d..b869dec317 100644
--- a/localedata/locales/zh_TW
+++ b/localedata/locales/zh_TW
@@ -126,6 +126,10 @@ am_pm	"<U4E0A><U5348>";"<U4E0B><U5348>"
 % t_fmt_ampm: "%p %I<h>%M<m>%S<s>"
 t_fmt_ampm  "%p %I<U6642>%M<U5206>%S<U79D2>"
 week 7;19971130;1
+
+era "+:2:1913//01//01:+*:<U6C11><U570B>:%EC%Ey<U5E74>";/
+    "+:1:1912//01//01:1912//12//31:<U6C11><U570B>:%EC<U5143><U5E74>";/
+    "+:1:1911//12//31:-*:<U6C11><U524D>:%EC%Ey<U5E74>"
 END LC_TIME
 
 LC_MESSAGES
-- 
2.43.5