Commit ff64fdd1e8a8623c87468a12404312103df022e4 - mozc

Add support new Japanese era (LP: #1823444) Gunnar Hjalmarsson 5 years ago

2 changed file(s) with 84 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all

+83

-0

debian/patches/add_support_new_japanese_era.patch less more

	0	Description: Add support new Japanese era
	1	Bug-Ubuntu: https://bugs.launchpad.net/mozc/+bug/1823444
	2	Author: Mitsuya Shibata <mty.shibata@gmail.com>
	3
	4	Index: mozc-2.23.2815.102+dfsg/src/data/dictionary_oss/dictionary08.txt
	5	===================================================================
	6	--- mozc-2.23.2815.102+dfsg.orig/src/data/dictionary_oss/dictionary08.txt
	7	+++ mozc-2.23.2815.102+dfsg/src/data/dictionary_oss/dictionary08.txt
	8	@@ -8591,6 +8591,8 @@
	9	れいれいと 12 12 7349 れいれいと
	10	れいろう 1847 1847 7276 玲瓏
	11	れいわ 1847 1847 8251 例話
	12	+れいわ 1895 1895 1690 令和
	13	+れいわ 1898 1898 4000 令和
	14	れいんこーと 1847 1847 5568 レインコート
	15	れいんじゃー 1847 1847 7459 レインジャー
	16	れいんず 1917 1917 3548 レインズ
	17	Index: mozc-2.23.2815.102+dfsg/src/data/symbol/symbol.tsv
	18	===================================================================
	19	--- mozc-2.23.2815.102+dfsg.orig/src/data/symbol/symbol.tsv
	20	+++ mozc-2.23.2815.102+dfsg/src/data/symbol/symbol.tsv
	21	@@ -528,6 +528,7 @@ POS CHAR Reading (space separated) descr
	22	記号㊦したげ丸下
	23	記号㊧ひだり丸左
	24	記号㊨みぎ丸右
	25	+記号㋿れいわねんごう年号 OTHER
	26	記号㍻へいせいねんごう年号 OTHER
	27	記号㍼しょうわねんごう年号 OTHER
	28	記号㍽たいしょうねんごう年号 OTHER
	29	Index: mozc-2.23.2815.102+dfsg/src/data/unicode/UnicodeData.txt
	30	===================================================================
	31	--- mozc-2.23.2815.102+dfsg.orig/src/data/unicode/UnicodeData.txt
	32	+++ mozc-2.23.2815.102+dfsg/src/data/unicode/UnicodeData.txt
	33	@@ -11314,6 +11314,7 @@
	34	32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;;
	35	32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;;
	36	32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;;
	37	+32FF;SQUARE ERA NAME REIWA;So;0;L;<square> 4EE4 548C;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME REIWA;;;;
	38	3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
	39	3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
	40	3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
	41	Index: mozc-2.23.2815.102+dfsg/src/rewriter/date_rewriter.cc
	42	===================================================================
	43	--- mozc-2.23.2815.102+dfsg.orig/src/rewriter/date_rewriter.cc
	44	+++ mozc-2.23.2815.102+dfsg/src/rewriter/date_rewriter.cc
	45	@@ -1239,6 +1239,10 @@ const YearData kEraData[] = {
	46	1989,
	47	"平成",
	48	"へいせい",
	49	+ }, {
	50	+ 2019,
	51	+ "平成",
	52	+ "れいわ",
	53	}
	54	};
	55
	56	Index: mozc-2.23.2815.102+dfsg/src/rewriter/date_rewriter_test.cc
	57	===================================================================
	58	--- mozc-2.23.2815.102+dfsg.orig/src/rewriter/date_rewriter_test.cc
	59	+++ mozc-2.23.2815.102+dfsg/src/rewriter/date_rewriter_test.cc
	60	@@ -469,6 +469,22 @@ TEST_F(DateRewriterTest, ADToERA) {
	61	"平成10",
	62	"平成十");
	63
	64	+ // AD.2019 is "平成31(年)" or "平成三十一(年)" or "令和元(年)"
	65	+ results.clear();
	66	+ rewriter.AdToEra(2019, &results);
	67	+ Expect3Results(results,
	68	+ "平成31",
	69	+ "平成三十一",
	70	+ "令和元");
	71	+
	72	+ // AD.1990 is "令和2(年)" or "令和二(年)"
	73	+ results.clear();
	74	+ rewriter.AdToEra(2020, &results);
	75	+ EXPECT_EQ(results.size(), 2);
	76	+ Expect2Results(results,
	77	+ "令和2",
	78	+ "令和二");
	79	+
	80	// Negative Test
	81	// Too big number or negative number input are expected false return
	82	results.clear();

-0

debian/patches/series less more

3	3	gcc.patch
4	4	Fix-build-with-gcc8.patch
5	5	usage_dict.txt.patch
	6	add_support_new_japanese_era.patch