Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the redundant dollar signs #84

Merged
merged 1 commit into from
Oct 25, 2024
Merged

Remove the redundant dollar signs #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/main/resources/message/validation.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/main/resources/message/validation_zh_CN.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=用户名不能为空
Expand All @@ -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必须为空
Expand Down
Loading