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

app/channal/channal.js

@@ -101,15 +101,12 @@ function my_channal_edit(id) {
 
 					html += "<div style='width: 60%;padding: 1em;min-width: 25em;'>";
 					html += '<div style="display:flex;line-height:32px;">';
-					html += "<div style='flex:2;'>" + gLocal.gui.title + "</div>";
-					html += "<div style='flex:8;'>";
 					html += "<input type='hidden' name='id' value='" + result.id + "'/>";
 					html += "</div>";
-					html += "</div>";
 
 					html += '<div style="display:flex;line-height:32px;">';
-					html += '<div style="flex:2;">'+gLocal.gui.name+'</div>';
-					html += '<div style="flex:8;">';
+					html += "<div style='flex:2;'>" + gLocal.gui.title + "</div>";
+					html += "<div style='flex:8;'>";
 					html +=
 						"<input type='input' name='name' value='" +
 						result.name +

app/channal/my_channal_edit.php

@@ -71,14 +71,14 @@ require_once '../studio/index_head.php';
 					</button>
 				</span>
 				
-				<span class="icon_btn_div">				
+				<span class="icon_btn_div">
 					<span class="icon_btn_tip"><?php echo $_local->gui->recycle_bin;?></span>
 					<button id="to_recycle" type="button" class="icon_btn" onclick="channal_del()" title=" ">
 						<svg class="icon">
 							<use xlink:href="../studio/svg/icon.svg#ic_delete"></use>
 						</svg>
 					</button>
-				</span>	
+				</span>
 			</div>
 		</div>
 

app/public/lang/default.json

@@ -572,6 +572,20 @@
 		"disable": "disable",
 		"disable_note": "disable & invisible to anyone including myself",
 		"not_found": "not found",
+		"progress_curve": "progress curve",
+		"day_EXP": "Day EXP",
+		"Jan": "Jan",
+		"Feb": "Feb",
+		"Mar": "Mar",
+		"Apr": "Apr",
+		"May": "May",
+		"Jun": "Jun",
+		"Jul": "Jul",
+		"Aug": "Aug",
+		"Sep": "Sep",
+		"Oct": "Oct",
+		"Nov": "Nov",
+		"Dec": "Dec",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/en.json

@@ -24,16 +24,16 @@
 		"back": "back",
 		"base_on": "Base on",
 		"BE": "Buddhist Era ",
-		"bhumma": "Bhumma",
+		"bhumma": "Tuesday",
 		"book": "book",
 		"book_mark": "Book Mark",
 		"book_name": "book name ",
 		"bookmark": "bookmark...",
 		"buddhist_calendar": "Buddhist Calendar",
-		"budha": "Budha",
+		"budha": "Wednesday",
 		"by": "By",
 		"cancel": "Cancel",
-		"canda": "Canda",
+		"canda": "Monday",
 		"caption": "Caption",
 		"CE": "CE",
 		"change_position": "change position",
@@ -111,7 +111,7 @@
 		"gramma": "Grammar",
 		"gramma_case": "Grammar Case",
 		"guid_creator": "GUID Creator",
-		"guru": "Guru",
+		"guru": "Thursday",
 		"h": "(h)",
 		"half": "half",
 		"heading": "Heading",
@@ -244,7 +244,7 @@
 		"protection": "Protection【en】",
 		"pubba_māsa": "pubba-māsa",
 		"publish": "Publish",
-		"ravi": "Ravi",
+		"ravi": "Sunday",
 		"read": "Read",
 		"read_only": "Read Only",
 		"recent_scan": "Recent Scan",
@@ -285,7 +285,7 @@
 		"similar_words": "Similar Words",
 		"size": "size",
 		"smart_spell": "smart spell",
-		"sora": "Sora",
+		"sora": "Saturday",
 		"source": "Source",
 		"spell": "Spell",
 		"statistical_data": "statistical data",
@@ -294,7 +294,7 @@
 		"subversion": "Subversion",
 		"success": " Words Successfully",
 		"successful": "Successful",
-		"sukka": "Sukka",
+		"sukka": "Friday",
 		"sun_height_degree": "Max solar altitude ",
 		"system_default": "System Default",
 		"system_dictionary": "System Dictionary",
@@ -571,6 +571,20 @@
 		"disable": "disable",
 		"disable_note": "disable & invisible to anyone including myself",
 		"not_found": "not found",
+		"progress_curve": "progress curve",
+		"day_EXP": "Day EXP",
+		"Jan": "Jan",
+		"Feb": "Feb",
+		"Mar": "Mar",
+		"Apr": "Apr",
+		"May": "May",
+		"Jun": "Jun",
+		"Jul": "Jul",
+		"Aug": "Aug",
+		"Sep": "Sep",
+		"Oct": "Oct",
+		"Nov": "Nov",
+		"Dec": "Dec",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -571,6 +571,20 @@
 		"disable": "disable",
 		"disable_note": "disable & invisible to anyone including myself",
 		"not_found": "not found",
+		"progress_curve": "progress curve",
+		"day_EXP": "Day EXP",
+		"Jan": "Jan",
+		"Feb": "Feb",
+		"Mar": "Mar",
+		"Apr": "Apr",
+		"May": "May",
+		"Jun": "Jun",
+		"Jul": "Jul",
+		"Aug": "Aug",
+		"Sep": "Sep",
+		"Oct": "Oct",
+		"Nov": "Nov",
+		"Dec": "Dec",
 		"": "",
 		"": ""
 	},

app/public/lang/si.json

