wingbot 3.44.2 → 3.44.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.44.2",
+  "version": "3.44.4",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {

package/src/BuildRouter.js

@@ -102,8 +102,9 @@ const DUMMY_ROUTE = { id: 0, path: null, resolvers: [] };
  * @param {string} senderId
  * @param {string} textLabel
  * @param {string} urlText
- * @param {boolean} [isExtUrl]
- * @param {object} [state]
+ * @param {boolean} isExtUrl
+ * @param {object} state
+ * @param {string} pageId
  * @returns {string}
  */
 

package/src/resolvers/carousel.js

@@ -72,7 +72,14 @@ function carousel (params, context) {
                         const hasExtension = type === TYPE_URL_WITH_EXT;
                         const textLabel = titleText || subtitleText;
                         let urlText = getText(url, state);
-                        urlText = linksTranslator(senderId, textLabel, urlText, isExtUrl, state);
+                        urlText = linksTranslator(
+                            senderId,
+                            textLabel,
+                            urlText,
+                            isExtUrl,
+                            state,
+                            req.pageId
+                        );
                         elem.setElementAction(urlText, hasExtension, webviewHeight);
                         break;
                     }

package/src/resolvers/message.js

@@ -36,7 +36,8 @@ function getVoiceControlFromParams (params, lang = null) {
 
     voiceControlProps.forEach((prop) => {
         if (params[prop]) {
-            voiceControl[prop] = getLanguageText(params[prop], lang);
+            // for voice control do not default to other languages
+            voiceControl[prop] = getLanguageText(params[prop], lang, true);
         }
     });
 

package/src/resolvers/utils.js

@@ -61,9 +61,10 @@ function isTextObjectEmpty (text) {
 /**
  * @param {Translations} translations
  * @param {string} [lang]
+ * @param {boolean} [disableDefaulting] - it will try to find translation for other language
  * @returns {null|string}
  */
-function getLanguageText (translations, lang = null) {
+function getLanguageText (translations, lang = null, disableDefaulting = false) {
     let foundText;
 
     if (isArrayOfObjects(translations)) {
@@ -71,7 +72,7 @@ function getLanguageText (translations, lang = null) {
             // @ts-ignore
             foundText = translations.find((t) => t.l === lang);
         }
-        if (isTextObjectEmpty(foundText)) {
+        if (isTextObjectEmpty(foundText) && !disableDefaulting) {
             // @ts-ignore
             foundText = translations.find((t) => !isTextObjectEmpty(t));
         }
@@ -204,7 +205,7 @@ function getText (text, state) {
 }
 
 // eslint-disable-next-line no-unused-vars
-const DEFAULT_LINK_TRANSLATOR = (senderId, defaultText, urlText, isExtUrl, reqState) => urlText;
+const DEFAULT_LINK_TRANSLATOR = (senderId, text, url, isExtUrl, state, pageId) => url;
 
 /** @typedef {import('../BuildRouter').BotContext} BotContext */
 
@@ -257,7 +258,14 @@ function processButtons (
             case TYPE_URL_WITH_EXT: {
                 const hasExtention = type === TYPE_URL_WITH_EXT;
                 let urlText = getText(url, state);
-                urlText = translateLinks(senderId, defaultText, urlText, isExtUrl, state);
+                urlText = translateLinks(
+                    senderId,
+                    defaultText,
+                    urlText,
+                    isExtUrl,
+                    state,
+                    req.pageId
+                );
                 elem.urlButton(btnTitleText, urlText, hasExtention, webviewHeight);
                 break;
             }