Преглед на файлове

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

visuddhinanda преди 5 години
родител
ревизия
13c98777b5

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

@@ -445,6 +445,10 @@
 		"tika": "ṭīkā",
 		"times2": "times",
 		"co_doc": "Collaborative Document",
+		"open": "Open",
+		"general": "General",
+		"username": "Login ID",
+		"change_password": "change the password",
 		"": ""
 	},
 	"grammastr": [

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

@@ -444,6 +444,11 @@
 		"atthakatha": "aṭṭhakathā",
 		"tika": "ṭīkā",
 		"times2": "times",
+		"co_doc": "Collaborative Document",
+		"open": "Open",
+		"general": "General",
+		"username": "Login ID",
+		"change_password": "change the password",
 		"": ""
 	},
 	"grammastr": [

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

@@ -444,6 +444,11 @@
 		"atthakatha": "အဋ္ဌကထာ",
 		"tika": "ဋီကာ",
 		"times2": "times",
+		"co_doc": "Collaborative Document",
+		"open": "Open",
+		"general": "General",
+		"username": "Login ID",
+		"change_password": "change the password",
 		"": "",
 		"": ""
 	},

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

@@ -449,6 +449,11 @@
 		"atthakatha": "අට‍්ඨකථා",
 		"tika": "ටීකා",
 		"times2": "times",
+		"co_doc": "Collaborative Document",
+		"open": "Open",
+		"general": "General",
+		"username": "Login ID",
+		"change_password": "change the password",
 		"": "",
 		"": ""
 	},

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

@@ -361,7 +361,7 @@
 		"yes_string": "可以",
 		"": "",
 		"continue": "继续",
-		"account": "用戶名",
+		"account": "账户",
 		"new_to_wikipali": "wikipāḷi的新用戶",
 		"create_account": "建立账户",
 		"have_account": "已有账户",
@@ -447,8 +447,9 @@
 		"times2": "次",
 		"co_doc": "协作文档",
 		"open": "打开",
-		"": "",
-		"": "",
+		"general": "通用",
+		"username": "用户名",
+		"change_password": "修改密码",
 		"": "",
 		"": "",
 		"": "",

+ 5 - 1
app/public/lang/zh-tw.json

@@ -361,7 +361,7 @@
 		"yes_string": "可以",
 		"": "",
 		"continue": "繼續",
-		"account": "用戶名",
+		"account": "賬戶",
 		"new_to_wikipali": "wikipāḷi的新用戶",
 		"create_account": "創建賬戶",
 		"have_account": "已有賬戶",
@@ -446,6 +446,10 @@
 		"tika": "復註",
 		"times2": "次",
 		"co_doc": "协作文档",
+		"open": "開啟",
+		"general": "通用",
+		"username": "使用者名稱",
+		"change_password": "修改密碼",
 		"": ""
 	},
 	"grammastr": [

+ 25 - 13
app/studio/js/message.js

@@ -373,6 +373,25 @@ function msg_set_tool_bar_msg_counter() {
 		$("#icon_notify_" + msg_my_id).show();
 	}
 }
