refactor: New Crowdin translations by Github Action (#592)

Co-authored-by: Crowdin Bot <support+bot@crowdin.com>

object/user_upload.go

@@ -52,8 +52,8 @@ func UploadUsers(owner string, fileId string) bool {
 
 	oldUserMap := getUserMap(owner)
 	newUsers := []*User{}
-	for _, line := range table {
+	for index, line := range table {
-		if parseLineItem(&line, 0) == "" {
+		if index == 0 || parseLineItem(&line, 0) == "" {
 			continue
 		}
 
@@ -67,38 +67,42 @@ func UploadUsers(owner string, fileId string) bool {
 			Password:          parseLineItem(&line, 6),
 			PasswordSalt:      parseLineItem(&line, 7),
 			DisplayName:       parseLineItem(&line, 8),
-			Avatar:            parseLineItem(&line, 9),
+			FirstName:         parseLineItem(&line, 9),
+			LastName:          parseLineItem(&line, 10),
+			Avatar:            parseLineItem(&line, 11),
 			PermanentAvatar:   "",
-			Email:             parseLineItem(&line, 10),
+			Email:             parseLineItem(&line, 12),
-			Phone:             parseLineItem(&line, 11),
+			Phone:             parseLineItem(&line, 13),
-			Location:          parseLineItem(&line, 12),
+			Location:          parseLineItem(&line, 14),
-			Address:           []string{parseLineItem(&line, 13)},
+			Address:           []string{parseLineItem(&line, 15)},
-			Affiliation:       parseLineItem(&line, 14),
+			Affiliation:       parseLineItem(&line, 16),
-			Title:             parseLineItem(&line, 15),
+			Title:             parseLineItem(&line, 17),
-			IdCardType:        parseLineItem(&line, 16),
+			IdCardType:        parseLineItem(&line, 18),
-			IdCard:            parseLineItem(&line, 17),
+			IdCard:            parseLineItem(&line, 19),
-			Homepage:          parseLineItem(&line, 18),
+			Homepage:          parseLineItem(&line, 20),
-			Bio:               parseLineItem(&line, 19),
+			Bio:               parseLineItem(&line, 21),
-			Tag:               parseLineItem(&line, 20),
+			Tag:               parseLineItem(&line, 22),
-			Region:            parseLineItem(&line, 21),
+			Region:            parseLineItem(&line, 23),
-			Language:          parseLineItem(&line, 22),
+			Language:          parseLineItem(&line, 24),
-			Gender:            parseLineItem(&line, 23),
+			Gender:            parseLineItem(&line, 25),
-			Birthday:          parseLineItem(&line, 24),
+			Birthday:          parseLineItem(&line, 26),
-			Education:         parseLineItem(&line, 25),
+			Education:         parseLineItem(&line, 27),
-			Score:             parseLineItemInt(&line, 26),
+			Score:             parseLineItemInt(&line, 28),
-			Ranking:           parseLineItemInt(&line, 27),
+			Karma:             parseLineItemInt(&line, 29),
+			Ranking:           parseLineItemInt(&line, 30),
 			IsDefaultAvatar:   false,
-			IsOnline:          parseLineItemBool(&line, 28),
+			IsOnline:          parseLineItemBool(&line, 31),
-			IsAdmin:           parseLineItemBool(&line, 29),
+			IsAdmin:           parseLineItemBool(&line, 32),
-			IsGlobalAdmin:     parseLineItemBool(&line, 30),
+			IsGlobalAdmin:     parseLineItemBool(&line, 33),
-			IsForbidden:       parseLineItemBool(&line, 31),
+			IsForbidden:       parseLineItemBool(&line, 34),
-			IsDeleted:         parseLineItemBool(&line, 32),
+			IsDeleted:         parseLineItemBool(&line, 35),
-			SignupApplication: parseLineItem(&line, 33),
+			SignupApplication: parseLineItem(&line, 36),
 			Hash:              "",
 			PreHash:           "",
-			CreatedIp:         parseLineItem(&line, 34),
+			CreatedIp:         parseLineItem(&line, 37),
-			LastSigninTime:    parseLineItem(&line, 35),
+			LastSigninTime:    parseLineItem(&line, 38),
-			LastSigninIp:      parseLineItem(&line, 36),
+			LastSigninIp:      parseLineItem(&line, 39),
+			Ldap:              "",
 			Properties:        map[string]string{},
 		}
 

web/src/auth/AuthCallback.js

@@ -106,7 +106,7 @@ class AuthCallback extends React.Component {
       method: method,
     };
     const oAuthParams = Util.getOAuthGetParameters(innerParams);
-    const concatChar = oAuthParams?.redirectUri?.indexOf('?') === -1 ? '?' : '&';
+    const concatChar = oAuthParams?.redirectUri?.includes('?') ? '&' : '?';
     AuthBackend.login(body, oAuthParams)
       .then((res) => {
         if (res.status === 'ok') {

web/src/auth/LoginPage.js

@@ -138,7 +138,7 @@ class LoginPage extends React.Component {
             Setting.goToLink(link);
           } else if (responseType === "code") {
             const code = res.data;
-            const concatChar = oAuthParams?.redirectUri?.indexOf('?') === -1 ? '?' : '&';
+            const concatChar = oAuthParams?.redirectUri?.includes('?') ? '&' : '?';
 
             if (Setting.hasPromptPage(application)) {
               AuthBackend.getAccount("")

web/src/locales/zh/data.json

@@ -20,8 +20,8 @@
     "Password ON": "开启密码",
     "Password ON - Tooltip": "是否允许密码登录",
     "Please select a HTML file": "请选择一个HTML文件",
-    "Redirect URL": "回调URL",
+    "Redirect URL": "重定向 URL",
-    "Redirect URLs": "回调URLs",
+    "Redirect URLs": "重定向 URLs",
     "Redirect URLs - Tooltip": "登录成功后重定向地址列表",
     "Refresh token expire": "Refresh Token过期时间",
     "Refresh token expire - Tooltip": "Refresh Token过期时间",