Merge pull request #84 from CMIPT/feature-kaiser

Remove the redundant dollar signs.
CMIPT · Oct 25, 2024 · f1febd6 · f1febd6
2 parents c02e621 + 552dd63
commit f1febd6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/main/resources/message/validation.properties b/src/main/resources/message/validation.properties
@@ -13,18 +13,18 @@ Pattern.userDTO.username=Username can only be alphanumeric, hyphen or underline
 Pattern.userDTO.userPassword=Password can only be alphanumeric, underline, hyphen, dot or at sign
 
 # checkEmailValidity validation messages
-Email.userController#checkEmailValidity.email=${Email.userDTO.email}
-NotBlank.userController#checkEmailValidity.email=${NotBlank.userDTO.email}
+Email.userController#checkEmailValidity.email={Email.userDTO.email}
+NotBlank.userController#checkEmailValidity.email={NotBlank.userDTO.email}
 
 # checkUsernameValidity validation messages
-NotBlank.userController#checkUsernameValidity.username=${NotBlank.userDTO.username}
+NotBlank.userController#checkUsernameValidity.username={NotBlank.userDTO.username}
 Size.userController#checkUsernameValidity.username=Username must be between {min} and {max} characters
-Pattern.userController#checkUsernameValidity.username=${Pattern.userDTO.username}
+Pattern.userController#checkUsernameValidity.username={Pattern.userDTO.username}
 
 # checkPasswordValidity validation messages
-NotBlank.userController#checkPasswordValidity.password=${NotBlank.userDTO.userPassword}
+NotBlank.userController#checkPasswordValidity.password={NotBlank.userDTO.userPassword}
 Size.userController#checkPasswordValidity.password=Password must be between {min} and {max} characters
-Pattern.userController#checkPasswordValidity.password=${Pattern.userDTO.userPassword}
+Pattern.userController#checkPasswordValidity.password={Pattern.userDTO.userPassword}
 
 # UserSignInDTO validation messages
 NotBlank.UserSignInDTO.username=Username cannot be blank
@@ -39,9 +39,9 @@ Size.RepositoryDTO.description=Repository description must be between {2} and {1
 Pattern.RepositoryDTO.name=Repository name can only be alphanumeric, hyphen or underline
 
 # checkRepositoryNameValidity validation messages
-NotBlank.repositoryController#checkRepositoryNameValidity.repositoryName=${NotBlank.RepositoryDTO.name}
+NotBlank.repositoryController#checkRepositoryNameValidity.repositoryName={NotBlank.RepositoryDTO.name}
 Size.repositoryController#checkRepositoryNameValidity.repositoryName=Repository name must be between {min} and {max} characters
-Pattern.repositoryController#checkRepositoryNameValidity.repositoryName=${Pattern.RepositoryDTO.name}
+Pattern.repositoryController#checkRepositoryNameValidity.repositoryName={Pattern.RepositoryDTO.name}
 
 # SshKeyDTO validation messages
 Null.SshKeyDTO.id=SSH key ID must be null when creating a new SSH key

diff --git a/src/main/resources/message/validation_zh_CN.properties b/src/main/resources/message/validation_zh_CN.properties
@@ -13,18 +13,18 @@ Pattern.userDTO.username=用户名只能是字母、数字、连字符或下划
 Pattern.userDTO.userPassword=密码只能是字母、数字、下划线、连字符、点或@符号
 
 # checkEmailValidity validation messages
-Email.userController#checkEmailValidity.email=${Email.userDTO.email}
-NotBlank.userController#checkEmailValidity.email=${NotBlank.userDTO.email}
+Email.userController#checkEmailValidity.email={Email.userDTO.email}
+NotBlank.userController#checkEmailValidity.email={NotBlank.userDTO.email}
 
 # checkUsernameValidity validation messages
-NotBlank.userController#checkUsernameValidity.username=${NotBlank.userDTO.username}
+NotBlank.userController#checkUsernameValidity.username={NotBlank.userDTO.username}
 Size.userController#checkUsernameValidity.username=用户名必须在{min}至{max}个字符之间
-Pattern.userController#checkUsernameValidity.username=${Pattern.userDTO.username}
+Pattern.userController#checkUsernameValidity.username={Pattern.userDTO.username}
 
 # checkPasswordValidity validation messages
-NotBlank.userController#checkPasswordValidity.password=${NotBlank.userDTO.userPassword}
+NotBlank.userController#checkPasswordValidity.password={NotBlank.userDTO.userPassword}
 Size.userController#checkPasswordValidity.password=密码必须在{min}至{max}个字符之间
-Pattern.userController#checkPasswordValidity.password=${Pattern.userDTO.userPassword}
+Pattern.userController#checkPasswordValidity.password={Pattern.userDTO.userPassword}
 
 # UserSignInDTO validation messages
 NotBlank.UserSignInDTO.username=用户名不能为空
@@ -39,9 +39,9 @@ Size.RepositoryDTO.description=仓库描述必须在{2}至{1}个字符之间
 Pattern.RepositoryDTO.name=仓库名称只能是字母、数字、连字符或下划线
 
 # checkRepositoryNameValidity validation messages
-NotBlank.repositoryController#checkRepositoryNameValidity.repositoryName=${NotBlank.RepositoryDTO.name}
+NotBlank.repositoryController#checkRepositoryNameValidity.repositoryName={NotBlank.RepositoryDTO.name}
 Size.repositoryController#checkRepositoryNameValidity.repositoryName=仓库名称必须在{min}至{max}个字符之间
-Pattern.repositoryController#checkRepositoryNameValidity.repositoryName=${Pattern.RepositoryDTO.name}
+Pattern.repositoryController#checkRepositoryNameValidity.repositoryName={Pattern.RepositoryDTO.name}
 
 # SshKeyDTO validation messages
 Null.SshKeyDTO.id=在创建新SSH密钥时，SSH密钥ID必须为空