From 7bc58748636fee1437203c0d0fea26c3f364077c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=BF=90=E5=AE=B6?= Date: Fri, 21 Jun 2024 11:27:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=A2=9E=E5=8A=A0i18n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- domain/src/dto/pageable.rs | 4 ++-- i18n/src/en_us.rs | 4 +++- i18n/src/message_ids.rs | 4 +++- i18n/src/zh_cn.rs | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/domain/src/dto/pageable.rs b/domain/src/dto/pageable.rs index 5f27f72..4938ae0 100644 --- a/domain/src/dto/pageable.rs +++ b/domain/src/dto/pageable.rs @@ -3,9 +3,9 @@ use validator::Validate; #[derive(Deserialize, Validate)] pub struct PageParams { - #[validate(required(message = "页码不能为空"), range(min = 1, message = "页码不能小于1"))] + #[validate(required(message = "VALIDATE_PAGEABLE_PAGE_REQUIRED"), range(min = 1, message = "VALIDATE_PAGEABLE_PAGE_REQUIRED"))] pub page: Option, #[serde(rename = "pageSize")] - #[validate(required(message = "每页数量不能为空"), range(min = 1, message = "每页数量不能小于1"))] + #[validate(required(message = "VALIDATE_PAGEABLE_PAGE_SIZE_REQUIRED"), range(min = 1, message = "VALIDATE_PAGEABLE_PAGE_SIZE_REQUIRED"))] pub page_size: Option, } \ No newline at end of file diff --git a/i18n/src/en_us.rs b/i18n/src/en_us.rs index 63bb3de..55ee6ae 100644 --- a/i18n/src/en_us.rs +++ b/i18n/src/en_us.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use lazy_static::lazy_static; use crate::message_ids::{ - ACCOUNT_DISABLED, ACCOUNT_NO_PERMISSION, HELLO, INCORRECT_USERNAME_OR_PASSWORD, INVALID_TOKEN, VALIDATE_ACCOUNT_ID_TOKEN_REQUIRED, VALIDATE_ACCOUNT_LANG_TAG_REQUIRED, VALIDATE_ACCOUNT_NAME_REQUIRED, VALIDATE_ACCOUNT_PASSWORD_REQUIRED, VALIDATE_FEEDBACK_CONTENT_REQUIRED + ACCOUNT_DISABLED, ACCOUNT_NO_PERMISSION, HELLO, INCORRECT_USERNAME_OR_PASSWORD, INVALID_TOKEN, VALIDATE_ACCOUNT_ID_TOKEN_REQUIRED, VALIDATE_ACCOUNT_LANG_TAG_REQUIRED, VALIDATE_ACCOUNT_NAME_REQUIRED, VALIDATE_ACCOUNT_PASSWORD_REQUIRED, VALIDATE_FEEDBACK_CONTENT_REQUIRED, VALIDATE_PAGEABLE_PAGE_REQUIRED, VALIDATE_PAGEABLE_PAGE_SIZE_REQUIRED }; pub const LANGUAGE_ID: &str = "en-US"; @@ -22,6 +22,8 @@ lazy_static! { map.insert(VALIDATE_ACCOUNT_PASSWORD_REQUIRED, "password is required"); map.insert(VALIDATE_ACCOUNT_ID_TOKEN_REQUIRED, "ID Token is required"); map.insert(VALIDATE_ACCOUNT_LANG_TAG_REQUIRED, "lang tag is required"); + map.insert(VALIDATE_PAGEABLE_PAGE_REQUIRED, "invalid page number"); + map.insert(VALIDATE_PAGEABLE_PAGE_SIZE_REQUIRED, "invalid quantity per page"); map }; } diff --git a/i18n/src/message_ids.rs b/i18n/src/message_ids.rs index f90383b..ae59e9e 100644 --- a/i18n/src/message_ids.rs +++ b/i18n/src/message_ids.rs @@ -8,4 +8,6 @@ pub const VALIDATE_FEEDBACK_CONTENT_REQUIRED: &'static str = "VALIDATE_FEEDBACK_ pub const VALIDATE_ACCOUNT_NAME_REQUIRED: &'static str = "VALIDATE_ACCOUNT_NAME_REQUIRED"; pub const VALIDATE_ACCOUNT_PASSWORD_REQUIRED: &'static str = "VALIDATE_ACCOUNT_PASSWORD_REQUIRED"; pub const VALIDATE_ACCOUNT_ID_TOKEN_REQUIRED: &'static str = "VALIDATE_ACCOUNT_ID_TOKEN_REQUIRED"; -pub const VALIDATE_ACCOUNT_LANG_TAG_REQUIRED: &'static str = "VALIDATE_ACCOUNT_LANG_TAG_REQUIRED"; \ No newline at end of file +pub const VALIDATE_ACCOUNT_LANG_TAG_REQUIRED: &'static str = "VALIDATE_ACCOUNT_LANG_TAG_REQUIRED"; +pub const VALIDATE_PAGEABLE_PAGE_REQUIRED: &'static str = "VALIDATE_PAGEABLE_PAGE_REQUIRED"; +pub const VALIDATE_PAGEABLE_PAGE_SIZE_REQUIRED: &'static str = "VALIDATE_PAGEABLE_PAGE_SIZE_REQUIRED"; diff --git a/i18n/src/zh_cn.rs b/i18n/src/zh_cn.rs index 823e99a..3ec3a45 100644 --- a/i18n/src/zh_cn.rs +++ b/i18n/src/zh_cn.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use lazy_static::lazy_static; use crate::message_ids::{ - ACCOUNT_DISABLED, ACCOUNT_NO_PERMISSION, HELLO, INCORRECT_USERNAME_OR_PASSWORD, INVALID_TOKEN, VALIDATE_ACCOUNT_ID_TOKEN_REQUIRED, VALIDATE_ACCOUNT_LANG_TAG_REQUIRED, VALIDATE_ACCOUNT_NAME_REQUIRED, VALIDATE_ACCOUNT_PASSWORD_REQUIRED, VALIDATE_FEEDBACK_CONTENT_REQUIRED + ACCOUNT_DISABLED, ACCOUNT_NO_PERMISSION, HELLO, INCORRECT_USERNAME_OR_PASSWORD, INVALID_TOKEN, VALIDATE_ACCOUNT_ID_TOKEN_REQUIRED, VALIDATE_ACCOUNT_LANG_TAG_REQUIRED, VALIDATE_ACCOUNT_NAME_REQUIRED, VALIDATE_ACCOUNT_PASSWORD_REQUIRED, VALIDATE_FEEDBACK_CONTENT_REQUIRED, VALIDATE_PAGEABLE_PAGE_REQUIRED, VALIDATE_PAGEABLE_PAGE_SIZE_REQUIRED }; pub const LANGUAGE_ID: &str = "zh-CN"; @@ -22,6 +22,8 @@ lazy_static! { map.insert(VALIDATE_ACCOUNT_PASSWORD_REQUIRED, "密码不能为空"); map.insert(VALIDATE_ACCOUNT_ID_TOKEN_REQUIRED, "用户ID Token不能为空"); map.insert(VALIDATE_ACCOUNT_LANG_TAG_REQUIRED, "用户语言标识不能为空"); + map.insert(VALIDATE_PAGEABLE_PAGE_REQUIRED, "页码无效"); + map.insert(VALIDATE_PAGEABLE_PAGE_SIZE_REQUIRED, "每页数量无效"); map }; }