Bhikkhu-Kosalla 5 роки тому
батько
коміт
d6909519aa

+ 5 - 5
app/course/course.php

@@ -152,8 +152,8 @@ $.get("../course/lesson_list.php",
         d.setTime(lesson["date"]);
         let strData = d.toLocaleDateString();
         let strTime = d.toLocaleTimeString();
-         html+= '<div >开始日期:'+strData +'</div>';
-         html+= '<div >开始时间:'+strTime +'</div>';
+         html+= '<div >'+gLocal.gui.date+':'+strData +'</div>';
+         html+= '<div >'+gLocal.gui.time+':'+strTime +'</div>';
         let dt = lesson["duration"]/60;
         let sdt = "";
         if(dt>59){
@@ -168,13 +168,13 @@ $.get("../course/lesson_list.php",
 
         let lesson_time="";
         if(now<lesson["date"]){
-            lesson_time = "尚未开始";
+            lesson_time = gLocal.gui.not_started;
         }
         else if(now>lesson["date"] && now<(lesson["date"]+dt*1000)){
-            lesson_time = "正在进行";
+            lesson_time = gLocal.gui.in_progress;
         }
         else{
-            lesson_time = "已经结束";
+            lesson_time = gLocal.gui.already_over;
         }
         html+= '<div ><span class="lesson_status">'+lesson_time+'</span></div>';
       

+ 9 - 9
app/course/lesson.js

@@ -27,7 +27,7 @@ function lesson_show(id) {
         let summary = "";
         try {
           summary = marked(lesson["summary"], { renderer: renderer });
-        } catch {}
+        } catch { }
         html +=
           '<div class="summary"  style="padding-bottom:5px;">' +
           summary +
@@ -35,7 +35,7 @@ function lesson_show(id) {
         let live = "";
         try {
           live = marked(lesson["live"], { renderer: renderer });
-        } catch {}
+        } catch { }
         html +=
           '<div class="summary"  style="padding-bottom:5px;">' +
           live +
@@ -43,7 +43,7 @@ function lesson_show(id) {
         let replay = "";
         try {
           replay = marked(lesson["replay"], { renderer: renderer });
-        } catch {}
+        } catch { }
         html +=
           '<div class="summary"  style="padding-bottom:5px;">' +
           replay +
@@ -51,7 +51,7 @@ function lesson_show(id) {
         let attachment = "";
         try {
           attachment = marked(lesson["attachment"], { renderer: renderer });
-        } catch {}
+        } catch { }
         html +=
           '<div class="summary"  style="padding-bottom:5px;">' +
           attachment +
@@ -65,8 +65,8 @@ function lesson_show(id) {
         d.setTime(lesson["date"]);
         let strData = d.toLocaleDateString();
         let strTime = d.toLocaleTimeString();
-        html += "<div >开始日期:" + strData + "</div>";
-        html += "<div >开始时间:" + strTime + "</div>";
+        html += "<div >" + gLocal.gui.date + ":" + strData + "</div>";
+        html += "<div >" + gLocal.gui.time + ":" + strTime + "</div>";
         let dt = lesson["duration"] / 60;
         let sdt = "";
         if (dt > 59) {
@@ -81,11 +81,11 @@ function lesson_show(id) {
 
         let lesson_time = "";
         if (now < lesson["date"]) {
-          lesson_time = "尚未开始";
+          lesson_time = gLocal.gui.not_started;
         } else if (now > lesson["date"] && now < lesson["date"] + dt * 1000) {
-          lesson_time = "正在进行";
+          lesson_time = gLocal.gui.in_progress;
         } else {
-          lesson_time = "已经结束";
+          lesson_time = gLocal.gui.already_over;
         }
         html +=
           '<div ><span class="lesson_status">' + lesson_time + "</span></div>";

+ 2 - 1
app/course/list_new.php

@@ -26,7 +26,8 @@ foreach($Fetch as $row){
     echo '<div class="summary"  style="padding-bottom:5px;height: 4.5em;line-height: 1.5em;overflow-y: hidden;">'.$row["summary"].'</div>';
     echo '</div>';
     echo '<div class="pd-10" style="display:flex;justify-content: space-between;">';
-    echo '<button>赞<span>3</span></button><button>订阅<span>23</span></button>';
+    echo '<button><svg t="1600445373282" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2368" width="32" height="32"><path fill="silver" d="M854.00064 412.66688h-275.99872v-35.99872c48-102.00064 35.99872-227.99872 0-288-12.00128-18.00192-35.99872-35.99872-54.00064-35.99872s-35.99872 6.00064-35.99872 54.00064c0 96-6.00064 137.99936-24.00256 179.99872-12.00128 29.99808-77.99808 96-156.00128 120.00256v480c12.00128 6.00064 35.99872 24.00256 54.00064 29.99808 18.00192 12.00128 48 18.00192 60.00128 18.00192h306.00192c77.99808 0 108.00128-29.99808 108.00128-66.00192 0-18.00192 0-29.99808-18.00192-35.99872V796.672c41.99936 0 83.99872-12.00128 83.99872-48 0-29.99808-12.00128-35.99872-18.00192-35.99872v-35.99872h6.00064c24.00256 0 60.00128-35.99872 60.00128-60.00128 0-18.00192-6.00064-35.99872-18.00192-41.99936-6.00064-6.00064-24.00256-6.00064-24.00256-6.00064v-35.99872s12.00128 0 24.00256-12.00128c18.00192-12.00128 18.00192-42.00448 18.00192-42.00448v-12.00128c0-29.99808-48-54.00064-96-54.00064zM67.99872 478.6688l35.99872 408.00256c6.00064 24.00256 24.00256 48 48 48h83.99872c6.00064 0 12.00128-6.00064 18.00192-12.00128s12.00128-6.00064 18.00192-12.00128V412.66688H128c-35.99872 0-60.00128 35.99872-60.00128 66.00192z" p-id="2369"></path></svg></button><span id="num_like">3</span>';
+    echo '<button><svg t="1600445467402" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4462" width="32" height="32"><path d="M604.37 488.16a93.87 93.87 0 1 1-93.92-93.88 94 94 0 0 1 93.92 93.88z" fill="silver" p-id="4463"></path><path d="M510.5 179c-246 0-445.39 227.26-445.39 318.12 0 113.65 199.43 318.17 445.39 318.17s445.39-204.52 445.39-318.17C955.89 406.26 756.46 179 510.5 179z m0 477.33c-92.68 0-168.07-75.44-168.07-168.17S417.77 320 510.45 320s168.17 75.42 168.17 168.13-75.44 168.2-168.17 168.2z" fill="silver" p-id="4464"></path></svg></button><span id="num_subscribe">23</span>';
     echo '</div>';
     
     echo '</div>';

+ 1 - 1
app/course/my_course_edit.php

@@ -109,7 +109,7 @@ echo '</div>';
 ?>
 </div>
 <div>点击:</div>
-<div>点赞:</div>
+<div><svg t="1600445373282" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2368" width="32" height="32"><path fill="silver" d="M854.00064 412.66688h-275.99872v-35.99872c48-102.00064 35.99872-227.99872 0-288-12.00128-18.00192-35.99872-35.99872-54.00064-35.99872s-35.99872 6.00064-35.99872 54.00064c0 96-6.00064 137.99936-24.00256 179.99872-12.00128 29.99808-77.99808 96-156.00128 120.00256v480c12.00128 6.00064 35.99872 24.00256 54.00064 29.99808 18.00192 12.00128 48 18.00192 60.00128 18.00192h306.00192c77.99808 0 108.00128-29.99808 108.00128-66.00192 0-18.00192 0-29.99808-18.00192-35.99872V796.672c41.99936 0 83.99872-12.00128 83.99872-48 0-29.99808-12.00128-35.99872-18.00192-35.99872v-35.99872h6.00064c24.00256 0 60.00128-35.99872 60.00128-60.00128 0-18.00192-6.00064-35.99872-18.00192-41.99936-6.00064-6.00064-24.00256-6.00064-24.00256-6.00064v-35.99872s12.00128 0 24.00256-12.00128c18.00192-12.00128 18.00192-42.00448 18.00192-42.00448v-12.00128c0-29.99808-48-54.00064-96-54.00064zM67.99872 478.6688l35.99872 408.00256c6.00064 24.00256 24.00256 48 48 48h83.99872c6.00064 0 12.00128-6.00064 18.00192-12.00128s12.00128-6.00064 18.00192-12.00128V412.66688H128c-35.99872 0-60.00128 35.99872-60.00128 66.00192z" p-id="2369"></path></svg></div>
 <div>收藏:</div>
 
 </div>

+ 1 - 1
app/course/my_lesson_edit.php

@@ -135,7 +135,7 @@ echo '</div>';
 ?>
 </div>
 <div>点击:</div>
-<div>点赞:</div>
+<div><svg t="1600445373282" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2368" width="32" height="32"><path fill="silver" d="M854.00064 412.66688h-275.99872v-35.99872c48-102.00064 35.99872-227.99872 0-288-12.00128-18.00192-35.99872-35.99872-54.00064-35.99872s-35.99872 6.00064-35.99872 54.00064c0 96-6.00064 137.99936-24.00256 179.99872-12.00128 29.99808-77.99808 96-156.00128 120.00256v480c12.00128 6.00064 35.99872 24.00256 54.00064 29.99808 18.00192 12.00128 48 18.00192 60.00128 18.00192h306.00192c77.99808 0 108.00128-29.99808 108.00128-66.00192 0-18.00192 0-29.99808-18.00192-35.99872V796.672c41.99936 0 83.99872-12.00128 83.99872-48 0-29.99808-12.00128-35.99872-18.00192-35.99872v-35.99872h6.00064c24.00256 0 60.00128-35.99872 60.00128-60.00128 0-18.00192-6.00064-35.99872-18.00192-41.99936-6.00064-6.00064-24.00256-6.00064-24.00256-6.00064v-35.99872s12.00128 0 24.00256-12.00128c18.00192-12.00128 18.00192-42.00448 18.00192-42.00448v-12.00128c0-29.99808-48-54.00064-96-54.00064zM67.99872 478.6688l35.99872 408.00256c6.00064 24.00256 24.00256 48 48 48h83.99872c6.00064 0 12.00128-6.00064 18.00192-12.00128s12.00128-6.00064 18.00192-12.00128V412.66688H128c-35.99872 0-60.00128 35.99872-60.00128 66.00192z" p-id="2369"></path></svg></div>
 <div>收藏:</div>
 
 </div>

+ 3 - 2
app/course/my_lesson_list.php

@@ -49,7 +49,8 @@ echo '</div>';
     echo "<span style='padding:5px;'>最新:".strftime("%b-%d-%Y",$course_info["modify_time"]/1000)."</span>";
     echo "<span style='padding:5px;'>视频数量:{$course_info["lesson_num"]}</span>";
     echo "<span style='padding:5px;'>播放:100</span>";
-    echo "<span style='padding:5px;'>点赞:10</span>";
+    echo "<span style='padding:5px;'>".'<svg t="1600445373282" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2368" width="32" height="32"><path fill="silver" d="M854.00064 412.66688h-275.99872v-35.99872c48-102.00064 35.99872-227.99872 0-288-12.00128-18.00192-35.99872-35.99872-54.00064-35.99872s-35.99872 6.00064-35.99872 54.00064c0 96-6.00064 137.99936-24.00256 179.99872-12.00128 29.99808-77.99808 96-156.00128 120.00256v480c12.00128 6.00064 35.99872 24.00256 54.00064 29.99808 18.00192 12.00128 48 18.00192 60.00128 18.00192h306.00192c77.99808 0 108.00128-29.99808 108.00128-66.00192 0-18.00192 0-29.99808-18.00192-35.99872V796.672c41.99936 0 83.99872-12.00128 83.99872-48 0-29.99808-12.00128-35.99872-18.00192-35.99872v-35.99872h6.00064c24.00256 0 60.00128-35.99872 60.00128-60.00128 0-18.00192-6.00064-35.99872-18.00192-41.99936-6.00064-6.00064-24.00256-6.00064-24.00256-6.00064v-35.99872s12.00128 0 24.00256-12.00128c18.00192-12.00128 18.00192-42.00448 18.00192-42.00448v-12.00128c0-29.99808-48-54.00064-96-54.00064zM67.99872 478.6688l35.99872 408.00256c6.00064 24.00256 24.00256 48 48 48h83.99872c6.00064 0 12.00128-6.00064 18.00192-12.00128s12.00128-6.00064 18.00192-12.00128V412.66688H128c-35.99872 0-60.00128 35.99872-60.00128 66.00192z" p-id="2369"></path></svg>';
+    echo "10"."</span>";
     echo "<span style='padding:5px;'>订阅:20</span>";
     echo '</div>';
 
@@ -123,7 +124,7 @@ echo '</div>';
         ?>
         </div>
         <div>点击:</div>
-        <div>点赞:</div>
+        <div><svg t="1600445373282" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2368" width="32" height="32"><path fill="silver" d="M854.00064 412.66688h-275.99872v-35.99872c48-102.00064 35.99872-227.99872 0-288-12.00128-18.00192-35.99872-35.99872-54.00064-35.99872s-35.99872 6.00064-35.99872 54.00064c0 96-6.00064 137.99936-24.00256 179.99872-12.00128 29.99808-77.99808 96-156.00128 120.00256v480c12.00128 6.00064 35.99872 24.00256 54.00064 29.99808 18.00192 12.00128 48 18.00192 60.00128 18.00192h306.00192c77.99808 0 108.00128-29.99808 108.00128-66.00192 0-18.00192 0-29.99808-18.00192-35.99872V796.672c41.99936 0 83.99872-12.00128 83.99872-48 0-29.99808-12.00128-35.99872-18.00192-35.99872v-35.99872h6.00064c24.00256 0 60.00128-35.99872 60.00128-60.00128 0-18.00192-6.00064-35.99872-18.00192-41.99936-6.00064-6.00064-24.00256-6.00064-24.00256-6.00064v-35.99872s12.00128 0 24.00256-12.00128c18.00192-12.00128 18.00192-42.00448 18.00192-42.00448v-12.00128c0-29.99808-48-54.00064-96-54.00064zM67.99872 478.6688l35.99872 408.00256c6.00064 24.00256 24.00256 48 48 48h83.99872c6.00064 0 12.00128-6.00064 18.00192-12.00128s12.00128-6.00064 18.00192-12.00128V412.66688H128c-35.99872 0-60.00128 35.99872-60.00128 66.00192z" p-id="2369"></path></svg></div>
         <div>收藏:</div>
 
     </div>

+ 3 - 1
app/pcdl/reader.php

@@ -843,7 +843,9 @@ function render_sent($sent_data,$sn,$display_mode,$sent_count,$class=""){
 			$query="SELECT count(*) FROM \"sentence\" WHERE parent = ".$PDO->quote($sent_data["id"]);
 			$edit_count = PDO_FetchOne($query);
 		
-			$output .= "<div style='font-size:80%;color:gray;margin-bottom:1em;'>Author:$name / {$channalInfo["name"]} 赞:( ) ";
+			$output .= "<div style='font-size:80%;color:gray;margin-bottom:1em;'>Author:$name / {$channalInfo["name"]} ";
+			$output .= '<svg t="1600445373282" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2368" width="32" height="32"><path fill="silver" d="M854.00064 412.66688h-275.99872v-35.99872c48-102.00064 35.99872-227.99872 0-288-12.00128-18.00192-35.99872-35.99872-54.00064-35.99872s-35.99872 6.00064-35.99872 54.00064c0 96-6.00064 137.99936-24.00256 179.99872-12.00128 29.99808-77.99808 96-156.00128 120.00256v480c12.00128 6.00064 35.99872 24.00256 54.00064 29.99808 18.00192 12.00128 48 18.00192 60.00128 18.00192h306.00192c77.99808 0 108.00128-29.99808 108.00128-66.00192 0-18.00192 0-29.99808-18.00192-35.99872V796.672c41.99936 0 83.99872-12.00128 83.99872-48 0-29.99808-12.00128-35.99872-18.00192-35.99872v-35.99872h6.00064c24.00256 0 60.00128-35.99872 60.00128-60.00128 0-18.00192-6.00064-35.99872-18.00192-41.99936-6.00064-6.00064-24.00256-6.00064-24.00256-6.00064v-35.99872s12.00128 0 24.00256-12.00128c18.00192-12.00128 18.00192-42.00448 18.00192-42.00448v-12.00128c0-29.99808-48-54.00064-96-54.00064zM67.99872 478.6688l35.99872 408.00256c6.00064 24.00256 24.00256 48 48 48h83.99872c6.00064 0 12.00128-6.00064 18.00192-12.00128s12.00128-6.00064 18.00192-12.00128V412.66688H128c-35.99872 0-60.00128 35.99872-60.00128 66.00192z" p-id="2369"></path></svg>';
+			$output .= '<span id="num_like"></span>';
 			if($sent_data["editor"] == $_COOKIE["userid"]){
 				$output .= "<span>润校</span>:";
 			}

+ 3 - 0
app/public/lang/default.json

@@ -480,6 +480,9 @@
 		"magic_dict_language": "languages of dictionary",
 		"priority": "priority",
 		"no_need": "no need",
+		"not_started": "not yet start",
+		"in_progress": "in progress",
+		"already_over": "already over",
 		"": ""
 	},
 	"grammastr": [

+ 3 - 0
app/public/lang/en.json

@@ -479,6 +479,9 @@
 		"magic_dict_language": "languages of dictionary",
 		"priority": "priority",
 		"no_need": "no need",
+		"not_started": "not yet start",
+		"in_progress": "in progress",
+		"already_over": "already over",
 		"": ""
 	},
 	"grammastr": [

+ 3 - 0
app/public/lang/my.json

@@ -479,6 +479,9 @@
 		"magic_dict_language": "languages of dictionary",
 		"priority": "priority",
 		"no_need": "no need",
+		"not_started": "not yet start",
+		"in_progress": "in progress",
+		"already_over": "already over",
 		"": "",
 		"": ""
 	},

+ 3 - 0
app/public/lang/si.json

@@ -484,6 +484,9 @@
 		"magic_dict_language": "languages of dictionary",
 		"priority": "priority",
 		"no_need": "no need",
+		"not_started": "not yet start",
+		"in_progress": "in progress",
+		"already_over": "already over",
 		"": "",
 		"": ""
 	},

+ 3 - 0
app/public/lang/zh-cn.json

@@ -481,6 +481,9 @@
 		"magic_dict_language": "词典语言",
 		"priority": "优先级",
 		"no_need": "不需要",
+		"not_started": "尚未开始",
+		"in_progress": "正在进行",
+		"already_over": "已经结束",
 		"": ""
 	},
 	"grammastr": [

+ 3 - 0
app/public/lang/zh-tw.json

@@ -481,6 +481,9 @@
 		"magic_dict_language": "詞典語言",
 		"priority": "優先順序",
 		"no_need": "不需要",
+		"not_started": "尚未開始",
+		"in_progress": "正在進行",
+		"already_over": "已經結束",
 		"": ""
 	},
 	"grammastr": [

+ 2 - 2
app/studio/group.php

@@ -289,10 +289,10 @@ require_once '../public/_pdo.php';
 					foreach($stage as $one){
 						echo "<button>{$one["stage"]}</button>{$one["name"]}-";
 						if($one["stage"]<$curr_stage){
-							echo "<span style='color:green'>已经完成Done</span>";
+							echo "<span style='color:green'>{$_local->gui->already_over}</span>";
 						}
 						else if($one["stage"]==$curr_stage){
-							echo "正在进行Runing<button>完成Done</button>";
+							echo "{$_local->gui->in_progress}<button>完成Done</button>";
 						}
 						else{
 							echo "尚未开始 Not Ready";

+ 1 - 1
app/studio/pc_db_analysis.php

@@ -26,7 +26,7 @@ $bookstring="";
 	$query = "select count(*) from (SELECT count() FROM \"toc\" WHERE (book in (".$bookstring.") and author<>'PCDS') group by book,par_num ) T";/*查有譯文的段落,并分類匯總——已完成*/
 	$finished=PDO_FetchOne($query);
 	$persent=$finished/$allpar;
-	print "总共:$allpar  <br />已经完成:$finished  <br />百分比:$persent";
+	print "总共:$allpar  <br />{$_local->gui->finished}:$finished  <br />百分比:$persent";
 	//$Fetch = PDO_FetchAll($query);
 	//$iFetch=count($Fetch);
 

+ 3 - 3
documents/course/Morphological Definitions.md

@@ -123,7 +123,7 @@ sāriputto thero sāriputtatthero
 - " (The one who is) Sāriputta and (who is) a senior monk, (he is) sāriputtatthera by name."
 - “(谁是)Sāriputta和(谁),他是一位高级僧侣,他的名字叫āriputtalthera。“。
 
-#### A.3 visesana-ubhayapada
+#### A.3 visesana-ubhayapada 双重定语
 [ kata (the (work) finished已做) = A<sub title="modifier定语/修饰语">mod</sub>1] + [ akata = (the (work) not yet finished未做) = A<sub title="modifier定语/修饰语">mod</sub>2]
 
 A<sub title="modifier定语/修饰语">mod</sub>1 + A<sub title="modifier定语/修饰语">mod</sub>2---->A<sub title="substantive中心语">sub</sub> (sense, gender & number中心語、性与数)
@@ -147,7 +147,7 @@ kataṃ ca taṃ akataṃ cāti katākataṃ
 - “(已完成的那个)和没有完成(的),(它是)katākata的名字。
 
 
-#### A.4 upamāna-uttarapada 比喻
+#### A.4 upamāna-uttarapada 比喻后置
 [ muni (the monk僧) = A<sub title="substantive中心语/本体">sub</sub> ] + [ sīha (lion狮子) = A<sub title="standard of comparison喻体/喻依">com</sub>]
 
 A<sub title="standard of comparison喻体/喻依">com</sub>---->A<sub title="substantive中心语/本体">sub</sub> (Figurative identity relation 比喻身份关系)
@@ -169,7 +169,7 @@ muni ca so sīho cāti munisīho.
 ```
 trs译文:
 - "He (is) a monk and lion-like too, therefore, (he is) munisīha by name."
-- “他也是一个和尚和狮子一样的人,因此,他的名字是市政ī哈。”
+- “他既是一个僧侣又像狮子一样,因此,他的名为munisīha。”
 
 #### A.5 sambhāvanā-pubbapada 混合组分前置
 [pāṇa (living being生物) =A + iti + saññā (perception认定/想) = B]