@nocobase/plugin-users 0.7.0-alpha.61 → 0.7.0-alpha.64

package/lib/actions/users.js

@@ -24,6 +24,8 @@ function _crypto() {
   return data;
 }
 
+var _ = require("../");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -66,7 +68,9 @@ function _signin() {
           values = _ctx$action$params.values;
 
     if (!values[uniqueField]) {
-      ctx.throw(401, '请填写邮箱账号');
+      ctx.throw(401, ctx.t('Please fill in your email address', {
+        ns: _.namespace
+      }));
     }
 
     const User = ctx.db.getCollection('users');
@@ -77,14 +81,18 @@ function _signin() {
     });
 
     if (!user) {
-      ctx.throw(401, '邮箱账号未注册');
+      ctx.throw(401, ctx.t('The email is incorrect, please re-enter', {
+        ns: _.namespace
+      }));
     }
 
     const pwd = User.getField('password');
     const isValid = yield pwd.verify(values.password, user.password);
 
     if (!isValid) {
-      ctx.throw(401, '密码错误，请您重新输入');
+      ctx.throw(401, ctx.t('The password is incorrect, please re-enter', {
+        ns: _.namespace
+      }));
     }
 
     const pluginUser = ctx.app.getPlugin('@nocobase/plugin-users');
@@ -136,7 +144,9 @@ function _lostpassword() {
     const email = ctx.action.params.values.email;
 
     if (!email) {
-      ctx.throw(401, '请填写邮箱账号');
+      ctx.throw(401, ctx.t('Please fill in your email address', {
+        ns: _.namespace
+      }));
     }
 
     const User = ctx.db.getCollection('users');
@@ -147,7 +157,9 @@ function _lostpassword() {
     });
 
     if (!user) {
-      ctx.throw(401, '邮箱账号未注册');
+      ctx.throw(401, ctx.t('The email is incorrect, please re-enter', {
+        ns: _.namespace
+      }));
     }
 
     user.resetToken = _crypto().default.randomBytes(20).toString('hex');
@@ -257,7 +269,9 @@ function _changePassword() {
     const isValid = yield pwd.verify(oldPassword, user.password);
 
     if (!isValid) {
-      ctx.throw(401, '密码错误，请您重新输入');
+      ctx.throw(401, ctx.t('The password is incorrect, please re-enter', {
+        ns: _.namespace
+      }));
     }
 
     user.password = newPassword;

package/lib/index.d.ts

@@ -1 +1,2 @@
 export { default } from './server';
+export declare const namespace: any;

package/lib/index.js

@@ -9,7 +9,12 @@ Object.defineProperty(exports, "default", {
     return _server.default;
   }
 });
+exports.namespace = void 0;
 
 var _server = _interopRequireDefault(require("./server"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const namespace = require('../package.json').name;
+
+exports.namespace = namespace;

package/lib/locale/en-US.d.ts

@@ -0,0 +1,5 @@
+declare const _default: {
+    'Please fill in your email address': string;
+    'The password is incorrect, please re-enter': string;
+};
+export default _default;

package/lib/locale/en-US.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  'Please fill in your email address': 'Please fill in your email address',
+  'The password is incorrect, please re-enter': 'The password is incorrect, please re-enter'
+};
+exports.default = _default;

package/lib/locale/index.d.ts

@@ -0,0 +1,2 @@
+export { default as enUS } from './en-US';
+export { default as zhCN } from './zh-CN';

package/lib/locale/index.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "enUS", {
+  enumerable: true,
+  get: function get() {
+    return _enUS.default;
+  }
+});
+Object.defineProperty(exports, "zhCN", {
+  enumerable: true,
+  get: function get() {
+    return _zhCN.default;
+  }
+});
+
+var _enUS = _interopRequireDefault(require("./en-US"));
+
+var _zhCN = _interopRequireDefault(require("./zh-CN"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/locale/zh-CN.d.ts

@@ -0,0 +1,6 @@
+declare const _default: {
+    'The email is incorrect, please re-enter': string;
+    'Please fill in your email address': string;
+    'The password is incorrect, please re-enter': string;
+};
+export default _default;

package/lib/locale/zh-CN.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  'The email is incorrect, please re-enter': '邮箱错误，请重新输入',
+  'Please fill in your email address': '请填写密码',
+  'The password is incorrect, please re-enter': '密码错误，请重新输入'
+};
+exports.default = _default;

package/lib/server.js

@@ -35,10 +35,14 @@ function _path() {
   return data;
 }
 
+var _2 = require("./");
+
 var actions = _interopRequireWildcard(require("./actions/users"));
 
 var _jwtService = require("./jwt-service");
 
+var _locale = require("./locale");
+
 var middlewares = _interopRequireWildcard(require("./middlewares"));
 
 var _UserModel = require("./models/UserModel");
@@ -74,6 +78,10 @@ class UsersPlugin extends _server().Plugin {
     var _this = this;
 
     return _asyncToGenerator(function* () {
+      _this.app.i18n.addResources('zh-CN', _2.namespace, _locale.zhCN);
+
+      _this.app.i18n.addResources('en-US', _2.namespace, _locale.enUS);
+
       const cmd = _this.app.findCommand('install');
 
       if (cmd) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-users",
-  "version": "0.7.0-alpha.61",
+  "version": "0.7.0-alpha.64",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -13,8 +13,8 @@
     "jsonwebtoken": "^8.5.1"
   },
   "devDependencies": {
-    "@nocobase/test": "0.7.0-alpha.61",
+    "@nocobase/test": "0.7.0-alpha.64",
     "@types/jsonwebtoken": "^8.5.8"
   },
-  "gitHead": "37c3cdeb3730e3f39b06c5f8685cf862ad40ce9f"
+  "gitHead": "35d01a5fb0f0522e263c7fc37bc8384f99424240"
 }