@@ -576,6 +576,20 @@
 		"disable": "disable",
 		"disable_note": "disable & invisible to anyone including myself",
 		"not_found": "not found",
+		"progress_curve": "progress curve",
+		"day_EXP": "Day EXP",
+		"Jan": "Jan",
+		"Feb": "Feb",
+		"Mar": "Mar",
+		"Apr": "Apr",
+		"May": "May",
+		"Jun": "Jun",
+		"Jul": "Jul",
+		"Aug": "Aug",
+		"Sep": "Sep",
+		"Oct": "Oct",
+		"Nov": "Nov",
+		"Dec": "Dec",
 		"": "",
 		"": ""
 	},

app/public/lang/zh-cn.json

@@ -574,6 +574,20 @@
 		"disable_note": "停用，即使自己也无法更新",
 		"not_found": "未找到",
 		"site_intro": "想学巴利不知从何开始<br>学过巴利语法但是面对圣典无从下手<br>想要翻译巴利但面临种种困难<br>我们都有相关工具为您提供支持<br>降低巴利语的阅读门槛",
+		"progress_curve": "进步曲线",
+		"day_EXP": "当日经验",
+		"Jan": "一月",
+		"Feb": "二月",
+		"Mar": "三月",
+		"Apr": "四月",
+		"May": "五月",
+		"Jun": "六月",
+		"Jul": "七月",
+		"Aug": "八月",
+		"Sep": "九月",
+		"Oct": "十月",
+		"Nov": "十一月",
+		"Dec": "十二月",
 
 		"": ""
 	},

app/public/lang/zh-tw.json

@@ -573,6 +573,20 @@
 		"disable_note": "停用",
 		"not_found": "未找到",
 		"site_intro": "想學巴利不知從何開始<br>學過巴利語法但是面對聖典無從下手<br>想要翻譯巴利但面臨種種困難<br>我們都有相關工具為您提供支援<br>降低巴利語的閱讀門檻",
+		"progress_curve": "進步曲線",
+		"day_EXP": "當日經驗",
+		"Jan": "一月",
+		"Feb": "二月",
+		"Mar": "三月",
+		"Apr": "四月",
+		"May": "五月",
+		"Jun": "六月",
+		"Jul": "七月",
+		"Aug": "八月",
+		"Sep": "九月",
+		"Oct": "十月",
+		"Nov": "十一月",
+		"Dec": "十二月",
 		"": ""
 	},
 	"grammastr": [

app/studio/js/render.js

@@ -1622,13 +1622,15 @@ function sent_show_rel_map(book, para, begin, end) {
 				} else {
 					dest = iterator.dest_id + "[" + dest + "]";
 				}
+/*
 				if (strRel.indexOf("SV") >= 0 || strRel.indexOf("-P") >= 0) {
 					memind += wid + "(" + pali + ")" + " ==> |" + strRel + "|" + dest + "\n";
 				} else if (strRel.indexOf("OV") >= 0 || strRel.indexOf("-S") >= 0) {
 					memind += dest + " ==> |" + strRel + "|" + wid + "(" + pali + ")" + "\n";
 				} else {
-					memind += wid + "(" + pali + ")" + " -- " + strRel + " --> " + dest + "\n";
 				}
+*/
+					memind += wid + "(" + pali + ")" + " -- " + strRel + " --> " + dest + "\n";
 			}
 		}
 	}

app/uhome/foot_step.php

@@ -65,6 +65,17 @@ include "../pcdl/html_head.php";
     calendar.render();
   });
 
+Highcharts.setOptions({
+    lang: {
+        weekdays: [
+            gLocal.gui.ravi, gLocal.gui.canda, gLocal.gui.bhumma, gLocal.gui.budha,
+            gLocal.gui.guru, gLocal.gui.sukka, gLocal.gui.sora
+        ],
+		shortMonths:[
+			gLocal.gui.Jan, gLocal.gui.Feb, gLocal.gui.Mar, gLocal.gui.Apr, gLocal.gui.May, gLocal.gui.Jun, gLocal.gui.Jul, gLocal.gui.Aug, gLocal.gui.Sep, gLocal.gui.Oct, gLocal.gui.Nov, gLocal.gui.Dec
+		]
+    }
+});
 
   Highcharts.getJSON('../ucenter/active_get.php', function (data) {
 
@@ -77,12 +88,21 @@ include "../pcdl/html_head.php";
     },
 
     title: {
-      text: 'Pali Step'
+      text: gLocal.gui.progress_curve
     },
+	tooltip: {
+			shared: true,
+			useHTML: true,
+			headerFormat: '<small>{point.key}</small><table>',
+			pointFormat: '<tr><td style="color: {series.color}">{series.name}: </td>' +
+				'<td style="text-align: right"><b>{point.y} '+gLocal.gui.h+'</b></td></tr>',
+			footerFormat: '</table>',
+			valueDecimals: 2
+		},
 
     series: [{
       type: 'ohlc',
-      name: '每日收获',
+      name: gLocal.gui.day_EXP,
       data: data,
       dataGrouping: {
         units: [[

app/uhome/head.php

@@ -58,7 +58,7 @@
         </div>
 
         <div id="main_tag"  style="">
-            <span tag=<?php echo "jianjie";?>><?php echo "简介";?></span>
+            <span tag=<?php echo "jianjie";?>><?php echo $_local->gui->introduction;?></span>
 
             <a href="trans.php?userid=<?php echo $_GET["userid"];?>">
                 <span tag=<?php echo $_local->gui->translation;?>>