+function time_standardize(date) {
+	var today_date = new Date();
+	var Local_time = date.toLocaleTimeString();
+	//將時間去掉秒的信息
+	if (Local_time && Local_time.split(":").length == 3) {
+		var Local_time_string = Local_time.split(":")[0] + ":" + Local_time.split(":")[1];
+		Local_time_string += Local_time.split(":")[2].slice(2);
+	}
+	else {
+		var Local_time_string = d.toLocaleTimeString()
+	}
+	if (date.toLocaleDateString() == today_date.toLocaleDateString()) {//如果是今天的消息,只显示时间
+		return (Local_time_string);
+	}
+	else {//如果不是今天的消息,只显示日期
+		return (date.toLocaleDateString());
+	}
+
+}
 
 //显示消息内容
 function msg_show_content(type, id) {
@@ -421,16 +440,9 @@ function msg_show_content(type, id) {
 				var d = new Date()
 				d.setTime(gDocMsgList[i].time * 1000);
 				//var Local_date=d.toLocaleDateString().split("/");
-				var Local_time = d.toLocaleTimeString();
-				//將時間去掉秒的信息
-				if (Local_time && Local_time.split(":").length == 3) {
-					var Local_time_string = Local_time.split(":")[0] + ":" + Local_time.split(":")[1];
-					Local_time_string += Local_time.split(":")[2].slice(2);
-				}
-				else {
-					var Local_time_string = d.toLocaleTimeString()
-				}
-				outHtml += "<div class='msgbox_time'><span>" + d.toLocaleDateString() + " " + Local_time_string + "</span></div>";//d.toLocaleeString()
+				var time_standardize_string = time_standardize(d);
+				outHtml += "<div class='msgbox_time'><span>" + time_standardize_string + "</span></div>";//d.toLocaleeString()
+
 			}
 			iLastTime = gDocMsgList[i].time;
 
@@ -576,7 +588,7 @@ function msg_update_msg_list() {
 			}
 			if (times == j) {
 				strHtml += "<li>";
-				var d = new Date()
+				var d = new Date();
 				d.setTime(msgList[i].newTime * 1000);
 				switch (msgList[i].type) {
 					case "1":
@@ -594,13 +606,13 @@ function msg_update_msg_list() {
 						}
 						strHtml += "<a href='#w" + msgList[i].id + "'>[«]</a>";
 						strHtml += "<a onclick=\"msg_show_msg_content('1','" + msgList[i].id + "')\">" + wordSpell + "</a></span>";
-						strHtml += "<span>" + d.toLocaleString() + "</span>";
+						strHtml += "<span>" + time_standardize(d) + "</span>";
 						break;
 					case "2":
 						let sent_id = msgList[i].id + "#" + msgList[i].data.begin + "#" + msgList[i].data.end;
 						let sent_msg_title = msgList[i].data.begin + "-" + msgList[i].data.end + "-" + msgList[i].data.text.slice(0, 5);
 						strHtml += "<a onclick=\"msg_show_msg_content('2','" + sent_id + "')\">" + sent_msg_title + "</a></span>";
-						strHtml += "<span>" + d.toLocaleString() + "</span>";
+						strHtml += "<span>" + time_standardize(d) + "</span>";
 						break;
 				}
 				strHtml += "</li>";

+ 20 - 18
app/studio/setting.php

@@ -1,15 +1,17 @@
 <?php
 require_once "../path.php";
 require_once 'checklogin.inc';
+require_once "../public/load_lang.php";
 require_once '../public/config.php';
 require_once "../public/_pdo.php";
 
-if(isset($_GET["language"])){$currLanguage=$_GET["language"];}
-else{$currLanguage="en";}
+//if(isset($_GET["language"])){$currLanguage=$_GET["language"];}
+//else{$currLanguage="en";}
 
 if(isset($_GET["device"])){$currDevice=$_GET["device"];}
 else{$currDevice="computer";}
 
+$menu_active["account"] = "";
 $menu_active["general"] = "";
 $menu_active["local"] = "";
 $menu_active["studio"] = "";
@@ -19,7 +21,6 @@ $menu_active["userdict"] = "";
 $menu_active["term"] = "";
 $menu_active["message"] = "";
 $menu_active["album"] = "";
-$menu_active["account"] = "";
 if(isset($_GET["item"])){
 	$currSettingItem=$_GET["item"];
 	$menu_active[$currSettingItem] = " class='act'";
@@ -64,16 +65,16 @@ $album_power["2"]="编辑";
 			
 			<div class='toc' id='leftmenuinnerinner'>	
 				<ul class="setting_item">
-					<li <?php echo $menu_active["general"];?>><a href="setting.php?item=general">General</a></li>
+					<li <?php echo $menu_active["account"];?>><a href="setting.php?item=account"><?php echo $_local->gui->account ;?></a></li>
+					<li <?php echo $menu_active["general"];?>><a href="setting.php?item=general"><?php echo $_local->gui->general ;?></a></li>
 					<li <?php echo $menu_active["local"];?>><a href="setting.php?item=local">Local</a></li>
-					<li <?php echo $menu_active["studio"];?>><a href="setting.php?item=studio">Studio</a></li>
-					<li <?php echo $menu_active["liberay"];?>><a href="setting.php?item=liberay">Liberay</a></li>
-					<li <?php echo $menu_active["dictionary"];?>><a href="setting.php?item=dictionary">Dictionary</a></li>
-					<li <?php echo $menu_active["userdict"];?>><a href="setting.php?item=userdict">User Dictionary</a></li>
-					<li <?php echo $menu_active["term"];?>><a href="setting.php?item=term">Term</a></li>
-					<li <?php echo $menu_active["message"];?>><a href="setting.php?item=message">Message</a></li>
+					<li <?php echo $menu_active["studio"];?>><a href="setting.php?item=studio"><?php echo $_local->gui->studio ;?></a></li>
+					<li <?php echo $menu_active["liberay"];?>><a href="setting.php?item=liberay"></a><?php echo $_local->gui->library ;?></li>
+					<li <?php echo $menu_active["dictionary"];?>><a href="setting.php?item=dictionary"><?php echo $_local->gui->dictionary ;?></a></li>
+					<li <?php echo $menu_active["userdict"];?>><a href="setting.php?item=userdict"><?php echo $_local->gui->user_dictionary ;?></a></li>
+					<li <?php echo $menu_active["term"];?>><a href="setting.php?item=term"><?php echo $_local->gui->dict_terms ;?></a></li>
+					<li <?php echo $menu_active["message"];?>><a href="setting.php?item=message"><?php echo $_local->gui->message ;?></a></li>
 					<li <?php echo $menu_active["album"];?>><a href="setting.php?item=album">Album</a></li>
-					<li <?php echo $menu_active["account"];?>><a href="setting.php?item=account">Accont</a></li>
 					<li><a href="../admin/setting.php?item=account">Web Admin</a></li>
 				</ul>
 			</div>
@@ -95,6 +96,7 @@ $album_power["2"]="编辑";
 			?>
 				
 			</div>
+			<!--
 			<div>
 				<span>Language</span>
 				<select id="id_language" name="menu" >
@@ -103,7 +105,7 @@ $album_power["2"]="编辑";
 					<option value="zh-cn" >简体中文</option>
 					<option value="zh-tw" >正體中文</option>
 				</select>
-			</div>
+			</div>-->
 		</div>
 <?php
 	switch($currSettingItem){
@@ -358,12 +360,12 @@ $album_power["2"]="编辑";
 
 			break;
 		case "account":
-			echo "<h2>Accont</h2>";
-			echo "User Name:$username<br />";
-			echo "Nick Name:<>$nickname<br />";
-			echo "Email:$email<br />";
-			echo "<a href='login.php?op=logout'>Logout</a><br>";
-			echo "<a href='../ucenter/pwd_set.php'>修改密码</a>";
+			echo "<h2>{$_local->gui->account}</h2>";
+			echo "{$_local->gui->username}:$username<br />";
+			echo "{$_local->gui->nick_name}:$nickname<br />";
+			echo "{$_local->gui->e_mail}:$email<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>";
 			break;
 		case "album":
 			$db_file = _FILE_DB_RESRES_INDEX_;

+ 47 - 18
documents/course/join_us.md

@@ -1,34 +1,63 @@
-# 我们热诚的欢迎您加入我们的圣典翻译计划
+# 欢迎您加入圣典翻译计划
 
 ## 序言
-此圣典翻译计划以学习和翻译第六次圣典结集的巴利文本为目的设立。学生在老师的带领下学习圣典内容,提升自己的巴利语及教理水平。在正确理解的基础上,以逐词解析或译文的形式翻译巴利圣典。此翻译计划在www.wikipali.org上发布翻译成果。
+此圣典翻译计划以学习和翻译第六次圣典结集的巴利文本为目的设立。学生在老师的带领下学习圣典内容,提升自己的巴利语及教理水平。在正确理解的基础上,以逐词解析或译文的形式翻译巴利圣典。
 
-这是一个公益的教学项目,而非带有商业目的的项目。所以在此过程中项目的组织者不会以任何方式向您收取任何费用。
+这是一个公益的教学和翻译项目,且不带有任何商业性质。
+- 任何项目的组织和个人,不会以任何方式向您收取任何费用
+- 该活动参与者将自动放弃该活动中贡献的笔记、翻译、视频、音频及其衍生品的相关的**商业版权**,或是**以盈利为目的**的公开发布
+- 任何组织包括平台,也不可以声明上述**商业版权**,或是**以盈利为目的**的公开发布,且原意接受社会各界的监督
+- 我们为该活动的参与者保留他们个人贡献的**署名权**和**修改权**
+
+如果您接受并认可上述平台共识,那我们欢迎您在wikipali平台上公开发表这些内容。以利益他人。
 
 在[公共版权](https://en.wikipedia.org/wiki/Public_domain)的前提下。我们欢迎您在wikipali平台上公开发表您的笔记,译文等。以利益他人。
 
 我们欢迎您参与此教学活动,无论是以学生,教师或是教学活动的服务者的身份。
 
-## 学生
-### 内容
-- 参与授课活动
-- 课前预习
-- 课堂笔记
+## 相关工作
+
+### 授课
+具体内容
+- 逐词逐句解读巴利圣典
+- 教授相关的巴利文法
+- 为翻译工作给出指导意见
 
-### 技能需求
+技能需求
 
-## 教师
-### 内容
-### 技能需求
+### 教师库专员
+工作内容
 
-## 教师库专员
-### 工作内容
-### 技能要求
+技能要求
 
-## 教学活动服
-### 内容
+### 教务
+内容
 - 网络或实体课程的策划
 - 课程表安排
 - 课程视频的录制和网络分享
+- 场地评估
+
+技能需求
+- 软件使用
+- 硬件接驳
+
+### 导播
+内容
+- 网络或实体课程的策划
+- 课程表安排
+- 课程视频的录制和网络分享
+- 场地评估
+
+技能需求
+- 软件使用
+- 硬件接驳
+
+### 课代表
+内容
+- 与教务对接课程安排,发布通知
+- 参与课程
+- 组织学生课前预习
+- 组织学生记录课堂笔记
+- 收集问题
 
-### 技能需求
+技能需求