Merge branch 'main' into next

packages/plugins/@nocobase/plugin-auth/src/locale/en-US.json

@@ -23,5 +23,6 @@
   "No authentication methods available.": "No authentication methods available.",
   "The password is inconsistent, please re-enter": "The password is inconsistent, please re-enter",
   "Sign-in": "Sign-in",
-  "Password": "Password"
+  "Password": "Password",
+  "The username/email or password is incorrect, please re-enter": "The username/email or password is incorrect, please re-enter"
 }

packages/plugins/@nocobase/plugin-auth/src/locale/zh-CN.json

@@ -23,5 +23,6 @@
   "No authentication methods available.": "没有可用的认证方式。",
   "The password is inconsistent, please re-enter": "密码不一致，请重新输入",
   "Sign-in": "登录",
-  "Password": "密码"
+  "Password": "密码",
+  "The username/email or password is incorrect, please re-enter": "用户名/邮箱或密码有误，请重新输入"
 }

packages/plugins/@nocobase/plugin-auth/src/server/__tests__/actions.test.ts

@@ -117,7 +117,7 @@ describe('actions', () => {
         email: 'no-exists@nocobase.com',
       });
       expect(res.statusCode).toEqual(401);
-      expect(res.error.text).toBe('The username or email is incorrect, please re-enter');
+      expect(res.error.text).toBe('The username/email or password is incorrect, please re-enter');
     });
 
     it('should check password when signing in', async () => {
@@ -126,7 +126,7 @@ describe('actions', () => {
         password: 'incorrect',
       });
       expect(res.statusCode).toEqual(401);
-      expect(res.error.text).toBe('The password is incorrect, please re-enter');
+      expect(res.error.text).toBe('The username/email or password is incorrect, please re-enter');
     });
 
     it('should sign in with password', async () => {

packages/plugins/@nocobase/plugin-auth/src/server/basic-auth.ts

@@ -39,13 +39,13 @@ export class BasicAuth extends BaseAuth {
     });
 
     if (!user) {
-      ctx.throw(401, ctx.t('The username or email is incorrect, please re-enter', { ns: namespace }));
+      ctx.throw(401, ctx.t('The username/email or password is incorrect, please re-enter', { ns: namespace }));
     }
 
     const field = this.userCollection.getField<PasswordField>('password');
     const valid = await field.verify(password, user.password);
     if (!valid) {
-      ctx.throw(401, ctx.t('The password is incorrect, please re-enter', { ns: namespace }));
+      ctx.throw(401, ctx.t('The username/email or password is incorrect, please re-enter', { ns: namespace }));
     }
     return user;
   }

packages/plugins/@nocobase/plugin-error-handler/src/locale/en-US.json

@@ -1,6 +1,6 @@
 {
-  "unique violation": "{{field}} must be unique",
+  "unique violation": "{{field}} already exists",
-  "notNull violation": "notNull violation",
+  "notNull violation": "{{field}} cannot be null",
   "Validation error": "{{field}} validation error",
   "notNull Violation": "{{field}} cannot be null"
 }

packages/plugins/@nocobase/plugin-error-handler/src/locale/zh-CN.json

@@ -1,5 +1,5 @@
 {
-  "unique violation": "{{field}} 字段值是唯一的",
+  "unique violation": "{{field}} 字段值已存在",
   "notNull violation": "{{field}} 字段不能为空",
   "Validation error": "{{field}} 字段规则验证失败"
 }

packages/plugins/@nocobase/plugin-error-handler/src/server/server.ts

@@ -54,7 +54,7 @@ export class PluginErrorHandlerServer extends Plugin {
             return {
               message: t(err.type, {
                 ns: this.i18nNs,
-                field: t(title, { ns: 'lm-collections' }),
+                field: t(title, { ns: ['lm-collections', 'client'] }),
               }),
             };
           }),