Pārlūkot izejas kodu

多语言维护+佛历升级

Bhikkhu-Kosalla 5 gadi atpakaļ
vecāks
revīzija
1ae2e6c297

+ 6 - 5
app/calendar/index.php

@@ -690,7 +690,7 @@ echo "</center>";
 
 
 
-/*date_default_timezone_set("Asia/Rangoon");
+date_default_timezone_set("Asia/Rangoon");/*
 $Unix_now_time=strtotime("now");
 $sun_info=date_sun_info(strtotime("now"),7.738562,80.519675);
 $sun_info_1=date_sun_info(strtotime("+1 day"),7.738562,80.519675);
@@ -720,12 +720,12 @@ echo "</div>";
 //設定經緯度
 var g_coordinate_this=new Object;
 getLocation();
-	g_coordinate_this=get_coordinate_num("selected");
-	if(g_coordinate_this.AT==0 || g_coordinate_this.LT==0){
+g_coordinate_this=get_coordinate_num("selected");
+	/*if(g_coordinate_this.AT==0 || g_coordinate_this.LT==0){
 		g_coordinate_this.AT=7.738562;
 		g_coordinate_this.LT=80.519675;
 	}
-
+*/
 
 function angle_trans(angle){
 var angle_str="";
@@ -803,7 +803,8 @@ function set_time_string(date_obj){
 	hh=checkTime(hh)
 	mm=checkTime(mm)
 	ss=checkTime(ss)
-	return(hh+":"+mm+":"+ss)
+	//return(hh+":"+mm+":"+ss)
+	return(date_obj.toLocaleTimeString())
 }
 function menuLangrage(obj,year,month){
 	g_language=obj.value;

+ 77 - 2
app/calendar/index1.html

@@ -464,6 +464,25 @@
 			.correct {
 				background-color: gold;
 			}
+			#position_input{
+				width: fit-content;
+				background: #dfdfdf;
+				padding: 1em;
+				border: solid 2px #7d7d7d;
+				border-radius: 0.5em;
+				position: absolute;
+				left: 5em;
+				top: 10em;
+			}
+			#position_input input[type="number" i]{
+				width: 4em;
+			}
+			#position_input span {
+
+			}
+			#position_input select {
+				width: 3.5em;
+			}
 		</style>
 		<title id="title_text"> </title>
 	</head>
@@ -471,12 +490,12 @@
 	<body>
 		<!--多语言范例
         <script>
-            document.write(localString["language"].XXXX);
+            document.write(localString[g_language].XXXX);
         </script>
 
     -->
 		<div id="position_change">
-			<span id="selected_position_string">
+			<span id="selected_position_string" onclick="input_position()">
 				<script>
 					document.write(localString[g_language].loading);
 					//localString[g_language].loading;
@@ -494,6 +513,41 @@
 					//localString[g_language].my_loc
 				</script>
 			</button>
+			<div id="position_input" style="display:none;">
+				<div style="display:flex;"><span style="flex: 3;justify-content: flex-end;display: flex;margin: auto 1em auto 0;">
+					<script>
+						document.write(localString[g_language].atitude);
+					</script></span><span style="flex:7;white-space: nowrap;">
+					<input id="AT_°" type="number" min="0" max="90" /> °
+					<input id="AT_’" type="number" min="0" max="60" /> ’
+					<input id="AT_”" type="number" min="0" max="60" /> ”
+					<select id="NS">
+						<option value="+">N</option>
+						<option value="-">S</option>
+					</select></span>
+				</div>
+				<div style="display:flex;">
+					<span style="flex: 3;justify-content: flex-end;display: flex;margin: auto 1em auto 0;"><script>
+						document.write(localString[g_language].longitude);
+					</script></span><span style="flex:7;white-space: nowrap;">
+					<input id="LT_°" type="number" min="0" max="180" /> °
+					<input id="LT_’" type="number" min="0" max="60" /> ’
+					<input id="LT_”" type="number" min="0" max="60" /> ”
+					<select id="WE">
+						<option value="+">E</option>
+						<option value="-">W</option>
+					</select></span>
+				</div>
+				<div id="position_selected"></div>
+				<div style="display:flex;">
+					<button onclick="getLocation()" style="margin:0 auto;">
+					<script>
+						document.write(localString[g_language].confirm);
+					</script>
+					</button>
+				</div>
+			</div>
+
 			<input id="input_time" type="datetime-local" />
 		</div>
 		<div>
@@ -868,6 +922,22 @@
 				g_coordinate_this.AT = position.coords.latitude; //纬度
 				g_coordinate_this.LT = position.coords.longitude; //经度
 				g_coordinate_this.height = position.coords.altitude; //海拔高度
