From 94c9718e279bd95f47808e8768c7daed0bfcf5ae Mon Sep 17 00:00:00 2001 From: Olivier Penhoat Date: Mon, 14 Dec 2015 16:12:15 +0100 Subject: [PATCH] i18n support --- lib/hw-error.js | 8 ++++++-- package.json | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/hw-error.js b/lib/hw-error.js index 7af7209..10a8b38 100644 --- a/lib/hw-error.js +++ b/lib/hw-error.js @@ -165,8 +165,12 @@ that = { } else { data = {code: errorCode, message: 'internal error'}; } - if (req && req.t && data.message) { - data.message = req.t(data.message, _.extend({lng: req.lng}, reqParams)); + if (data.message) { + if (req && req.t) { // i18next handler + data.message = req.t(data.message, _.extend({lng: req.lng}, reqParams)); + } else if (res && res.__) { // i18n handler + data.message = req.__(data.message); + } } if (logger.enabledLevels.debug) { log.debug('%ssending error :', res.headersSent ? 'NOT ' : '', error); diff --git a/package.json b/package.json index 53f240b..b1688d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hw-error", - "version": "0.1.8", + "version": "0.1.9", "description": "Better error management", "main": "lib/hw-error.js", "author": "Olivier Penhoat (http://headwood.net/)",