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

app/article/index.php

@@ -58,7 +58,7 @@ require_once "../pcdl/html_head.php";
 	#head_bar{
 		display: flex;
 		justify-content: space-between;
-		height: 5em;
+		/*height: 5em;*/
 		background-color: var(--tool-bg-color1);
 		border-bottom: 1px solid var(--tool-line-color);
 		padding:10px;

app/public/lang/default.json

@@ -603,6 +603,8 @@
 		"owner": "Owner",
 		"manager": "Manager",
 		"enter": "Enter",
+		"avatar": "Avatar",
+		"display": "display",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/en.json

@@ -602,6 +602,8 @@
 		"owner": "Owner",
 		"manager": "Manager",
 		"enter": "Enter",
+		"avatar": "Avatar",
+		"display": "display",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -602,6 +602,8 @@
 		"owner": "Owner",
 		"manager": "Manager",
 		"enter": "Enter",
+		"avatar": "Avatar",
+		"display": "display",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/si.json

@@ -607,6 +607,8 @@
 		"owner": "Owner",
 		"manager": "Manager",
 		"enter": "Enter",
+		"avatar": "Avatar",
+		"display": "display",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-cn.json

@@ -272,7 +272,7 @@
 		"sandhi_orginal_word": "连读词原词",
 		"sandhi_splited_word": "连读词拆分",
 		"save": "保存",
-		"script": "巴利脚本",
+		"script": "巴利文字",
 		"search": "搜索",
 		"season": "季节 ",
 		"sec": "秒",
@@ -605,6 +605,8 @@
 		"owner": "拥有者",
 		"manager": "管理员",
 		"enter": "进入",
+		"avatar": "头像",
+		"display": "显示",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-tw.json

@@ -272,7 +272,7 @@
 		"sandhi_orginal_word": "黏音詞原詞",
 		"sandhi_splited_word": "黏音詞拆分",
 		"save": "儲存",
-		"script": "巴利指令碼",
+		"script": "巴利文字",
 		"search": "搜尋",
 		"season": "季節",
 		"sec": "秒",
@@ -604,6 +604,8 @@
 		"owner": "擁有者",
 		"manager": "管理員",
 		"enter": "進入",
+		"avatar": "頭像",
+		"display": "顯示",
 		"": ""
 	},
 	"grammastr": [

app/reader/index.php

@@ -71,7 +71,7 @@ require_once "../pcdl/html_head.php";
 	#head_bar{
 		display: flex;
 		justify-content: space-between;
-		height: 5em;
+		/*height: 5em;*/
 		background-color: var(--tool-bg-color1);
 		border-bottom: 1px solid var(--tool-line-color);
 		padding:10px;
@@ -256,7 +256,7 @@ require_once "../pcdl/html_head.php";
 
 	<div>
 		<span>
-		<input type="checkbox" onchange="setVisibility('palitext',this)" checked>Pali Text Visible
+		<input type="checkbox" onchange="setVisibility('palitext',this)" checked><?php echo $_local->gui->script; ?>
 		<?php
 		//echo "<button class='icon_btn'  title='{$_local->gui->add}{$_local->gui->subfield}'>";
 		//echo "<a href='../article/frame.php?id=".$_GET["id"];

app/search/palitext1.php

@@ -68,12 +68,12 @@ require_once "../pcdl/html_head.php";
 
 	#head_bar{
 		display: flex;
-    justify-content: space-between;
-    height: 5em;
-    background-color: var(--tool-bg-color1);
-    border-bottom: 1px solid var(--tool-line-color);
-	padding:10px;
-	margin-top: 50px;
+		justify-content: space-between;
+		/*height: 5em;*/
+		background-color: var(--tool-bg-color1);
+		border-bottom: 1px solid var(--tool-line-color);
+		padding:10px;
+		margin-top: 50px;
 	}
 
 	.main_view{

app/studio/index_new.php

@@ -82,7 +82,7 @@ else{
 				<select id="id_language" name="menu" onchange="menuLangrage(this)">
 					<option value="en" >English</option>
 					<option value="si" >සිංහල</option>
-					<option value="my" >myanmar</option>
+					<option value="my" >မြန်မာ</option>
 					<option value="zh-cn" >简体中文</option>
 					<option value="zh-tw" >正體中文</option>
 				</select>

app/ucenter/default.json

@@ -19,7 +19,7 @@
 	],
 	"dict.whitelist": ["@kosalla", "@mine"],
 	"dict.blacklist": ["@all", "bhmf"],
-	"lib.first_script": "roma",
+	"lib.first_script": "Roman",
 	"lib.second_script": "none",
-	"lib.pali_script": ["none", "roma", "my"]
+	"lib.pali_script": ["none", "Roman", "မြန်မာ"]
 }

app/ucenter/setting.js

@@ -20,9 +20,9 @@ function setting_onload() {
 			//Library 设置
 
 			html = "";
-			html += "<h3>显示/Display</h3>";
-			html += "<div>巴利原文1" + setting_render_paliscript("lib.first_script") + "</div>";
-			html += "<div>巴利原文2" + setting_render_paliscript("lib.second_script") + "</div>";
+			html += "<h3>"+gLocal.gui.script+gLocal.gui.display+"</h3>";
+			html += "<div>"+gLocal.gui.main_code +"&nbsp;"+ setting_render_paliscript("lib.first_script") + "</div>";
+			html += "<div>"+gLocal.gui.sub_pcode +"&nbsp;"+ setting_render_paliscript("lib.second_script") + "</div>";
 
 			$("#setting_library").html(html);
 			//Library 设置结束

app/ucenter/setting.php

@@ -249,11 +249,11 @@ para:hover{
 			echo "<div id='setting_account_shell' class='setting_shell'>";
             echo "<a name='account'></a>";
 			echo "<h2>{$_local->gui->account}</h2>";
-			echo "头像：<span id='head_img'></span>";
+			echo "{$_local->gui->avatar}：<span id='head_img'></span>";
 
-            echo "{$_local->gui->username}：{$_COOKIE["username"]} <button>修改</button><br />";
-            echo "{$_local->gui->nick_name}：{$_COOKIE["nickname"]} <button>修改</button><br />";
-            echo "{$_local->gui->e_mail}：{$_COOKIE["email"]}<button>修改</button><br />";
+            echo "{$_local->gui->username}：{$_COOKIE["username"]} <button>{$_local->gui->modify}</button><br />";
+            echo "{$_local->gui->nick_name}：{$_COOKIE["nickname"]} <button>{$_local->gui->modify}</button><br />";
+            echo "{$_local->gui->e_mail}：{$_COOKIE["email"]}<button>{$_local->gui->modify}</button><br />";
             echo "<a href='../ucenter/pwd_set.php'>{$_local->gui->change_password}</a><br>";
 			echo "<a href='login.php?op=logout'>{$_local->gui->logout}</a>";
 			echo "</div>";

app/wiki/wiki.php

@@ -152,11 +152,11 @@ echo "wiki_load_word('{$_get_word}')";
 	}
 	#head_bar{
 		display: flex;
-    justify-content: space-between;
-    height: 5em;
-    background-color: var(--bookx);
-    border-bottom: 1px solid var(--tool-line-color);
-	margin-top: 50px;
+		justify-content: space-between;
+		/*height: 5em;*/
+		background-color: var(--bookx);
+		border-bottom: 1px solid var(--tool-line-color);
+		margin-top: 50px;
 	}
 	.term_block_bar_left{
 		display: flex;