From 1a2d1f334689830f05ed0f026c96f2b6a4f51e63 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Mon, 18 May 2020 01:03:42 +0000 Subject: [PATCH] new(core.gbapp): TRANSLATOR_DISABLED added to .env before migrating to .gbot. --- .../services/GBConversationalService.ts | 22 ++++--------------- packages/core.gbapp/services/GBMinService.ts | 5 ++++- packages/kb.gbapp/dialogs/AskDialog.ts | 7 ++++-- packages/kb.gbapp/strings.ts | 2 -- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts index 47767a25..c06bf472 100644 --- a/packages/core.gbapp/services/GBConversationalService.ts +++ b/packages/core.gbapp/services/GBConversationalService.ts @@ -525,6 +525,10 @@ export class GBConversationalService { language: string ): Promise { + if (process.env.TRANSLATOR_DISABLED === "true"){ + return text; + } + let options = { method: 'POST', baseUrl: endPoint, @@ -588,22 +592,4 @@ export class GBConversationalService { await step.context.sendActivity(text); } - public async checkLanguage(step: GBDialogStep, min, text) { - const locale = await AzureText.getLocale(min.instance.textAnalyticsKey, min.instance.textAnalyticsEndpoint, text); - if (locale !== step.context.activity.locale.split('-')[0]) { - switch (locale) { - case 'pt': - step.context.activity.locale = 'pt-BR'; - await min.conversationalService.sendText(min, step, Messages[locale].changing_language); - break; - case 'en': - step.context.activity.locale = 'en-US'; - await min.conversationalService.sendText(min, step, Messages[locale].changing_language); - break; - default: - await min.conversationalService.sendText(min, step, `; Unknown; language: $;{locale;}`); - break; - } - } - } } diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index b8a73cb5..d14f965c 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -682,8 +682,11 @@ export class GBMinService { let query = context.activity.text; - const locale = await AzureText.getLocale(min.instance.textAnalyticsKey, + let locale = 'pt'; + if (process.env.TRANSLATOR_DISABLED !== "true"){ + locale = await AzureText.getLocale(min.instance.textAnalyticsKey, min.instance.textAnalyticsEndpoint, query); + } let sec = new SecService(); const member = step.context.activity.from; diff --git a/packages/kb.gbapp/dialogs/AskDialog.ts b/packages/kb.gbapp/dialogs/AskDialog.ts index 7add8971..a30817a2 100644 --- a/packages/kb.gbapp/dialogs/AskDialog.ts +++ b/packages/kb.gbapp/dialogs/AskDialog.ts @@ -103,9 +103,12 @@ export class AskDialog extends IGBDialog { let query = step.result; - const locale = await AzureText.getLocale(min.instance.textAnalyticsKey, + let locale = 'pt'; + if (process.env.TRANSLATOR_DISABLED !== "true"){ + locale = await AzureText.getLocale(min.instance.textAnalyticsKey, min.instance.textAnalyticsEndpoint, query); - + } + let sec = new SecService(); const member = step.context.activity.from; diff --git a/packages/kb.gbapp/strings.ts b/packages/kb.gbapp/strings.ts index 9a04b3ff..0248d62f 100644 --- a/packages/kb.gbapp/strings.ts +++ b/packages/kb.gbapp/strings.ts @@ -1,7 +1,6 @@ export const Messages = { 'en-US': { did_not_find: 'I\'m sorry I didn\'t find anything.', - changing_language: 'OK, changing language to English...', going_answer: 'Great choice, now looking for your answer...', wider_answer: subjectText => `Answering to you in a broader way... Not just about ${subjectText}.`, @@ -18,7 +17,6 @@ export const Messages = { }, 'pt-BR': { did_not_find: 'Desculpe-me, não encontrei nada a respeito.', - changing_language: 'OK, mundando de idioma para o Português...', going_answer: 'Ótima escolha, procurando resposta para sua questão...', wider_answer: subjectText => `Vou te responder de modo mais abrangente... Não apenas sobre ${subjectText}`,