Skip to content

Commit 1fb82c7

Browse files
authored
[core] ChatWoot: conditional agent name prefix in WA to WhatsApp templates (#1988)
Fix empty **: prefix when Add Agent Name is on but chatwoot.sender.name is empty (e.g. system/automated messages). Applies Mustache conditionals to default i18n for chatwoot.to.whatsapp.message.text and chatwoot.to.whatsapp.message.media.caption across all locales (fixes #1983). fixes #1983 fixes #1737
1 parent 55f7d4d commit 1fb82c7

18 files changed

Lines changed: 72 additions & 36 deletions

src/apps/chatwoot/i18n/locales/ar-AE.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,14 @@ waha.core.version.used: |-
335335
[**🎁 ادعمنا**]({{{supportUrl}}})
336336
337337
chatwoot.to.whatsapp.message.text: |-
338-
{{{ content }}}
338+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
339+
{{/chatwoot.sender.name}}{{{ content }}}
339340
340341
chatwoot.to.whatsapp.message.media.caption: |-
341342
{{#singleAttachment}}
342343
{{#content}}
343-
{{{ content }}}
344+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
345+
{{/chatwoot.sender.name}}{{{ content }}}
344346
{{/content}}
345347
{{/singleAttachment}}
346348

src/apps/chatwoot/i18n/locales/bn-BD.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,14 @@ waha.core.version.used: |-
335335
[**🎁 আমাদের সমর্থন করুন**]({{{supportUrl}}})
336336
337337
chatwoot.to.whatsapp.message.text: |-
338-
{{{ content }}}
338+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
339+
{{/chatwoot.sender.name}}{{{ content }}}
339340
340341
chatwoot.to.whatsapp.message.media.caption: |-
341342
{{#singleAttachment}}
342343
{{#content}}
343-
{{{ content }}}
344+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
345+
{{/chatwoot.sender.name}}{{{ content }}}
344346
{{/content}}
345347
{{/singleAttachment}}
346348

src/apps/chatwoot/i18n/locales/de-DE.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,12 +338,14 @@ waha.core.version.used: |-
338338
[**🎁 Unterstützen Sie uns**]({{{supportUrl}}})
339339
340340
chatwoot.to.whatsapp.message.text: |-
341-
{{{ content }}}
341+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
342+
{{/chatwoot.sender.name}}{{{ content }}}
342343
343344
chatwoot.to.whatsapp.message.media.caption: |-
344345
{{#singleAttachment}}
345346
{{#content}}
346-
{{{ content }}}
347+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
348+
{{/chatwoot.sender.name}}{{{ content }}}
347349
{{/content}}
348350
{{/singleAttachment}}
349351

src/apps/chatwoot/i18n/locales/en-US.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,14 @@ whatsapp.contact.broadcast.suffix: 'Broadcast List'
116116
whatsapp.contact.status.name: 'Status'
117117

118118
chatwoot.to.whatsapp.message.text: |-
119-
{{{ content }}}
119+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
120+
{{/chatwoot.sender.name}}{{{ content }}}
120121
121122
chatwoot.to.whatsapp.message.media.caption: |-
122123
{{#singleAttachment}}
123124
{{#content}}
124-
{{{ content }}}
125+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
126+
{{/chatwoot.sender.name}}{{{ content }}}
125127
{{/content}}
126128
{{/singleAttachment}}
127129

src/apps/chatwoot/i18n/locales/es-ES.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,14 @@ waha.core.version.used: |-
335335
[**🎁 Apóyanos**]({{{supportUrl}}})
336336
337337
chatwoot.to.whatsapp.message.text: |-
338-
{{{ content }}}
338+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
339+
{{/chatwoot.sender.name}}{{{ content }}}
339340
340341
chatwoot.to.whatsapp.message.media.caption: |-
341342
{{#singleAttachment}}
342343
{{#content}}
343-
{{{ content }}}
344+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
345+
{{/chatwoot.sender.name}}{{{ content }}}
344346
{{/content}}
345347
{{/singleAttachment}}
346348

src/apps/chatwoot/i18n/locales/fa-IR.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,14 @@ waha.core.version.used: |-
335335
[**🎁 از ما حمایت کنید**]({{{supportUrl}}})
336336
337337
chatwoot.to.whatsapp.message.text: |-
338-
{{{ content }}}
338+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
339+
{{/chatwoot.sender.name}}{{{ content }}}
339340
340341
chatwoot.to.whatsapp.message.media.caption: |-
341342
{{#singleAttachment}}
342343
{{#content}}
343-
{{{ content }}}
344+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
345+
{{/chatwoot.sender.name}}{{{ content }}}
344346
{{/content}}
345347
{{/singleAttachment}}
346348

src/apps/chatwoot/i18n/locales/fr-FR.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,14 @@ waha.core.version.used: |-
335335
[**🎁 Soutenez-nous**]({{{supportUrl}}})
336336
337337
chatwoot.to.whatsapp.message.text: |-
338-
{{{ content }}}
338+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
339+
{{/chatwoot.sender.name}}{{{ content }}}
339340
340341
chatwoot.to.whatsapp.message.media.caption: |-
341342
{{#singleAttachment}}
342343
{{#content}}
343-
{{{ content }}}
344+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
345+
{{/chatwoot.sender.name}}{{{ content }}}
344346
{{/content}}
345347
{{/singleAttachment}}
346348

src/apps/chatwoot/i18n/locales/he-IL.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,14 @@ waha.core.version.used: |-
335335
[**🎁 תמוך בנו**]({{{supportUrl}}})
336336
337337
chatwoot.to.whatsapp.message.text: |-
338-
{{{ content }}}
338+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
339+
{{/chatwoot.sender.name}}{{{ content }}}
339340
340341
chatwoot.to.whatsapp.message.media.caption: |-
341342
{{#singleAttachment}}
342343
{{#content}}
343-
{{{ content }}}
344+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
345+
{{/chatwoot.sender.name}}{{{ content }}}
344346
{{/content}}
345347
{{/singleAttachment}}
346348

src/apps/chatwoot/i18n/locales/hi-IN.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,14 @@ waha.core.version.used: |-
335335
[**🎁 हमें समर्थन दें**]({{{supportUrl}}})
336336
337337
chatwoot.to.whatsapp.message.text: |-
338-
{{{ content }}}
338+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
339+
{{/chatwoot.sender.name}}{{{ content }}}
339340
340341
chatwoot.to.whatsapp.message.media.caption: |-
341342
{{#singleAttachment}}
342343
{{#content}}
343-
{{{ content }}}
344+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
345+
{{/chatwoot.sender.name}}{{{ content }}}
344346
{{/content}}
345347
{{/singleAttachment}}
346348

src/apps/chatwoot/i18n/locales/id-ID.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,14 @@ waha.core.version.used: |-
335335
[**🎁 Dukung Kami**]({{{supportUrl}}})
336336
337337
chatwoot.to.whatsapp.message.text: |-
338-
{{{ content }}}
338+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
339+
{{/chatwoot.sender.name}}{{{ content }}}
339340
340341
chatwoot.to.whatsapp.message.media.caption: |-
341342
{{#singleAttachment}}
342343
{{#content}}
343-
{{{ content }}}
344+
{{#chatwoot.sender.name}}*{{{chatwoot.sender.name}}}*:
345+
{{/chatwoot.sender.name}}{{{ content }}}
344346
{{/content}}
345347
{{/singleAttachment}}
346348

0 commit comments

Comments
 (0)