@midwayjs/i18n 3.0.1 → 3.0.4

package/dist/i18nService.js

@@ -216,8 +216,12 @@ let MidwayI18nService = class MidwayI18nService {
      */
     saveRequestLocale(locale) {
         var _a, _b;
-        const currentLocale = (_a = locale !== null && locale !== void 0 ? locale : this.ctx.getAttr(interface_1.I18N_ATTR_KEY)) !== null && _a !== void 0 ? _a : this.getDefaultLocale();
-        (_b = this.ctx) === null || _b === void 0 ? void 0 : _b.setAttr(interface_1.I18N_SAVE_KEY, (0, utils_1.formatLocale)(currentLocale));
+        if (locale) {
+            (_a = this.ctx) === null || _a === void 0 ? void 0 : _a.setAttr(interface_1.I18N_ATTR_KEY, (0, utils_1.formatLocale)(locale));
+        }
+        else {
+            (_b = this.ctx) === null || _b === void 0 ? void 0 : _b.setAttr(interface_1.I18N_ATTR_KEY, (0, utils_1.formatLocale)(this.getDefaultLocale()));
+        }
     }
     /**
      * get locale string by find fallback and default, ignore match message

package/dist/interface.d.ts

@@ -18,5 +18,4 @@ export interface I18nOptions {
     };
 }
 export declare const I18N_ATTR_KEY = "i18n:locale";
-export declare const I18N_SAVE_KEY = "i18n:need_save_locale";
 //# sourceMappingURL=interface.d.ts.map

package/dist/interface.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.I18N_SAVE_KEY = exports.I18N_ATTR_KEY = void 0;
+exports.I18N_ATTR_KEY = void 0;
 exports.I18N_ATTR_KEY = 'i18n:locale';
-exports.I18N_SAVE_KEY = 'i18n:need_save_locale';
 //# sourceMappingURL=interface.js.map

package/dist/middleware.d.ts

@@ -2,6 +2,7 @@ import { IMiddleware, IMidwayApplication } from '@midwayjs/core';
 import { I18nOptions } from './interface';
 export declare class I18nFilter {
     resolverConfig: I18nOptions['resolver'];
+    i18nConfig: I18nOptions;
     match(value: any, req: any, res: any): any;
 }
 export declare class I18nMiddleware implements IMiddleware<any, any> {

package/dist/middleware.js

@@ -16,8 +16,8 @@ const i18nService_1 = require("./i18nService");
 const utils_1 = require("./utils");
 let I18nFilter = class I18nFilter {
     match(value, req, res) {
-        const saveLocale = req.getAttr(interface_1.I18N_SAVE_KEY);
-        if (saveLocale) {
+        const saveLocale = req.getAttr(interface_1.I18N_ATTR_KEY);
+        if (this.i18nConfig.writeCookie && saveLocale) {
             const cookieOptions = {
                 // make sure browser javascript can read the cookie
                 httpOnly: false,
@@ -34,6 +34,10 @@ __decorate([
     (0, decorator_1.Config)('i18n.resolver'),
     __metadata("design:type", Object)
 ], I18nFilter.prototype, "resolverConfig", void 0);
+__decorate([
+    (0, decorator_1.Config)('i18n'),
+    __metadata("design:type", Object)
+], I18nFilter.prototype, "i18nConfig", void 0);
 I18nFilter = __decorate([
     (0, decorator_1.Match)()
 ], I18nFilter);
@@ -72,12 +76,12 @@ let I18nMiddleware = class I18nMiddleware {
                         }
                     }
                 }
-                // set to current locale
-                req.setAttr(interface_1.I18N_ATTR_KEY, requestLocale);
-                // auto write locale to cookie
-                if (this.i18nConfig.writeCookie) {
+                if (requestLocale) {
                     i18nService.saveRequestLocale(requestLocale);
                 }
+                else {
+                    i18nService.saveRequestLocale();
+                }
                 return next();
             };
         }
@@ -113,17 +117,18 @@ let I18nMiddleware = class I18nMiddleware {
                         }
                     }
                 }
-                // set to current locale
-                ctx.setAttr(interface_1.I18N_ATTR_KEY, requestLocale);
-                // auto write locale to cookie
-                if (this.i18nConfig.writeCookie) {
+                // save current locale
+                if (requestLocale) {
                     i18nService.saveRequestLocale(requestLocale);
                 }
+                else {
+                    i18nService.saveRequestLocale();
+                }
                 // run next middleware and controller
                 await next();
                 // get need save locale
-                const saveLocale = ctx.getAttr(interface_1.I18N_SAVE_KEY);
-                if (saveLocale) {
+                const saveLocale = ctx.getAttr(interface_1.I18N_ATTR_KEY);
+                if (this.i18nConfig.writeCookie && saveLocale) {
                     const cookieOptions = {
                         // make sure browser javascript can read the cookie
                         httpOnly: false,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/i18n",
   "description": "midway i18n component",
-  "version": "3.0.1",
+  "version": "3.0.4",
   "main": "dist/index",
   "typings": "index.d.ts",
   "files": [
@@ -13,11 +13,11 @@
     "picomatch": "2.3.1"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.0.1",
-    "@midwayjs/decorator": "^3.0.0",
-    "@midwayjs/express": "^3.0.1",
-    "@midwayjs/koa": "^3.0.1",
-    "@midwayjs/mock": "^3.0.1"
+    "@midwayjs/core": "^3.0.4",
+    "@midwayjs/decorator": "^3.0.4",
+    "@midwayjs/express": "^3.0.4",
+    "@midwayjs/koa": "^3.0.4",
+    "@midwayjs/mock": "^3.0.4"
   },
   "keywords": [
     "midway",
@@ -39,5 +39,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "f345b4ed0392e5c3b9e815438ef0a377ad6da076"
+  "gitHead": "c2a37dd026c7bf3e855f4498691f572ef61396e3"
 }