diff --git a/i18n/util.go b/i18n/util.go
index d7bbe39a..1c163efd 100644
--- a/i18n/util.go
+++ b/i18n/util.go
@@ -16,6 +16,7 @@ package i18n
import (
"fmt"
+ "strings"
"github.com/casbin/casdoor/util"
)
@@ -37,6 +38,7 @@ func readI18nFile(language string) *I18nData {
func writeI18nFile(language string, data *I18nData) {
s := util.StructToJsonFormatted(data)
+ s = strings.ReplaceAll(s, "\\u0026", "&")
println(s)
util.WriteStringToPath(s, getI18nFilePath(language))
diff --git a/web/src/ApplicationEditPage.js b/web/src/ApplicationEditPage.js
index 601b6d2e..3edfc527 100644
--- a/web/src/ApplicationEditPage.js
+++ b/web/src/ApplicationEditPage.js
@@ -240,7 +240,7 @@ class ApplicationEditPage extends React.Component {
- {Setting.getLabel(i18next.t("application:Token format"), i18next.t("general:Token format - Tooltip"))} :
+ {Setting.getLabel(i18next.t("application:Token format"), i18next.t("application:Token format - Tooltip"))} :
- {Setting.getLabel(i18next.t("general:Token expire"), i18next.t("general:Token expire - Tooltip"))} :
+ {Setting.getLabel(i18next.t("application:Token expire"), i18next.t("application:Token expire - Tooltip"))} :
{
@@ -263,7 +263,7 @@ class ApplicationEditPage extends React.Component {
- {Setting.getLabel(i18next.t("general:Refresh token expire"), i18next.t("general:Refresh token expire - Tooltip"))} :
+ {Setting.getLabel(i18next.t("application:Refresh token expire"), i18next.t("application:Refresh token expire - Tooltip"))} :
{
diff --git a/web/src/locales/de/data.json b/web/src/locales/de/data.json
index a8f587b9..db685f55 100644
--- a/web/src/locales/de/data.json
+++ b/web/src/locales/de/data.json
@@ -19,11 +19,17 @@
"Redirect URL": "Redirect URL",
"Redirect URLs": "Redirect URLs",
"Redirect URLs - Tooltip": "List of redirect addresses after successful login",
+ "Refresh token expire": "Refresh token expire",
+ "Refresh token expire - Tooltip": "Refresh token expire - Tooltip",
"Signup items": "Signup items",
"Signup items - Tooltip": "Signup items that need to be filled in when users register",
"Test prompt page..": "Test prompt page..",
"Test signin page..": "Test signin page..",
- "Test signup page..": "Test signup page.."
+ "Test signup page..": "Test signup page..",
+ "Token expire": "Token expire",
+ "Token expire - Tooltip": "Token expire - Tooltip",
+ "Token format": "Token format",
+ "Token format - Tooltip": "Token format - Tooltip"
},
"code": {
"Code You Received": "Code You Received",
@@ -125,8 +131,6 @@
"Swagger": "Swagger",
"Syncers": "Syncers",
"Timestamp": "Timestamp",
- "Token expire": "Token expire",
- "Token expire - Tooltip": "Token authorization time",
"Token type": "Token type",
"Tokens": "Tokens",
"URL": "URL",
diff --git a/web/src/locales/en/data.json b/web/src/locales/en/data.json
index 7a13c4d1..06c0cb58 100644
--- a/web/src/locales/en/data.json
+++ b/web/src/locales/en/data.json
@@ -19,11 +19,17 @@
"Redirect URL": "Redirect URL",
"Redirect URLs": "Redirect URLs",
"Redirect URLs - Tooltip": "Redirect URLs - Tooltip",
+ "Refresh token expire": "Refresh token expire",
+ "Refresh token expire - Tooltip": "Refresh token expire - Tooltip",
"Signup items": "Signup items",
"Signup items - Tooltip": "Signup items - Tooltip",
"Test prompt page..": "Test prompt page..",
"Test signin page..": "Test signin page..",
- "Test signup page..": "Test signup page.."
+ "Test signup page..": "Test signup page..",
+ "Token expire": "Token expire",
+ "Token expire - Tooltip": "Token expire - Tooltip",
+ "Token format": "Token format",
+ "Token format - Tooltip": "Token format - Tooltip"
},
"code": {
"Code You Received": "Code You Received",
@@ -115,7 +121,7 @@
"Request URI": "Request URI",
"Resources": "Resources",
"Save": "Save",
- "Save \u0026 Exit": "Save \u0026 Exit",
+ "Save & Exit": "Save & Exit",
"Scope": "Scope",
"Signin URL": "Signin URL",
"Signin URL - Tooltip": "Signin URL - Tooltip",
@@ -125,8 +131,6 @@
"Swagger": "Swagger",
"Syncers": "Syncers",
"Timestamp": "Timestamp",
- "Token expire": "Token expire",
- "Token expire - Tooltip": "Token expire - Tooltip",
"Token type": "Token type",
"Tokens": "Tokens",
"URL": "URL",
diff --git a/web/src/locales/fr/data.json b/web/src/locales/fr/data.json
index a8f587b9..db685f55 100644
--- a/web/src/locales/fr/data.json
+++ b/web/src/locales/fr/data.json
@@ -19,11 +19,17 @@
"Redirect URL": "Redirect URL",
"Redirect URLs": "Redirect URLs",
"Redirect URLs - Tooltip": "List of redirect addresses after successful login",
+ "Refresh token expire": "Refresh token expire",
+ "Refresh token expire - Tooltip": "Refresh token expire - Tooltip",
"Signup items": "Signup items",
"Signup items - Tooltip": "Signup items that need to be filled in when users register",
"Test prompt page..": "Test prompt page..",
"Test signin page..": "Test signin page..",
- "Test signup page..": "Test signup page.."
+ "Test signup page..": "Test signup page..",
+ "Token expire": "Token expire",
+ "Token expire - Tooltip": "Token expire - Tooltip",
+ "Token format": "Token format",
+ "Token format - Tooltip": "Token format - Tooltip"
},
"code": {
"Code You Received": "Code You Received",
@@ -125,8 +131,6 @@
"Swagger": "Swagger",
"Syncers": "Syncers",
"Timestamp": "Timestamp",
- "Token expire": "Token expire",
- "Token expire - Tooltip": "Token authorization time",
"Token type": "Token type",
"Tokens": "Tokens",
"URL": "URL",
diff --git a/web/src/locales/ja/data.json b/web/src/locales/ja/data.json
index a8f587b9..db685f55 100644
--- a/web/src/locales/ja/data.json
+++ b/web/src/locales/ja/data.json
@@ -19,11 +19,17 @@
"Redirect URL": "Redirect URL",
"Redirect URLs": "Redirect URLs",
"Redirect URLs - Tooltip": "List of redirect addresses after successful login",
+ "Refresh token expire": "Refresh token expire",
+ "Refresh token expire - Tooltip": "Refresh token expire - Tooltip",
"Signup items": "Signup items",
"Signup items - Tooltip": "Signup items that need to be filled in when users register",
"Test prompt page..": "Test prompt page..",
"Test signin page..": "Test signin page..",
- "Test signup page..": "Test signup page.."
+ "Test signup page..": "Test signup page..",
+ "Token expire": "Token expire",
+ "Token expire - Tooltip": "Token expire - Tooltip",
+ "Token format": "Token format",
+ "Token format - Tooltip": "Token format - Tooltip"
},
"code": {
"Code You Received": "Code You Received",
@@ -125,8 +131,6 @@
"Swagger": "Swagger",
"Syncers": "Syncers",
"Timestamp": "Timestamp",
- "Token expire": "Token expire",
- "Token expire - Tooltip": "Token authorization time",
"Token type": "Token type",
"Tokens": "Tokens",
"URL": "URL",
diff --git a/web/src/locales/ko/data.json b/web/src/locales/ko/data.json
index a8f587b9..db685f55 100644
--- a/web/src/locales/ko/data.json
+++ b/web/src/locales/ko/data.json
@@ -19,11 +19,17 @@
"Redirect URL": "Redirect URL",
"Redirect URLs": "Redirect URLs",
"Redirect URLs - Tooltip": "List of redirect addresses after successful login",
+ "Refresh token expire": "Refresh token expire",
+ "Refresh token expire - Tooltip": "Refresh token expire - Tooltip",
"Signup items": "Signup items",
"Signup items - Tooltip": "Signup items that need to be filled in when users register",
"Test prompt page..": "Test prompt page..",
"Test signin page..": "Test signin page..",
- "Test signup page..": "Test signup page.."
+ "Test signup page..": "Test signup page..",
+ "Token expire": "Token expire",
+ "Token expire - Tooltip": "Token expire - Tooltip",
+ "Token format": "Token format",
+ "Token format - Tooltip": "Token format - Tooltip"
},
"code": {
"Code You Received": "Code You Received",
@@ -125,8 +131,6 @@
"Swagger": "Swagger",
"Syncers": "Syncers",
"Timestamp": "Timestamp",
- "Token expire": "Token expire",
- "Token expire - Tooltip": "Token authorization time",
"Token type": "Token type",
"Tokens": "Tokens",
"URL": "URL",
diff --git a/web/src/locales/ru/data.json b/web/src/locales/ru/data.json
index a8f587b9..db685f55 100644
--- a/web/src/locales/ru/data.json
+++ b/web/src/locales/ru/data.json
@@ -19,11 +19,17 @@
"Redirect URL": "Redirect URL",
"Redirect URLs": "Redirect URLs",
"Redirect URLs - Tooltip": "List of redirect addresses after successful login",
+ "Refresh token expire": "Refresh token expire",
+ "Refresh token expire - Tooltip": "Refresh token expire - Tooltip",
"Signup items": "Signup items",
"Signup items - Tooltip": "Signup items that need to be filled in when users register",
"Test prompt page..": "Test prompt page..",
"Test signin page..": "Test signin page..",
- "Test signup page..": "Test signup page.."
+ "Test signup page..": "Test signup page..",
+ "Token expire": "Token expire",
+ "Token expire - Tooltip": "Token expire - Tooltip",
+ "Token format": "Token format",
+ "Token format - Tooltip": "Token format - Tooltip"
},
"code": {
"Code You Received": "Code You Received",
@@ -125,8 +131,6 @@
"Swagger": "Swagger",
"Syncers": "Syncers",
"Timestamp": "Timestamp",
- "Token expire": "Token expire",
- "Token expire - Tooltip": "Token authorization time",
"Token type": "Token type",
"Tokens": "Tokens",
"URL": "URL",
diff --git a/web/src/locales/zh/data.json b/web/src/locales/zh/data.json
index cfa1dc9d..d74083da 100644
--- a/web/src/locales/zh/data.json
+++ b/web/src/locales/zh/data.json
@@ -19,11 +19,17 @@
"Redirect URL": "回调URL",
"Redirect URLs": "回调URLs",
"Redirect URLs - Tooltip": "登录成功后重定向地址列表",
+ "Refresh token expire": "Refresh Token过期时间",
+ "Refresh token expire - Tooltip": "Refresh Token过期时间",
"Signup items": "注册项",
"Signup items - Tooltip": "注册用户注册时需要填写的项目",
"Test prompt page..": "测试提醒页面..",
"Test signin page..": "测试登录页面..",
- "Test signup page..": "测试注册页面.."
+ "Test signup page..": "测试注册页面..",
+ "Token expire": "Access Token过期时间",
+ "Token expire - Tooltip": "Access Token过期时间",
+ "Token format": "Access Token格式",
+ "Token format - Tooltip": "Access Token格式"
},
"code": {
"Code You Received": "验证码",
@@ -125,8 +131,6 @@
"Swagger": "API文档",
"Syncers": "同步器",
"Timestamp": "时间戳",
- "Token expire": "令牌过期时间",
- "Token expire - Tooltip": "签发的令牌的授权时间",
"Token type": "令牌类型",
"Tokens": "令牌",
"URL": "链接",