+				//手动输入
+				var LT=Number($("#LT_°")[0].value);
+					LT+=Number($("#LT_’")[0].value)/60;
+					LT+=Number($("#LT_”")[0].value)/3600;
+					LT=Number($("#WE")[0].value+LT);
+				var AT=Number($("#AT_°")[0].value);
+					AT+=Number($("#AT_’")[0].value)/60;
+					AT+=Number($("#AT_”")[0].value)/3600;
+					AT=Number($("#NS")[0].value+AT);
+					if(AT!=0){
+						g_coordinate_this.LT=LT;
+						g_coordinate_this.AT=AT;
+
+					}
+
+
 				let position_string =
 					g_coordinate_this.AT + "#" + g_coordinate_this.LT + "#" + g_coordinate_this.height;
 				localStorage.setItem("local_position", position_string);
@@ -884,6 +954,8 @@
 				}
 				let height_string = g_coordinate_this.height + "M";
 				$("#selected_position_string").html(AT_string + " " + LT_string + " " + height_string);
+				$("#position_input").hide();
+
 			}
 			function showError(error) {
 				switch (error.code) {
@@ -917,6 +989,9 @@
 				}
 				return angle_str;
 			}
+			function input_position(){
+				$("#position_input").show();
+			}
 		</script>
 	</body>
 </html>

+ 1 - 1
app/pcdl/classroom.php

@@ -457,7 +457,7 @@ else{
 	
 <div class="foot_div">
 
-<?php echo $module_gui_str['editor']['1066'];?>
+<?php echo $_local->gui->poweredby;?>
 </div>
 </body>
 </html>

+ 1 - 3
app/pcdl/head_bar.php

@@ -222,9 +222,7 @@
 					<li><a class="nav_link" href="../collect"><?php echo $_local->gui->composition; ?></a></li>
 					<li class="nav_link head_nav_dropdown" >
 						<div><?php echo $_local->gui->more; ?></div>
-						<ul class="head_nav_dropdown_content" style="margin-top: 0em;top: 2em;margin-left:-0.5em;padding-bottom: 0.5em;">
-							<!--<li><a class="nav_link" href="../pc"><?php echo $_local->gui->digest;//书摘?></a></li>
-							<li><a class="nav_link" href="../course"><?php echo $_local->gui->composition;//著作?></a></li>-->
+						<ul class="head_nav_dropdown_content" style="margin-top: 0em;top: 2em;margin-left:-0.5em;padding-bottom: 0.5em;z-index: 1;">
 							<li><a class="nav_link" href="../calendar"><?php echo $_local->gui->buddhist_calendar;?></a></li>
 							<li><a class="nav_link" href="../tools/unicode.html"><?php echo $_local->gui->code_convert;//巴利编码转换?></a></li>
 							<li><a class="nav_link" href="../statistics"><?php echo $_local->gui->corpus_statistics;?></a></li>

+ 2 - 2
app/pcdl/uhome.php

@@ -174,14 +174,14 @@ else{
 				<div id="wizard_palicannon_par_select_text">
 					<div id="wizard_palicannon_par_select_text_body">
 						<div id="userfilelist">
-						<?php echo $module_gui_str['editor']['1065'];?>
+						<?php echo $_local->gui->loading;?>
 						</div>					
 					</div>
 				</div>
 		</div>				
 	</div>
 <div class="foot_div">
-<?php echo $module_gui_str['editor']['1066'];?>
+<?php echo $_local->gui->poweredby;?>
 </div>
 </body>
 </html>

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

@@ -558,6 +558,8 @@
 		"select": "select",
 		"history": "history",
 		"top_search": "Top search",
+		"similar_sentences": "similar sentences",
+		"close": "close",
 		"": ""
 	},
 	"grammastr": [

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

@@ -557,6 +557,8 @@
 		"select": "select",
 		"history": "history",
 		"top_search": "Top search",
+		"similar_sentences": "similar sentences",
+		"close": "close",
 		"": ""
 	},
 	"grammastr": [

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

@@ -557,6 +557,8 @@
 		"select": "select",
 		"history": "history",
 		"top_search": "Top search",
+		"similar_sentences": "similar sentences",
+		"close": "close",
 		"": "",
 		"": ""
 	},

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

@@ -562,6 +562,8 @@
 		"select": "select",
 		"history": "history",
 		"top_search": "Top search",
+		"similar_sentences": "similar sentences",
+		"close": "close",
 		"": "",
 		"": ""
 	},

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

@@ -559,6 +559,8 @@
 		"select": "选择",
 		"history": "历史记录",
 		"top_search": "热搜",
