From d9e438596e9540b9f9ba656da74d00b9cf407cab Mon Sep 17 00:00:00 2001 From: Wieland Schopohl Date: Thu, 11 Jun 2020 16:09:33 +0200 Subject: [PATCH 1/2] small translation improvement for de-DE --- locales/de-DE/common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/de-DE/common.json b/locales/de-DE/common.json index c07a3e8e..86fabb70 100644 --- a/locales/de-DE/common.json +++ b/locales/de-DE/common.json @@ -967,7 +967,7 @@ "invalidMjml-1": "MJML ungültig.", "templateContent": "Vorlage Inhalt", "validate": "Validieren", - "blockThumbnails": "Thumbnails blockieren", + "blockThumbnails": "Thumbnails der Blöcke", "versafixOne": "Versafix One", "mjmlSample": "MJML Beispiel", "mosaicoTemplateName": "Mosaico Vorlage \"{{name}}\"", From ebf92ef301c54664f0eaa267d772d620f6168d53 Mon Sep 17 00:00:00 2001 From: Wieland Schopohl Date: Tue, 16 Jun 2020 22:59:13 +0200 Subject: [PATCH 2/2] correct webhook bounces, issue #716 --- server/models/campaigns.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/models/campaigns.js b/server/models/campaigns.js index 9f4546c5..761fb1c3 100644 --- a/server/models/campaigns.js +++ b/server/models/campaigns.js @@ -743,7 +743,7 @@ statusFieldMapping.set(CampaignMessageStatus.COMPLAINED, 'complained'); async function _changeStatusByMessageTx(tx, context, message, campaignMessageStatus) { enforce(statusFieldMapping.has(campaignMessageStatus)); - if (message.status === SubscriptionStatus.SENT) { + if (message.status === CampaignMessageStatus.SENT) { await shares.enforceEntityPermissionTx(tx, context, 'campaign', message.campaign, 'manageMessages'); const statusField = statusFieldMapping.get(campaignMessageStatus);