summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2019-05-04 14:58:11 (GMT)
committerKevin B Kenny <kennykb@acm.org>2019-05-04 14:58:11 (GMT)
commit951df2e52aa490d31e63ab402c038a8f3370a904 (patch)
tree58212e27e83aebc6a6c6c4737f592d7fc4abc3d4
parenta35dd1803660e9f68391c597e20b3c0f72e320ad (diff)
downloadtcl-951df2e52aa490d31e63ab402c038a8f3370a904.zip
tcl-951df2e52aa490d31e63ab402c038a8f3370a904.tar.gz
tcl-951df2e52aa490d31e63ab402c038a8f3370a904.tar.bz2
Japanese Reiwa (令和) era
-rw-r--r--library/msgs/ja.msg2
-rw-r--r--tests/clock.test22
2 files changed, 13 insertions, 11 deletions
diff --git a/library/msgs/ja.msg b/library/msgs/ja.msg
index 76b5fa4..dac690b 100644
--- a/library/msgs/ja.msg
+++ b/library/msgs/ja.msg
@@ -40,5 +40,5 @@ namespace eval ::tcl::clock {
::msgcat::mcset ja LOCALE_DATE_FORMAT "%EY年%m月%d日"
::msgcat::mcset ja LOCALE_TIME_FORMAT "%H時%M分%S秒"
::msgcat::mcset ja LOCALE_DATE_TIME_FORMAT "%EY年%m月%d日 (%a) %H時%M分%S秒 %z"
- ::msgcat::mcset ja LOCALE_ERAS "{-9223372036854775808 西暦 0} {-3061011600 明治 1867} {-1812186000 大正 1911} {-1357635600 昭和 1925} {600220800 平成 1988}"
+ ::msgcat::mcset ja LOCALE_ERAS "{-9223372036854775808 西暦 0} {-3061011600 明治 1867} {-1812186000 大正 1911} {-1357635600 昭和 1925} {600220800 平成 1988} {1556668800 令和 2018}"
}
diff --git a/tests/clock.test b/tests/clock.test
index b17c543..8d73bf2 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -36707,16 +36707,18 @@ test clock-58.1 {clock l10n - Japanese localisation} {*}{
}
-body {
set trouble {}
- foreach {date jdate} [list \
- 1872-12-31 \u897f\u66a61872\u5e7412\u670831\u65e5 \
- 1873-01-01 \u660e\u6cbb06\u5e7401\u670801\u65e5 \
- 1912-07-29 \u660e\u6cbb45\u5e7407\u670829\u65e5 \
- 1912-07-30 \u5927\u6b6301\u5e7407\u670830\u65e5 \
- 1926-12-24 \u5927\u6b6315\u5e7412\u670824\u65e5 \
- 1926-12-25 \u662d\u548c01\u5e7412\u670825\u65e5 \
- 1989-01-07 \u662d\u548c64\u5e7401\u670807\u65e5 \
- 1989-01-08 \u5e73\u621001\u5e7401\u670808\u65e5 \
- ] {
+ foreach {date jdate} {
+ 1872-12-31 \u897f\u66a61872\u5e7412\u670831\u65e5
+ 1873-01-01 \u660e\u6cbb06\u5e7401\u670801\u65e5
+ 1912-07-29 \u660e\u6cbb45\u5e7407\u670829\u65e5
+ 1912-07-30 \u5927\u6b6301\u5e7407\u670830\u65e5
+ 1926-12-24 \u5927\u6b6315\u5e7412\u670824\u65e5
+ 1926-12-25 \u662d\u548c01\u5e7412\u670825\u65e5
+ 1989-01-07 \u662d\u548c64\u5e7401\u670807\u65e5
+ 1989-01-08 \u5e73\u621001\u5e7401\u670808\u65e5
+ 2019-04-30 \u5e73\u621031\u5e7404\u670830\u65e5
+ 2019-05-01 \u4ee4\u548c01\u5e7405\u670801\u65e5
+ } {
set status [catch {
set secs [clock scan $date \
-timezone +0900 \