+		"similar_sentences": "相似句",
+		"close": "关闭",
 		"": ""
 	},
 	"grammastr": [

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

@@ -559,6 +559,8 @@
 		"select": "選擇",
 		"history": "歷史記錄",
 		"top_search": "熱搜",
+		"similar_sentences": "相似句",
+		"close": "關閉",
 		"": ""
 	},
 	"grammastr": [

+ 2 - 2
app/studio/editor.php

@@ -819,7 +819,7 @@ foreach($plugin_list as $info){
 	<!--译文编辑窗口-->
 	<div id="id_text_edit_form">
 		<div id="id_text_edit_caption"  class="dialog-title">
-			<div><button id="id_text_edit_cancel" type="button" onclick="edit_tran_cancal()"><?php echo $module_gui_str['editor']['1028'];?></button></div>
+			<div><button id="id_text_edit_cancel" type="button" onclick="edit_tran_cancal()"><?php echo $_local->gui->cancel;?></button></div>
 			<div><span id="id_text_edit_caption_text">
 				<?php echo $_local->gui->translation; ?></span></div>
 			<div id="id_text_edit_bottom">
@@ -881,7 +881,7 @@ foreach($plugin_list as $info){
 					<button  id="id_open_editor_load_stream"  onclick="pc_loadStream(0)"><?php //echo $module_gui_str['editor']['1030'];?>
 						<svg class="button_icon"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="svg/icon.svg#ic_cloud_download"></use></svg>
 					</button>
-					<button  id="id_cancel_stream" onclick="pc_cancelStream()"><?php //echo $module_gui_str['editor']['1028'];?>
+					<button  id="id_cancel_stream" onclick="pc_cancelStream()"><?php //echo $_local->gui->cancel;?>
 						<svg class="button_icon"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="svg/icon.svg#ic_note_add"></use></svg>
 					</button>
 					<button  id="pc_empty_download_list" onclick="pc_empty_download_list()"><?php //echo $module_gui_str['editor']['1045'];?>

+ 18 - 18
app/studio/group.php

@@ -173,26 +173,26 @@ require_once '../public/_pdo.php';
 					<div>
 						<select id="id_index_status"  onchange="showUserFilaList()">
 							<option value="all" >
-								<?php echo $module_gui_str['editor_dictionary']['1018'];//全部?>
+								<?php echo $_local->gui->all;//全部?>
 							</option>
 							<option value="share" >
-								<?php echo $module_gui_str['tools']['1017'];//已共享?>
+								<?php echo $_local->gui->shared;//已共享?>
 							</option>
 							<option value="recycle" >
-								<?php echo $module_gui_str['tools']['1007'];//回收站?>
+								<?php echo $_local->gui->recycle_bin;//回收站?>
 							</option>
 						</select>					
 					</div>
-					<div><?php echo $module_gui_str['editor']['1059'];//排序方式?>
+					<div><?php echo $_local->gui->order_by;//排序方式?>
 						<select id="id_index_orderby"  onchange="showUserFilaList()">
-							<option value="accese_time" ><?php echo $module_gui_str['editor']['1060'];//訪問?></option>
-							<option value="modify_time" ><?php echo $module_gui_str['editor']['1061'];//修改?></option>
-							<option value="create_time" ><?php echo $module_gui_str['editor']['1062'];//創建?></option>
-							<option value="title" ><?php echo $module_gui_str['editor']['1063'];//標題?></option>
+							<option value="accese_time" ><?php echo $_local->gui->accessed;//訪問?></option>
+							<option value="modify_time" ><?php echo $_local->gui->modified;//修改?></option>
+							<option value="create_time" ><?php echo $_local->gui->created;//創建?></option>
+							<option value="title" ><?php echo $_local->gui->title;//標題?></option>
 						</select>					
 						<select id="id_index_order"  onchange="showUserFilaList()">
-							<option value="DESC" ><?php echo $module_gui_str['editor']['1111'];//降序?></option>
-							<option value="ASC" ><?php echo $module_gui_str['editor']['1110'];//升序?></option>
+							<option value="DESC" ><?php echo $_local->gui->desc;//降序?></option>
+							<option value="ASC" ><?php echo $_local->gui->asc;;//升序?></option>
 						</select>	
 						<button id="file_select" onclick="mydoc_file_select(true)">
 							选择
@@ -200,7 +200,7 @@ require_once '../public/_pdo.php';
 					</div>
 				</div>
 				<div>
-				<input id="keyword" type="input"  placeholder=<?php echo $module_gui_str['editor']['1114'].$module_gui_str['editor']['1115'];?>  onkeyup="file_search_keyup()"/>
+				<input id="keyword" type="input"  placeholder=<?php echo $_local->gui->title.$_local->gui->search;?>  onkeyup="file_search_keyup()"/>
 				</div>
 
 			</div>
@@ -209,17 +209,17 @@ require_once '../public/_pdo.php';
 				<div  style="display:flex;justify-content: space-between;">
 					<div>
 						<span id="button_group_nomal" >
-						<button onclick="file_del()"><?php echo $module_gui_str['tools']['1009'];//刪除?></button>
-						<button onclick="file_share(true)"><?php echo $module_gui_str['tools']['1008'];//共享?></button>
-						<button onclick="file_share(false)"><?php echo $module_gui_str['tools']['1010'];//取消共享?></button>
+						<button onclick="file_del()"><?php echo $_local->gui->delete;//刪除?></button>
+						<button onclick="file_share(true)"><?php echo $_local->gui->share;//共享?></button>
+						<button onclick="file_share(false)"><?php echo $_local->gui->undo_shared;//取消共享?></button>
 						</span>
 						<span id="button_group_recycle" style="dispaly:none">
-						<button onclick="file_remove()" style="background-color:red;"><?php echo $module_gui_str['tools']['1016'];//彻底删除?></button>
-						<button onclick="file_remove_all()"><?php echo $module_gui_str['tools']['1015'];//清空回收站?></button>
+						<button onclick="file_remove()" style="background-color:red;"><?php echo $_local->gui->completely_delete;//彻底删除?></button>
+						<button onclick="file_remove_all()"><?php echo $_local->gui->empty_the_recycle_bin;//清空回收站?></button>
 						</span>
 					</div>
 					<div>
-						<button onclick="mydoc_file_select(false)"><?php echo $module_gui_str['editor']['1028'];//取消?></button>
+						<button onclick="mydoc_file_select(false)"><?php echo $_local->gui->cancel;//取消?></button>
 					</div>
 				</div>
 			</div>
@@ -308,7 +308,7 @@ require_once '../public/_pdo.php';
 		
 	</div>
 <div class="foot_div">
-<?php echo $module_gui_str['editor']['1066'];?>
+<?php echo $_local->gui->poweredby;?>
 </div>
 </body>
 </html>

+ 1 - 1
app/studio/index_foot.php

@@ -1,5 +1,5 @@
 <div class="foot_div">
-	<?php //echo $module_gui_str['editor']['1066'];?>
+	<?php //echo $_local->gui->poweredby;?>
 	</div>
 
 </body>

+ 1 - 1
app/studio/index_new.php

@@ -124,7 +124,7 @@ else{
 		</div>
 	</div>
 <div class="foot_div">
-<?php echo $module_gui_str['editor']['1066'];?>
+<?php echo $_local->gui->poweredby;?>
 </div>
 </body>
 </html>

+ 1 - 1
app/studio/index_pc.php

@@ -175,7 +175,7 @@ require_once '../studio/index_head.php';
 				<button  id="id_open_editor_load_stream"  onclick="open_editor_load_stream()"><?php //echo $module_gui_str['editor']['1030'];?>
 					<svg class="button_icon"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="svg/icon.svg#ic_cloud_download"></use></svg>
 				</button>
-				<button  id="id_cancel_stream" onclick="append_stream()"><?php //echo $module_gui_str['editor']['1028'];?>
+				<button  id="id_cancel_stream" onclick="append_stream()"><?php //echo $_local->gui->cancel;?>
 					<svg class="button_icon"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="svg/icon.svg#ic_note_add"></use></svg>
 				</button>
 				<button  id="pc_empty_download_list" onclick="pc_empty_download_list()"><?php //echo $module_gui_str['editor']['1045'];?>

+ 21 - 21
app/studio/index_recent.php

@@ -96,26 +96,26 @@ require_once '../studio/index_head.php';
 					<div>
 						<select id="id_index_status"  onchange="showUserFilaList()">
 							<option value="all" >
-								<?php echo $module_gui_str['editor_dictionary']['1018'];//全部?>
+								<?php echo $_local->gui->all;//全部?>
 							</option>
 							<option value="share" >
-								<?php echo $module_gui_str['tools']['1017'];//已共享?>
+								<?php echo $_local->gui->shared;//已共享?>
 							</option>
 							<option value="recycle" >
-								<?php echo $module_gui_str['tools']['1007'];//回收站?>
+								<?php echo $_local->gui->recycle_bin;//回收站?>
 							</option>
 						</select>					
 					</div>
-					<div><?php echo $module_gui_str['editor']['1059'];//排序方式?>
+					<div><?php echo $_local->gui->order_by;//排序方式?>
 						<select id="id_index_orderby"  onchange="showUserFilaList()">
-							<option value="accese_time" ><?php echo $module_gui_str['editor']['1060'];//訪問?></option>
-							<option value="modify_time" ><?php echo $module_gui_str['editor']['1061'];//修改?></option>
-							<option value="create_time" ><?php echo $module_gui_str['editor']['1062'];//創建?></option>
-							<option value="title" ><?php echo $module_gui_str['editor']['1063'];//標題?></option>
+							<option value="accese_time" ><?php echo $_local->gui->accessed;//訪問?></option>
+							<option value="modify_time" ><?php echo $_local->gui->modified;//修改?></option>
+							<option value="create_time" ><?php echo $_local->gui->created;//創建?></option>
+							<option value="title" ><?php echo $_local->gui->title;//標題?></option>
 						</select>					
 						<select id="id_index_order"  onchange="showUserFilaList()">
-							<option value="DESC" ><?php echo $module_gui_str['editor']['1111'];//降序?></option>
-							<option value="ASC" ><?php echo $module_gui_str['editor']['1110'];//升序?></option>
+							<option value="DESC" ><?php echo $_local->gui->desc;//降序?></option>
+							<option value="ASC" ><?php echo $_local->gui->asc;//升序?></option>
 						</select>	
 						<button id="file_select" onclick="mydoc_file_select(true)">
 							选择
@@ -123,28 +123,28 @@ require_once '../studio/index_head.php';
 					</div>
 				</div>
 				<div>
-				<input id="keyword" type="input"  placeholder='<?php echo $module_gui_str['editor']['1114'].$module_gui_str['editor']['1115'];?>'  onkeyup="file_search_keyup()"/>
+				<input id="keyword" type="input"  placeholder='<?php echo $_local->gui->title.$_local->gui->search;?>'  onkeyup="file_search_keyup()"/>
 				</div>
 
 				<div>
-				<?php echo $module_gui_str['tools']['1005'];?>:<span id="tag_list"><span class="tag"><?php echo $module_gui_str['tools']['1006'];?><a>×</a></span></span><input type="input" style="width:10em;">
+				<?php echo $_local->gui->tag;?>:<span id="tag_list"><span class="tag"><?php echo $_local->gui->lesson?><a>×</a></span></span><input type="input" style="width:10em;">
 				</div>
 			</div>
 			<div id="file_tools" style="display:none;">
 				<div  style="display:flex;justify-content: space-between;">
 					<div>
 						<span id="button_group_nomal" >
-						<button onclick="file_del()"><?php echo $module_gui_str['tools']['1009'];//刪除?></button>
-						<button onclick="file_share(true)"><?php echo $module_gui_str['tools']['1008'];//共享?></button>
-						<button onclick="file_share(false)"><?php echo $module_gui_str['tools']['1010'];//取消共享?></button>
+						<button onclick="file_del()"><?php echo $_local->gui->delete;//刪除?></button>
+						<button onclick="file_share(true)"><?php echo $_local->gui->share;//共享?></button>
+						<button onclick="file_share(false)"><?php echo $_local->gui->undo_shared;//取消共享?></button>
 						</span>
 						<span id="button_group_recycle" style="dispaly:none">
-						<button onclick="file_remove()" style="background-color:red;"><?php echo $module_gui_str['tools']['1016'];//彻底删除?></button>
-						<button onclick="file_remove_all()"><?php echo $module_gui_str['tools']['1015'];//清空回收站?></button>
+						<button onclick="file_remove()" style="background-color:red;"><?php echo $_local->gui->completely_delete;//彻底删除?></button>
+						<button onclick="file_remove_all()"><?php echo $_local->gui->empty_the_recycle_bin;//清空回收站?></button>
 						</span>
 					</div>
 					<div>
-						<button onclick="mydoc_file_select(false)"><?php echo $module_gui_str['editor']['1028'];//取消?></button>
+						<button onclick="mydoc_file_select(false)"><?php echo $_local->gui->cancel;//取消?></button>
 					</div>
 				</div>
 			</div>
@@ -158,7 +158,7 @@ require_once '../studio/index_head.php';
 				</div>
 			</div>
 			<div id="userfilelist">
-			<?php echo $module_gui_str['editor']['1065'];?>
+			<?php echo $_local->gui->loading;?>
 			</div>
 			
 		</div>
@@ -166,7 +166,7 @@ require_once '../studio/index_head.php';
 	</div>
 	
 	<div class="foot_div">
-	<?php echo $module_gui_str['editor']['1066'];?>
+	<?php echo $_local->gui->poweredby;?>
 	</div>
 
 
@@ -186,7 +186,7 @@ require_once '../studio/index_head.php';
 
 	</div>
 	<div id="rs_doc_coop_win_foot" >
-		<button onclick="file_coop_win_close()">关闭</button>
+		<button onclick="file_coop_win_close()"><?php echo $_local->gui->poweredby;?></button>
 	</div>
 	</div>
 	</div>

+ 1 - 1
app/studio/index_share.php

@@ -90,7 +90,7 @@ require_once '../studio/index_head.php';
 			</div>
 
 			<div id="userfilelist">
-				<?php echo $module_gui_str['editor']['1065'];?>
+				<?php echo $_local->gui->loading;?>
 			</div>
 			
 		</div>

+ 12 - 22
app/studio/module/editor_dictionary/gui.html

@@ -2,21 +2,16 @@
 	<h1></h1>
 	<div class="submenu">
 		<p class="submenu_title" onclick="submenu_show_detail(this)">
-			
 			<svg class="icon">
 				<use xlink:href="svg/icon.svg#ic_add"></use>
 			</svg>
 		</p>
 		<div class="submenu_details">
 			<div>
-				<a href="dictadmin/user/phpliteadmin.php"
-					target="user_dict_admin"></a><br>
-				<a href="dictadmin/system/phpliteadmin.php"
-					target="system_dict_admin"></a><br>
-				<a href="dictadmin/3rd/phpliteadmin.php"
-					target="3rd_dict_admin"></a><br>
-				<button type="button"
-					onclick="uploadAllWordData()"></button>
+				<a href="dictadmin/user/phpliteadmin.php" target="user_dict_admin"></a><br />
+				<a href="dictadmin/system/phpliteadmin.php" target="system_dict_admin"></a><br />
+				<a href="dictadmin/3rd/phpliteadmin.php" target="3rd_dict_admin"></a><br />
+				<button type="button" onclick="uploadAllWordData()"></button>
 			</div>
 		</div>
 	</div>
@@ -30,7 +25,6 @@
 		<div class="submenu_details">
 			<span id="id_load_dict_from_WBW_msg_inner"></span>
 		</div>
-
 	</div>
 
 	<div class="submenu">
@@ -40,13 +34,10 @@
 			</svg>
 		</p>
 		<div class="submenu_details">
-			<button type="button"
-				onclick="menu_file_export_ild()">export</button>
-			<button type="button"
-				onclick="menu_file_import_ild()">import</button>
+			<button type="button" onclick="menu_file_export_ild()">export</button>
+			<button type="button" onclick="menu_file_import_ild()">import</button>
 			<span id="id_ild_msg_inner"></span>
 		</div>
-
 	</div>
 
 	<div class="submenu">
@@ -61,10 +52,10 @@
 				<?php echo $module_gui_str['editor_dictionary']['1019']; ?>
 			</div>
 			<div>
-				<button type="button"
-					onclick="menu_dict_match()"><?php echo $module_gui_str['editor_dictionary']['1006']; ?></button>
-				<div id="id_dict_match_inner">
-				</div>
+				<button type="button" onclick="menu_dict_match()">
+					<?php echo $module_gui_str['editor_dictionary']['1006']; ?>
+				</button>
+				<div id="id_dict_match_inner"></div>
 				<p id="id_dict_msg"></p>
 			</div>
 		</div>
@@ -83,10 +74,9 @@
 				<select id="id_dict_applay_to">
 					<option value="current"><?php echo $module_gui_str['editor_dictionary']['1016']; ?></option>
 					<option value="sys"><?php echo $module_gui_str['editor_dictionary']['1017']; ?></option>
-					<option value="all"><?php echo $module_gui_str['editor_dictionary']['1018']; ?></option>
+					<option value="all"><?php echo $_local->gui->all; ?></option>
 				</select>
-
 			</div>
 		</div>
 	</div>
-</div>
+</div>

+ 20 - 20
app/studio/recycle.php

@@ -130,26 +130,26 @@ else{
 					<div>
 						<select id="id_index_status"  onchange="showUserFilaList()">
 							<option value="all" >
-								<?php echo $module_gui_str['editor_dictionary']['1018'];//全部?>
+								<?php echo $_local->gui->all;//全部?>
 							</option>
 							<option value="share" >
-								<?php echo $module_gui_str['tools']['1017'];//已共享?>
+								<?php echo $_local->gui->shared;//已共享?>
 							</option>
 							<option value="recycle" selected>
-								<?php echo $module_gui_str['tools']['1007'];//回收站?>
+								<?php echo $_local->gui->recycle_bin;//回收站?>
 							</option>
 						</select>					
 					</div>
-					<div><?php echo $module_gui_str['editor']['1059'];//排序方式?>
+					<div><?php echo $_local->gui->order_by;//排序方式?>
 						<select id="id_index_orderby"  onchange="showUserFilaList()">
-							<option value="accese_time" ><?php echo $module_gui_str['editor']['1060'];//訪問?></option>
-							<option value="modify_time" ><?php echo $module_gui_str['editor']['1061'];//修改?></option>
-							<option value="create_time" ><?php echo $module_gui_str['editor']['1062'];//創建?></option>
-							<option value="title" ><?php echo $module_gui_str['editor']['1063'];//標題?></option>
+							<option value="accese_time" ><?php echo $_local->gui->accessed;//訪問?></option>
+							<option value="modify_time" ><?php echo $_local->gui->modified;//修改?></option>
+							<option value="create_time" ><?php echo $_local->gui->created;//創建?></option>
+							<option value="title" ><?php echo $_local->gui->title;//標題?></option>
 						</select>					
 						<select id="id_index_order"  onchange="showUserFilaList()">
-							<option value="DESC" ><?php echo $module_gui_str['editor']['1111'];//降序?></option>
-							<option value="ASC" ><?php echo $module_gui_str['editor']['1110'];//升序?></option>
+							<option value="DESC" ><?php echo $_local->gui->desc;//降序?></option>
+							<option value="ASC" ><?php echo $_local->gui->asc;;//升序?></option>
 						</select>	
 						<button id="file_select" onclick="mydoc_file_select(true)">
 							选择
@@ -157,28 +157,28 @@ else{
 					</div>
 				</div>
 				<div>
-				<input id="keyword" type="input"  placeholder='<?php echo $module_gui_str['editor']['1114'].$module_gui_str['editor']['1115'];?>' onkeyup="file_search_keyup()"/>
+				<input id="keyword" type="input"  placeholder='<?php echo $_local->gui->title.$_local->gui->search;?>' onkeyup="file_search_keyup()"/>
 				</div>
 
 				<div>
-				<?php echo $module_gui_str['tools']['1005'];?>:<span id="tag_list"><span class="tag"><?php echo $module_gui_str['tools']['1006'];?><a>×</a></span></span><input type="input" style="width:10em;">
+				<?php echo $_local->gui->tag;?>:<span id="tag_list"><span class="tag"><?php echo $_local->gui->lesson?><a>×</a></span></span><input type="input" style="width:10em;">
 				</div>
 			</div>
 			<div id="file_tools" style="display:none;">
 				<div  style="display:flex;justify-content: space-between;">
 					<div>
 						<span id="button_group_nomal" >
-						<button onclick="file_del()"><?php echo $module_gui_str['tools']['1009'];//刪除?></button>
-						<button onclick="file_share(true)"><?php echo $module_gui_str['tools']['1008'];//共享?></button>
-						<button onclick="file_share(false)"><?php echo $module_gui_str['tools']['1010'];//取消共享?></button>
+						<button onclick="file_del()"><?php echo $_local->gui->delete;//刪除?></button>
+						<button onclick="file_share(true)"><?php echo $_local->gui->share;//共享?></button>
+						<button onclick="file_share(false)"><?php echo $_local->gui->undo_shared;//取消共享?></button>
 						</span>
 						<span id="button_group_recycle" style="dispaly:none">
-						<button onclick="file_remove()" style="background-color:red;"><?php echo $module_gui_str['tools']['1016'];//彻底删除?></button>
-						<button onclick="file_remove_all()"><?php echo $module_gui_str['tools']['1015'];//清空回收站?></button>
+						<button onclick="file_remove()" style="background-color:red;"><?php echo $_local->gui->completely_delete;//彻底删除?></button>
+						<button onclick="file_remove_all()"><?php echo $_local->gui->empty_the_recycle_bin;//清空回收站?></button>
 						</span>
 					</div>
 					<div>
-						<button onclick="mydoc_file_select(false)"><?php echo $module_gui_str['editor']['1028'];//取消?></button>
+						<button onclick="mydoc_file_select(false)"><?php echo $_local->gui->cancel;//取消?></button>
 					</div>
 				</div>
 			</div>
@@ -192,7 +192,7 @@ else{
 				</div>
 			</div>
 			<div id="userfilelist">
-			<?php echo $module_gui_str['editor']['1065'];?>
+			<?php echo $_local->gui->loading;?>
 			</div>
 			
 		</div>
@@ -200,7 +200,7 @@ else{
 	</div>
 	
 	<div class="foot_div">
-	<?php echo $module_gui_str['editor']['1066'];?>
+	<?php echo $_local->gui->poweredby;?>
 	</div>
 
 </body>

+ 2 - 2
app/studio/search.php

@@ -301,7 +301,7 @@ else{
 				<button  id="id_open_editor_load_stream"  onclick="pc_loadStream(0)"><?php //echo $module_gui_str['editor']['1030'];?>
 					<svg class="button_icon"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="svg/icon.svg#ic_cloud_download"></use></svg>
 				</button>
-				<button  id="id_cancel_stream" onclick="pc_cancelStream()"><?php //echo $module_gui_str['editor']['1028'];?>
+				<button  id="id_cancel_stream" onclick="pc_cancelStream()"><?php //echo $_local->gui->cancel;?>
 					<svg class="button_icon"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="svg/icon.svg#ic_note_add"></use></svg>
 				</button>
 				<button  id="pc_empty_download_list" onclick="pc_empty_download_list()"><?php //echo $module_gui_str['editor']['1045'];?>
@@ -324,7 +324,7 @@ else{
 	
 <div class="foot_div">
 
-<?php echo $module_gui_str['editor']['1066'];?>
+<?php echo $_local->gui->poweredby;?>
 </div>
 <div class="debugMsg" id="id_debug" style="display: none;"><!--调试信息-->
 	<div id="id_debug_output"></div>

+ 2 - 2
app/studio/term_sys_tool.php

@@ -408,7 +408,7 @@ function transfer_glossary(){
 				<button  id="id_open_editor_load_stream"  onclick="pc_loadStream(0)"><?php //echo $module_gui_str['editor']['1030'];?>
 					<svg class="button_icon"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="svg/icon.svg#ic_cloud_download"></use></svg>
 				</button>
-				<button  id="id_cancel_stream" onclick="pc_cancelStream()"><?php //echo $module_gui_str['editor']['1028'];?>
+				<button  id="id_cancel_stream" onclick="pc_cancelStream()"><?php //echo $_local->gui->cancel;?>
 					<svg class="button_icon"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="svg/icon.svg#ic_note_add"></use></svg>
 				</button>
 				<button  id="pc_empty_download_list" onclick="pc_empty_download_list()"><?php //echo $module_gui_str['editor']['1045'];?>
@@ -431,7 +431,7 @@ function transfer_glossary(){
 	
 <div class="foot_div">
 
-<?php echo $module_gui_str['editor']['1066'];?>
+<?php echo $_local->gui->poweredby;?>
 </div>
 <div class="debugMsg" id="id_debug" style="display: none;"><!--调试信息-->
 	<div id="id_debug_output"></div>

+ 18 - 9
app/term/note.js

@@ -555,12 +555,21 @@ function note_json_html(in_json) {
 	//output += "</div>";
 	//未选择的其他译文开始
 	output += "<div class='other_tran_div' sent='";
-	output += in_json.book + "-" + in_json.para + "-" + in_json.begin + "-" + in_json.end;
-	output += "'>";
-	output += "<div class='tool_bar'>";
+	output += in_json.book + "-" + in_json.para + "-" + in_json.begin + "-" + in_json.end + "' >";
+	output += "<div class='tool_bar' sent='";
+	output += in_json.book + "-" + in_json.para + "-" + in_json.begin + "-" + in_json.end + "' >";
 	output += "<span class='more_tran icon_expand'></span>";
-	output += "<span class='other_tran_span'>" + gLocal.gui.other + gLocal.gui.translation + "</span>";
+	//其他译文工具条
+	output += "<span class='other_bar'  >";
+	output += "<span class='other_tran_span' >" + gLocal.gui.other + gLocal.gui.translation + "</span>";
 	output += "<span class='other_tran_num'></span>";
+	output += "</span>";
+	output += "<span class='separate_line'></span>";
+	//相似句工具条
+	output += "<span class='other_bar' >";
+	output += "<span class='similar_sent_span' >" + gLocal.gui.similar_sentences + "</span>";
+	output += "<span class='similar_sent_num'></span>";
+	output += "</span>";
 	output += "</div>";
 	output += "<div class='other_tran'>";
 
@@ -620,7 +629,7 @@ function set_more_button_display() {
 			$(this).find(".other_tran_num").html(count);
 			$(this).find(".other_tran_num").attr("style", "display:inline-flex;");
 			$(this)
-				.find(".tool_bar")
+				.find(".other_bar")
 				.click(function () {
 					const sentid = $(this).parent().attr("sent").split("-");
 					const book = sentid[0];
@@ -628,11 +637,11 @@ function set_more_button_display() {
 					const begin = sentid[2];
 					const end = sentid[3];
 					let sentId = book + "-" + para + "-" + begin + "-" + end;
-					if ($(this).siblings(".other_tran").first().css("display") == "none") {
+					if ($(this).parent().siblings(".other_tran").first().css("display") == "none") {
 						$(".other_tran_div[sent='" + sentId + "']")
 							.children(".other_tran")
 							.slideDown();
-						$(this).children(".more_tran ").css("transform", "unset");
+						$(this).siblings(".more_tran ").css("transform", "unset");
 						$.get(
 							"../usent/get.php",
 							{
@@ -666,7 +675,7 @@ function set_more_button_display() {
 						$(".other_tran_div[sent='" + sentId + "']")
 							.children(".other_tran")
 							.slideUp();
-						$(this).children(".more_tran ").css("transform", "rotate(-90deg)");
+						$(this).siblings(".more_tran ").css("transform", "rotate(-90deg)");
 					}
 				});
 		} else {
@@ -675,7 +684,7 @@ function set_more_button_display() {
 			$(this)
 				.find(".other_tran_span")
 				.html(gLocal.gui.no + gLocal.gui.other + gLocal.gui.translation);
-			$(this).find(".more_tran").hide();
+			//$(this).find(".more_tran").hide();
 		}
 	});
 }

+ 9 - 0
app/term/term.css

@@ -505,3 +505,12 @@ note:hover .note_tool_bar {
 	margin: auto 2px;
 	color: whitesmoke;
 }
+.separate_line {
+	border: solid 1px #e8e8e8;
+    border-radius: 3px;
+    margin: 1px 5px;
+    width: 1px;
+    background: #c6c6c6;
+    text-decoration: none;
+}
+}

+ 1 - 1
app/tools/tree_designer.php

@@ -160,7 +160,7 @@ function treedesign(){
 
 <div class="foot_div">
 
-<?php echo $module_gui_str['editor']['1066'];?>
+<?php echo $_local->gui->poweredby;?>
 </div>
 </body>
 </html>