Przeglądaj źródła

用户注册 错误字串本地化

visuddhinanda 4 lat temu
rodzic
commit
a52b6e8fab

+ 9 - 9
app/db/user.php

@@ -245,7 +245,7 @@ class User extends Table
 			}
 		}else{
 			$this->result["ok"]=false;
-			$this->result["message"]="invalid email";
+			$this->result["message"]="::invalid_email";
 			echo json_encode($this->result, JSON_UNESCAPED_UNICODE);
 		}
 	}
@@ -272,7 +272,7 @@ class User extends Table
 			echo json_encode($this->result, JSON_UNESCAPED_UNICODE);
 		}else{
 			$this->result["ok"]=false;
-			$this->result["message"]="invalid_token";
+			$this->result["message"]="::invalid_token";
 			echo json_encode($this->result, JSON_UNESCAPED_UNICODE);
 		}
 	}
@@ -280,17 +280,17 @@ class User extends Table
 	private function isValidPassword($password){
 		if(mb_strlen($password,"UTF-8")<6){
 			$this->result["ok"]=false;
-			$this->result["message"]="password_too_short";
+			$this->result["message"]="::password_too_short";
 			return false;
 		}
 		if(mb_strlen($password,"UTF-8")>32){
 			$this->result["ok"]=false;
-			$this->result["message"]="password_too_long";
+			$this->result["message"]="::password_too_long";
 			return false;
 		}
 		if(strpos($password," ")!==false){
 			$this->result["ok"]=false;
-			$this->result["message"]="can_not_space";
+			$this->result["message"]="::password_invaild_symbol";
 			return false;
 		}
 		return true;
@@ -298,17 +298,17 @@ class User extends Table
 	private function isValidUsername($username){
 		if(mb_strlen($username,"UTF-8")>32){
 			$this->result["ok"]=false;
-			$this->result["message"]="username_too_long";
+			$this->result["message"]="::username_too_long";
 			return false;
 		}
 		if(mb_strlen($username,"UTF-8")<4){
 			$this->result["ok"]=false;
-			$this->result["message"]="username_too_short";
+			$this->result["message"]="::username_too_short";
 			return false;
 		}
 		if(preg_match("/@|\s|\//",$username)!==0){
 			$this->result["ok"]=false;
-			$this->result["message"]="char_error";
+			$this->result["message"]="::username_invaild_symbol";
 			return false;
 		}
 		return true;
@@ -317,7 +317,7 @@ class User extends Table
 		$isValid = filter_var($email, FILTER_VALIDATE_EMAIL);
 		if($isValid===false){
 			$this->result["ok"]=false;
-			$this->result["message"]="email_format_error";
+			$this->result["message"]="::invaild_email";
 		}
 		return $isValid;
 	}

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

@@ -640,6 +640,12 @@
 		"original": "original",
 		"page_num": "page",
 		"palihandbook": "巴利手册",
+		"invalid_email": "invalid email",
+		"invalid_token": "invalid token",
+		"username_too_long": "username too long",
+		"username_too_short": "username too short",
+		"username_invaild_symbol": "username invaild symbol",
+		"password_invaild_symbol": "password invaild symbol",
 		"": ""
 	},
 	"grammastr": [

+ 7 - 1
app/public/lang/en.json

@@ -638,7 +638,13 @@
 		"reference": "reference",
 		"original": "original",
 		"page_num": "page",
-		"palihandbook": "巴利手册",
+		"palihandbook": "pali handbook",
+		"invalid_email": "invalid email",
+		"invalid_token": "invalid token",
+		"username_too_long": "username too long",
+		"username_too_short": "username too short",
+		"username_invaild_symbol": "username invaild symbol",
+		"password_invaild_symbol": "password invaild symbol",
 		"": ""
 	},
 	"grammastr": [

+ 7 - 1
app/public/lang/my.json

@@ -638,7 +638,13 @@
 		"reference": "reference",
 		"original": "original",
 		"page_num": "page",
-		"palihandbook": "巴利手册",
+		"palihandbook": "pali handbook",
+		"invalid_email": "invalid email",
+		"invalid_token": "invalid token",
+		"username_too_long": "username too long",
+		"username_too_short": "username too short",
+		"username_invaild_symbol": "username invaild symbol",
+		"password_invaild_symbol": "password invaild symbol",
 		"": ""
 	},
 	"grammastr": [

+ 7 - 1
app/public/lang/si.json

@@ -643,7 +643,13 @@
 		"reference": "reference",
 		"original": "original",
 		"page_num": "page",
-		"palihandbook": "巴利手册",
+		"palihandbook": "pali handbook",
+		"invalid_email": "invalid email",
+		"invalid_token": "invalid token",
+		"username_too_long": "username too long",
+		"username_too_short": "username too short",
+		"username_invaild_symbol": "username invaild symbol",
+		"password_invaild_symbol": "password invaild symbol",
 		"": ""
 	},
 	"grammastr": [

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

@@ -642,6 +642,12 @@
 		"original": "原创",
 		"page_num": "页码",
 		"palihandbook": "巴利手册",
+		"invalid_email": "无效的电子邮件",
+		"invalid_token": "无效的密钥",
+		"username_too_long": "用户名过长",
+		"username_too_short": "用户名过短",
+		"username_invaild_symbol": "用户名包含无效字符",
+		"password_invaild_symbol": "密码包含无效字符",
 		"": ""
 	},
 	"grammastr": [

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

@@ -641,6 +641,12 @@
 		"original": "原創",
 		"page_num": "頁碼",
 		"palihandbook": "巴利手冊",
+		"invalid_email": "無效的電子郵件",
+		"invalid_token": "無效的密鑰",
+		"username_too_long": "用戶名過長",
+		"username_too_short": "用戶名過短",
+		"username_invaild_symbol": "用戶名包含無效字符",
+		"password_invaild_symbol": "密碼包含無效字符",
 		"": ""
 	},
 	"grammastr": [

+ 13 - 2
app/ucenter/sign.js

@@ -32,11 +32,12 @@ function submit(){
 			if(data.ok){
 				$("#form_div").hide();
 				$("#message").removeClass("form_error");
-				$("#message").html("注册成功。<a href='index.php?op=login'>登录</a>");
+				$("#message").html("注册成功。<a href='index.php?op=login'>"+gLocal.gui.login+"</a>");
 
 			}else{
 				$("#message").addClass("form_error");
-				$("#message").text(data.message);
+
+				$("#message").text(ConvertServerMsgToLocalString(data.message));
 			}
 	}).fail(function(jqXHR, textStatus, errorThrown){
 		$("#message").removeClass("form_error");
@@ -65,4 +66,14 @@ function submit(){
 		}
 		
 	});
+}
+
+function ConvertServerMsgToLocalString(str){
+	if(str.slice(0,2)=="::"){
+		let msg = str.slice(2);
+		if(gLocal.gui.hasOwnProperty(msg)){
+			return gLocal.gui[msg];
+		}
+	}
+	return str;
 }

+ 3 - 7
app/ucenter/sign_up.php

@@ -4,13 +4,6 @@ require_once '../path.php';
 require_once "../public/load_lang.php";
 require_once "../public/function.php";
 require_once "../redis/function.php";
-
-
-if (!isset($_GET["token"])) {
-    
-}
-
-
 ?>
 
 <!DOCTYPE html>
@@ -26,6 +19,9 @@ if (!isset($_GET["token"])) {
 		<script src="../studio/js/jquery-3.3.1.min.js"></script>
 		<script src="../studio/js/fixedsticky.js"></script>
 		<script src="../ucenter/sign.js"></script>
+		<script>
+		<?php require_once '../public/load_lang_js.php'; ?>
+	</script>
 		<style>
 		#login_body{
 			display: flex;