]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
localedata: Add Minguo calendar support to Taiwanese locales [BZ #24293]
authorFelix Yan <felixonmars@archlinux.org>
Thu, 7 Mar 2019 09:40:02 +0000 (17:40 +0800)
committerRafal Luzynski <digitalfreak@lingonborough.com>
Fri, 15 Mar 2019 09:08:37 +0000 (10:08 +0100)
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
localedata/locales/cmn_TW
localedata/locales/hak_TW
localedata/locales/lzh_TW
localedata/locales/nan_TW
localedata/locales/zh_TW

index f422a7e308fe406d956a9403046f4f18bd433ad1..73420219f664ab464c09d1569908dff089621ea9 100644 (file)
--- 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.
index cca7cc19af41d49f88762c648900e546db85ec0a..9d9aca0f9e2a40f0b7e8fa38074ae0c79fc81658 100644 (file)
@@ -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
index f62937e91b634416e64cad83dbceb378c143ec54..ec86e985d1a926a98b8661fa7bcf8f806f335202 100644 (file)
@@ -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
index 9654463d426b1f8143affaeea317d2ebd877a454..4740418a83a32cedb4eb9fa3bafc5585b795924b 100644 (file)
@@ -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
index f5bc5d1642c2ce9b1e1e48254747e5bc67464041..0f19c66c860d33c2c54578093d09a9e2e56d0a70 100644 (file)
@@ -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
index 92b04b083db9e0f202cb6d75af712120aaefea1b..b869dec317012bb303f3a3c5137807c7ce9c202a 100644 (file)
@@ -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