From c4f54129f497cdd9e15b5b7824e1a0ca0285e703 Mon Sep 17 00:00:00 2001 From: Pierre-Gilles Leymarie Date: Mon, 10 Apr 2017 21:09:37 +0200 Subject: [PATCH] bugfix in brain answer : keep only 2 first character of user language --- api/core/brain/brain.answer.js | 7 +++++-- api/core/brain/brain.classify.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/api/core/brain/brain.answer.js b/api/core/brain/brain.answer.js index eb33ad77dc..fdc4bb5210 100644 --- a/api/core/brain/brain.answer.js +++ b/api/core/brain/brain.answer.js @@ -6,7 +6,10 @@ module.exports = function answer(result, user) { sails.log.info(`Brain : answer : Answering with label ${result.response.label} in language ${user.language}`); - return gladys.utils.sql(queries.getAnswers, [user.language, result.response.label]) + // put language in lower case and only with 2 first characters + var language = user.language.substr(0,2).toLowerCase(); + + return gladys.utils.sql(queries.getAnswers, [language, result.response.label]) .then((answers) => { sails.log.debug(`Brain : answer : Found ${answers.length} possible.`); @@ -20,7 +23,7 @@ module.exports = function answer(result, user) { result.response.needAnswer = answers[randomRow].needAnswer; } else { - result.response.text = sails.__({ phrase: 'default-answer-gladys-brain', locale: user.language}); + result.response.text = sails.__({ phrase: 'default-answer-gladys-brain', locale: language}); result.response.needAnswer = false; } diff --git a/api/core/brain/brain.classify.js b/api/core/brain/brain.classify.js index d2630ef8c1..5c10a8a676 100644 --- a/api/core/brain/brain.classify.js +++ b/api/core/brain/brain.classify.js @@ -15,7 +15,7 @@ module.exports = function classify(user, message){ .then((scope) => { // add language to scope so that called module can adapt to the current language - scope.language = user.language; + scope.language = user.language.substr(0, 2).toLowerCase(); // add user to scope so that called module can adapt to current user scope.user = user;