Merge branch 'master' of https://github.com/visuddhinanda/mint

app/collect/index.php

@@ -213,8 +213,8 @@ include "../pcdl/html_head.php";
     ?>
     <div id='course_head_bar' class='collect_head_bar'>
         <div class='section_inner'>
-            <h1>著作</h1>
-            <div style='max-width:30em'>各種從經典中擷取的文章，所彙集成的文，其中有多人翻譯的篇章等等的各種。</div>
+            <h1><?php echo $_local->gui->composition;?></h1>
+            <div style='width:30em'><?php echo $_local->gui->composition_intro;?></div>
             <!--
             <div id="main_tag">
                 <span tag="vinaya">sīla</span>

app/public/lang/default.json

@@ -565,6 +565,10 @@
 		"local": "Local",
 		"form_sent": "Form sentences with the words given & copy to clipboard",
 		"hot_topic": "hot topic",
+		"composition_intro": "Make the Pāḷi easy to read<br>solution of Pāḷi glossary<br>For translating Pāḷi in Group<br>Show the source reference in Pāḷi",
+		"jump_to_this_sent": "jump to this sentence",
+		"show_nissaya": "show nissaya",
+		"related_para": "related&nbsp;paragraph",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/en.json

@@ -564,6 +564,10 @@
 		"local": "Local",
 		"form_sent": "Form sentences with the words given & copy to clipboard",
 		"hot_topic": "hot topic",
+		"composition_intro": "Make the Pāḷi easy to read<br>solution of Pāḷi glossary<br>For translating Pāḷi in Group<br>Show the source reference in Pāḷi",
+		"jump_to_this_sent": "jump to this sentence",
+		"show_nissaya": "show nissaya",
+		"related_para": "related&nbsp;paragraph",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -564,6 +564,10 @@
 		"local": "Local",
 		"form_sent": "Form sentences with the words given & copy to clipboard",
 		"hot_topic": "hot topic",
+		"composition_intro": "Make the Pāḷi easy to read<br>solution of Pāḷi glossary<br>For translating Pāḷi in Group<br>Show the source reference in Pāḷi",
+		"jump_to_this_sent": "jump to this sentence",
+		"show_nissaya": "show nissaya",
+		"related_para": "related&nbsp;paragraph",
 		"": "",
 		"": ""
 	},

app/public/lang/si.json

@@ -569,6 +569,10 @@
 		"local": "Local",
 		"form_sent": "Form sentences with the words given & copy to clipboard",
 		"hot_topic": "hot topic",
+		"composition_intro": "Make the Pāḷi easy to read<br>solution of Pāḷi glossary<br>For translating Pāḷi in Group<br>Show the source reference in Pāḷi",
+		"jump_to_this_sent": "jump to this sentence",
+		"show_nissaya": "show nissaya",
+		"related_para": "related&nbsp;paragraph",
 		"": "",
 		"": ""
 	},

app/public/lang/zh-cn.json

@@ -566,6 +566,10 @@
 		"local": "本地",
 		"form_sent": "连词成句到剪切板",
 		"hot_topic": "热门主题",
+		"composition_intro": "依巴利而<b>著</b><br>为明法而<b>作</b>",
+		"jump_to_this_sent": "跳转到此句",
+		"show_nissaya": "显示nissaya",
+		"related_para": "相应段落",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-tw.json

@@ -566,6 +566,9 @@
 		"local": "本地",
 		"form_sent": "連詞成句到剪下板",
 		"hot_topic": "熱門主題",
+		"composition_intro": "依巴利而<b>著</b><br>為明法而<b>作</b>",
+		"show_nissaya": "显示nissaya",
+		"related_para": "相應段落",
 		"": ""
 	},
 	"grammastr": [

app/term/note.js

@@ -431,10 +431,18 @@ function note_json_html(in_json) {
 	output += "</svg>";
 	output += "<div class='case_dropdown-content sent_menu'>";
 	if (typeof _reader_view != "undefined" && _reader_view != "sent") {
-		output += "<a onclick='junp_to(this)'>跳转至此句</a>";
+		output += "<a onclick='junp_to(this)'>" + gLocal.gui.jump_to_this_sent + "</a>";
 	}
-	output += "<a  onclick='related_para_dlg_open(" + in_json.book + "," + in_json.para + ")'>相关段落</a>";
-	output += "<a  onclick='goto_nissaya(" + in_json.book + "," + in_json.para + ")'>Nissaya</a>";
+	output +=
+		"<a  onclick='related_para_dlg_open(" +
+		in_json.book +
+		"," +
+		in_json.para +
+		")'>" +
+		gLocal.gui.related_para +
+		"</a>";
+	output +=
+		"<a  onclick='goto_nissaya(" + in_json.book + "," + in_json.para + ")'>" + gLocal.gui.show_nissaya + "</a>";
 	output +=
 		"<a onclick=\"copy_ref('" +
 		in_json.book +

app/uwbw/wbw_channal_list.js

@@ -8,7 +8,7 @@ function wbw_channal_list_init() {
 		width: 550,
 		buttons: [
 			{
-				text: "Cancel",
+				text: gLocal.gui.cancel,
 				click: function () {
 					$(this).dialog("close");
 				},
@@ -30,13 +30,13 @@ function wbw_channal_list_open(book, paralist) {
 				let html = "";
 				for (let index = 0; index < _wbw_channel.data.length; index++) {
 					const element = _wbw_channel.data[index];
-					html += "<div style='display:flex;'>";
+					html += "<div style='display:flex;line-height: 2.5em;'>";
 					html += "<span style='flex:2'>";
 					html += "<button onclick=\"wbw_create('" + index + "')\">";
 					if (parseInt(element.wbw_para) > 0) {
-						html += "打开";
+						html += gLocal.gui.open;
 					} else {
-						html += "新建";
+						html += gLocal.gui.new;
 					}
 
 					html += "</button>";
@@ -44,7 +44,7 @@ function wbw_channal_list_open(book, paralist) {
 					html += "<span  style='flex:1'>" + (index + 1) + "</span>";
 					html += "<span style='flex:3'>" + element.name + "</span>";
 					html += "<span style='flex:2'>" + element.lang + "</span>";
-					html += "<span style='flex:2'>" + element.wbw_para + "/" + element.count + "</span>";
+					html += "<span style='flex:2;display:none;'>" + element.wbw_para + "/" + element.count + "</span>";
 					html += "</div>";
 				}
 
@@ -58,6 +58,7 @@ function wbw_channal_list_open(book, paralist) {
 }
 
 function wbw_create(index) {
+	$("#wbw_channal_list_dlg").dialog("close");
 	$.post(
 		"../uwbw/create_wbw.php",
 		{