Merge branch 'laravel' into laravel

public/app/calendar/history.html

@@ -4,13 +4,14 @@
 <script src="https://code.highcharts.com/modules/accessibility.js"></script>
 
 <figure class="highcharts-figure">
-	<div id="container"></div>
+	<div id="container" style="height: 80rem;width: 100vw"></div>
 	<p class="highcharts-description">More stories need to be added, more history need to be create by you!</p>
 </figure>
 <script>
 	Highcharts.chart("container", {
 		chart: {
 			type: "timeline",
+            inverted: true
 		},
 		accessibility: {
 			screenReaderSection: {
@@ -26,7 +27,9 @@
 			},
 		},
 		xAxis: {
-			visible: false,
+			visible: true,
+            type: 'datetime'
+            //type: 'linear',
 		},
 		yAxis: {
 			visible: false,
@@ -40,58 +43,114 @@
 		colors: ["#4185F3", "#427CDD", "#406AB2", "#3E5A8E", "#3B4A68", "#363C46"],
 		series: [
 			{
+                dataLabels: {
+                //allowOverlap: false,
+                format: '<span style="color:{point.color}">● </span><span style="font-weight: bold;" > ' +
+                '{point.x:%b %Y}</span><br/>{point.label}'
+                },
+                style: {
+                    width: 800,
+                    distance: 800,
+                },
+                marker: {
+                symbol: 'circle'
+                },
 				data: [
 					{
-						name: "Display Only",
-						label: "2017 Vassa",
+						x: Date.UTC(2017, 6),
+                        name: "Word by Word Display Only",
+						label: "Word by Word can Display",
 						description:
-							"pāli Word by word translation display on Html, solve the working memory limitation on understanding the pāli text",
+							"pāli Word by word translation display as static Web page, solve the working memory limitation on understanding the pāli text",
 					},
 					{
-						name: "Magic Dictionary",
-						label: "2018 spring festival",
+						x: Date.UTC(2018, 1, 15),
+                        name: "Magic Dictionary",
+						label: "Auto Look up Dictionary",
 						description: "look up dictionary in batch work, reduce the difficulty of translating work",
 					},
 					{
+						x: Date.UTC(2018, 6, 27),
 						name: "establishment of pāli corpus",
-						label: "2018 July 27",
+						label: "Establishment of Pāli Corpus",
 						description: "convert the XML pāli text into database, realize the fragmentation",
 					},
 					{
-						name: "conference in Sri Lanka",
-						label: "2020 Feb",
+						x: Date.UTC(2020, 1, 1),
+						name: "Conference in Sri Lanka",
+						label: "Conference in Sri Lanka",
 						description:
 							"Discuss the tipiṭaka translating project and the establishment of  wikipāli platform, supported by many kinds of conditions",
 					},
 					{
-						name: "pilot class in Dawei Pa-auk",
-						label: "2020 March",
+						x: Date.UTC(2020, 2, 5),
+						name: "Pilot Class in Dawei Pa-auk",
+						label: "Pilot Class in Dawei Pa-auk",
 						description:
 							"Testing and figure out the possible way of learning and translating pāli, U Kuṇḍadhāna Sayadaw join as the pioneer teacher",
 					},
 					{
-						name: "wikipāli online test",
-						label: "2020 vassa",
+						x: Date.UTC(2020, 7, 27),
+						name: "Wikipāli 1.0 on-line Beta",
+						label: "Wikipāli 1.0 on-line Beta",
 						description:
 							"online class + online translation; word by word teaching get more and more acknowledge",
 					},
-                    {
-						name: "Nissaya digitization project start",
-						label: "2022 Feb.",
+					{
+						x: Date.UTC(2021, 5, 1),
+						name: "Recruited wikipāli students",
+						label: "Recruited wikipāli students",
+						description:
+							" in Sipsongpanna, China",
+					},
+					{
+						x: Date.UTC(2021, 7, 31),
+						name: "start translating nibbāna-gāminī-paṭipadā into Chinese",
+						label: "Trans:nibbāna-gāminī-paṭipadā",
+						description:
+							"Burmese to Chinese, ānāpānassati",
+					},
+					{
+						x: Date.UTC(2022, 0, 1),
+						name: "gradually set Beginner, Intermediate & Advanced",
+						label: "set class in three levels",
 						description:
-							"Nissaya digitization project start",
+							"Beginner, Intermediate & Advanced",
 					},
-                    {
-						name: "wikipāli 2.0 rebuild start",
-						label: "2022 Oct.",
+					{
+						x: Date.UTC(2022, 1, 31),
+						name: "Digitization of Burmese Nissaya",
+						label: "Digitization of Burmese Nissaya",
 						description:
-							"Rebuild frontend and backend by popular framework.Further and user-friendly.",
+							"Beginner, Intermediate & Advanced",
 					},
-                    {
-						name: "wikipāli 2.0 rebuild test",
-						label: "2023 Jun.",
+					{
+						x: Date.UTC(2022, 7, 24),
+						name: "云台寺建立新的基地",
+						label: "New Base in Yuntai Monastery",
+						description:
+							"Less bothering, More Concentration",
+					},
+					{
+						x: Date.UTC(2023, 4, 1),
+						name: "翻译缅语依词释nissaya",
+						label: "translate Nissaya into Chinese",
+						description:
+							"Reappear the Learning Experince of Myanmar Students",
+					},
+					{
+						x: Date.UTC(2023, 5, 24),
+						name: "开设缅语初级班",
+						label: "Burmese Class for Beginners",
+						description:
+							"For further studying",
+					},
+					{
+						x: Date.UTC(2023, 6, 31),
+						name: "Wikipāli 2.0 on-line Beta",
+						label: "Wikipāli 2.0 on-line Beta",
 						description:
-							"Rebuild test.",
+							"Coming Soon",
 					},
 				],
 			},

public/app/studio/js/relation_list.json

@@ -1586,7 +1586,7 @@
     {
         "id": "LOV",
         "case": ".adv.",
-        "note": "容纳 ➡ 被容纳<br>在…",
+        "note": "时空状语 ➡ 动词<br>在…",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -1628,4 +1628,4 @@
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "default"
     }
-];
+]

public/app/term/note.js

@@ -1441,6 +1441,11 @@ function myEndingTooltip(inStr){
             name:"အစွမ်းအားဖြင့်",
             tooltip:'vasena',
         },
+        {
+            id:"my_imp",
+            name:"အားဖြင့်",
+            tooltip:'具格/用',
+        },
         {
             id:"my_imp",
             name:"ဖြင့်",
@@ -1453,7 +1458,7 @@ function myEndingTooltip(inStr){
         },
         {
             id:"my_soi",
-            name:"နှင့်",
+            name:"နှင့်",//异体编码
             tooltip:'具格/与',
         },
         {
@@ -1541,11 +1546,21 @@ function myEndingTooltip(inStr){
             name:"အဖို့၌",
             tooltip:'处格/表达动机，因……，旨在……',
         },
+        {
+            id:"my_iti",
+            name:"ဟူ၍",
+            tooltip:'引用',
+        },
         {
             id:"my_abs",
             name:"၍",
             tooltip:'连续体',
         },
+        {
+            id:"my_imper",
+            name:"ပါစေသတည်း",
+            tooltip:'祈愿式',
+        },
         {
             id:"my_pl",
             name:"တို့",
@@ -1651,6 +1666,11 @@ function myEndingTooltip(inStr){
             name:"သော",
             tooltip:'的(同类修饰)',
         },
+        {
+            id:"my_iad",
+            name:"သည့်",
+            tooltip:'的(同类修饰)',
+        },
         {
             id:"my_pl_fut",
             name:"ကုန်လတ္တံ့",
@@ -1681,6 +1701,11 @@ function myEndingTooltip(inStr){
             name:"ရယ်",
             tooltip:'和',
         },
+        {
+            id:"my_pp",
+            name:"ပြီ",
+            tooltip:'过去分词',
+        },
         {
             id:"my_ca",
             name:"လည်း",

public/app/users_guide/zh-cn/grammar_my_coi.md

@@ -1,4 +1,4 @@
-# 表示包含关系
+# 表示范围定语
 
 |语法特征|含义|翻译建议|关系|
 |-|-|-|-|

public/app/users_guide/zh-cn/grammar_my_imper.md

@@ -0,0 +1,5 @@
+# 命令祈愿
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|-|-|-|-|

public/app/users_guide/zh-cn/grammar_my_iti.md

@@ -0,0 +1,6 @@
+# 缅文语尾(多种可能)
+
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|[不变词iti](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/other/iti.html)|引用|引号|[引号 ➡ 引号外<br>QUM](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/other/iti.html)|

public/app/users_guide/zh-cn/grammar_my_lov.md

@@ -5,4 +5,4 @@
 |[**处**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/loc.html)|表达**时空背景**关系|在……时<br>在……处|[时空 ➡ 动词<br>LOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-lov.html)|
 |[**宾**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html#%E8%BF%9B%E9%98%B6%E7%94%A8%E6%B3%95)|表达**时空背景**关系|在……时<br>在……处|[时空 ➡ 动词<br>LOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-lov.html)|
 |[不变]()|表达**时空背景**关系|在……时<br>在……处|[时空 ➡ 动词<br>LOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-lov.html)|
-|[**目的**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html#%E8%BF%9B%E9%98%B6%E7%94%A8%E6%B3%95)|表达**行动所趋向的地点**|旨在……|[时空 ➡ 动词<br>LOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/loc-lov.html)|
+|[**目的**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/acc.html#%E8%BF%9B%E9%98%B6%E7%94%A8%E6%B3%95)|表达**行动所趋向的地点**|旨在……|[时空 ➡ 动词<br>LOV](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/loc/dat-lov.html)|

public/app/users_guide/zh-cn/grammar_my_pp.md

@@ -0,0 +1,5 @@
+# 过去分词
+
+|语法特征|含义|翻译建议|关系|
+|-|-|-|-|
+|-|-|-|-|