High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.
JavaScript campaigncampaign-managementemail-marketingemail-subscriptionlistmonkmailing-listnewsletternewsletter-managementnewsletter-softwareself-hostedsms-gatewaysmtptransactional-emails
Add support for campaign-level JSON attributes.
Kailash Nadhf1dd8a4ccf28
diff --git a/cmd/campaigns.go b/cmd/campaigns.goindex d1134289..d9ff6212 100644--- a/cmd/campaigns.go+++ b/cmd/campaigns.go@@ -317,6 +317,11 @@ func (a *App) UpdateCampaign(c echo.Context) error {return echo.NewHTTPError(http.StatusBadRequest, a.i18n.T("campaigns.cantUpdate"))}+ // Clear attribs to avoid merging old and new values as json.Unmarshal in JSON.scan() merges maps,+ // merging values already in the DB and incoming values. If this is nil, then DB values remain+ // unchanged.+ cm.Attribs = nil+// Read the incoming params into the existing campaign fields from the DB.// This allows updating of values that have been sent whereas fields// that are not in the request retain the old values.@@ -696,6 +701,13 @@ func (a *App) validateCampaignFields(c campReq) (campReq, error) {c.Headers = make([]map[string]string, 0)}+ // Validate and initialize attribs.+ if c.Attribs != nil {+ if _, err := json.Marshal(c.Attribs); err != nil {+ return c, errors.New(a.i18n.T("subscribers.invalidJSON"))+ }+ }+if len(c.ArchiveMeta) == 0 {c.ArchiveMeta = json.RawMessage("{}")}diff --git a/cmd/install.go b/cmd/install.goindex f54a303a..f5449a1a 100644--- a/cmd/install.go+++ b/cmd/install.go@@ -172,7 +172,7 @@ func installSubs(defListID, optinListID int, q *models.Queries) {`{"type": "known", "good": true, "city": "Bengaluru"}`,pq.Int64Array{int64(defListID)},models.SubscriptionStatusUnconfirmed,- true); err != nil {+ true, true); err != nil {lo.Fatalf("Error creating subscriber: %v", err)}if _, err := q.UpsertSubscriber.Exec(@@ -182,7 +182,7 @@ func installSubs(defListID, optinListID int, q *models.Queries) {`{"type": "unknown", "good": true, "city": "Bengaluru"}`,pq.Int64Array{int64(optinListID)},models.SubscriptionStatusUnconfirmed,- true); err != nil {+ true, true); err != nil {lo.Fatalf("error creating subscriber: %v", err)}}@@ -259,6 +259,7 @@ func installCampaign(campTplID, archiveTplID int, q *models.Queries) {"richtext",nil,json.RawMessage("[]"),+ json.RawMessage("{}"),pq.StringArray{"test-campaign"},emailMsgr,campTplID,diff --git a/frontend/src/components/Editor.vue b/frontend/src/components/Editor.vueindex 1a1c6fe1..d1205a0f 100644--- a/frontend/src/components/Editor.vue+++ b/frontend/src/components/Editor.vue@@ -58,7 +58,7 @@</div><!-- wsywig //-->- <richtext-editor v-if="self.contentType === 'richtext'" v-model="self.body" />+ <richtext-editor v-if="self.contentType === 'richtext'" :disabled="disabled" v-model="self.body" /><!-- visual editor //--><visual-editor v-if="self.contentType === 'visual'" :source="self.bodySource" @change="onVisualEditorChange"diff --git a/frontend/src/views/Campaign.vue b/frontend/src/views/Campaign.vueindex 739eca13..b7ae43f9 100644--- a/frontend/src/views/Campaign.vue+++ b/frontend/src/views/Campaign.vue@@ -221,6 +221,14 @@</div></b-tab-item><!-- content -->+ <b-tab-item :label="$t('globals.terms.attribs')" icon="code" value="attribs" :disabled="isNew">+ <section class="wrap">+ <b-field :label="$t('globals.terms.attribs')" :message="$t('campaigns.attribsHelp')" label-position="on-border">+ <b-input v-model="form.attribsStr" type="textarea" :disabled="!canEdit" rows="15" />+ </b-field>+ </section>+ </b-tab-item><!-- attribs -->+<b-tab-item :label="$t('campaigns.archive')" icon="newspaper-variant-outline" value="archive" :disabled="isNew"><section class="wrap"><div class="columns">@@ -317,11 +325,11 @@ import htmlToPlainText from 'textversionjs';import Vue from 'vue';import { mapState } from 'vuex';+import CampaignPreview from '../components/CampaignPreview.vue';import CopyText from '../components/CopyText.vue';import Editor from '../components/Editor.vue';import ListSelector from '../components/ListSelector.vue';import Media from './Media.vue';-import CampaignPreview from '../components/CampaignPreview.vue';export default Vue.extend({components: {@@ -363,6 +371,7 @@ export default Vue.extend({fromEmail: '',headersStr: '[]',headers: [],+ attribsStr: '{}',messenger: 'email',lists: [],tags: [],@@ -471,6 +480,23 @@ export default Vue.extend({}}+ // Validate custom JSON attribs.+ let attribs = null;+ if (this.form.attribsStr && this.form.attribsStr.trim()) {+ try {+ attribs = JSON.parse(this.form.attribsStr);+ } catch (e) {+ this.$utils.toast(+ `${this.$t('subscribers.invalidJSON')}: ${e.toString()}`,+ 'is-danger',++ 3000,+ );+ return;+ }+ }+ this.form.attribs = attribs;+switch (typ) {case 'create':this.createCampaign();@@ -492,6 +518,7 @@ export default Vue.extend({...data,headersStr: JSON.stringify(data.headers, null, 4),archiveMetaStr: data.archiveMeta ? JSON.stringify(data.archiveMeta, null, 4) : '{}',+ attribsStr: data.attribs ? JSON.stringify(data.attribs, null, 4) : '{}',// The structure that is populated by editor input event.content: {@@ -550,6 +577,7 @@ export default Vue.extend({tags: this.form.tags,send_at: this.form.sendLater ? this.form.sendAtDate : null,headers: this.form.headers,+ attribs: this.form.attribs,media: this.form.media.map((m) => m.id),};@@ -571,6 +599,7 @@ export default Vue.extend({tags: this.form.tags,send_at: this.form.sendLater ? this.form.sendAtDate : null,headers: this.form.headers,+ attribs: this.form.attribs,template_id: this.form.content.templateId,content_type: this.form.content.contentType,body: this.form.content.body,@@ -596,6 +625,7 @@ export default Vue.extend({this.$api.updateCampaign(this.data.id, data).then((d) => {this.data = d;this.form.archiveSlug = d.archiveSlug;+ this.form.attribsStr = d.attribs ? JSON.stringify(d.attribs, null, 4) : '{}';this.$utils.toast(this.$t(typMsg, { name: d.name }));resolve();diff --git a/frontend/src/views/SubscriberForm.vue b/frontend/src/views/SubscriberForm.vueindex a7d320a9..bb00e408 100644--- a/frontend/src/views/SubscriberForm.vue+++ b/frontend/src/views/SubscriberForm.vue@@ -146,7 +146,7 @@<b-field :message="$t('subscribers.attribsHelp') + ' ' + egAttribs" class="mt-6"><div>- <h5>{{ $t('subscribers.attribs') }}</h5>+ <h5>{{ $t('globals.terms.attribs') }}</h5><b-input v-model="form.strAttribs" name="attribs" type="textarea" /><a href="https://listmonk.app/docs/concepts" target="_blank" rel="noopener noreferrer" class="is-size-7">{{ $t('globals.buttons.learnMore') }} <b-icon icon="link-variant" size="is-small" />diff --git a/i18n/bg.json b/i18n/bg.jsonindex 42d4e0ac..1f45c4d2 100644--- a/i18n/bg.json+++ b/i18n/bg.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL слъг","campaigns.archiveSlugHelp": "Кратко име за страницата, което ще се използва в публичния URL. Например: my-newsletter-edition-2","campaigns.attachments": "Прикачени файлове",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Не може да се актуализира активна или завършена кампания.","campaigns.clicks": "Кликове","campaigns.confirmDelete": "Изтриване на {name}",@@ -224,6 +225,7 @@"globals.states.off": "Изкл","globals.terms.all": "Всички","globals.terms.analytics": "Анализи",+ "globals.terms.attribs": "Атрибути","globals.terms.bounce": "Bounce | Bounces","globals.terms.bounces": "Bounces","globals.terms.campaign": "Кампания | Кампании",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Разширено","subscribers.advancedQueryHelp": "Частичен SQL израз за заявка за атрибути на абонати",- "subscribers.attribs": "Атрибути","subscribers.attribsHelp": "Атрибутите се дефинират като JSON карта, например:","subscribers.blocklistedHelp": "Абонатите в черния списък никога няма да получават имейли.","subscribers.confirmBlocklist": "Черен списък {num} абонат(и)?",diff --git a/i18n/ca.json b/i18n/ca.jsonindex 1406e073..44f8a4c1 100644--- a/i18n/ca.json+++ b/i18n/ca.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "Slug de l'URL","campaigns.archiveSlugHelp": "Un nom curt per a la pàgina que s'utilitzarà a l'URL públic, per exemple: la-meva-edicio-de-newsletter-2","campaigns.attachments": "Adjunts",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "No es pot actualitzar una campanya en curs o ja finalitzada.","campaigns.clicks": "Clics","campaigns.confirmDelete": "Esborra {name}",@@ -224,6 +225,7 @@"globals.states.off": "Apagat","globals.terms.all": "Tot","globals.terms.analytics": "Indicadors",+ "globals.terms.attribs": "Atributs","globals.terms.bounce": "Rebot | Rebots","globals.terms.bounces": "Rebots","globals.terms.campaign": "Campanya | Campanyes",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Avançat","subscribers.advancedQueryHelp": "Expressió SQL parcial per consultar els atributs del subscriptor",- "subscribers.attribs": "Atributs","subscribers.attribsHelp": "Els atributs es defineixen com un mapa JSON, per exemple:","subscribers.blocklistedHelp": "Els subscriptors bloquejats no rebran mai cap correu electrònic.","subscribers.confirmBlocklist": "Afegir a la llista de bloqueig {nombre} subscriptors?",diff --git a/i18n/cs-cz.json b/i18n/cs-cz.jsonindex 04073a01..e17bc36d 100644--- a/i18n/cs-cz.json+++ b/i18n/cs-cz.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL identifikátor","campaigns.archiveSlugHelp": "Krátký název stránky používaný v URL. Například: moje-novinky-edice-2","campaigns.attachments": "Přílohy",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Nelze aktualizovat spuštěnou nebo dokončenou kampaň.","campaigns.clicks": "Kliknutí","campaigns.confirmDelete": "Odstranit {name}",@@ -224,6 +225,7 @@"globals.states.off": "Vypnout","globals.terms.all": "Vše","globals.terms.analytics": "Analytika",+ "globals.terms.attribs": "Atributy","globals.terms.bounce": "Nedoručitelnost | Případy nedoručitelnosti","globals.terms.bounces": "Případy nedoručitelnosti","globals.terms.campaign": "Kampaň | Kampaně",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Rozšířené","subscribers.advancedQueryHelp": "Dílčí výraz SQL k dotazu na atributy odběratele",- "subscribers.attribs": "Atributy","subscribers.attribsHelp": "Atributy jsou definované jako mapa JSON, např.:","subscribers.blocklistedHelp": "Odběratelé na seznamu blokovaných nikdy neobdrží žádné e-maily.","subscribers.confirmBlocklist": "Blokovat {num} odběratelů?",diff --git a/i18n/cy.json b/i18n/cy.jsonindex bd722b21..58a4924a 100644--- a/i18n/cy.json+++ b/i18n/cy.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "Slug URL","campaigns.archiveSlugHelp": "Enw byr ar gyfer y dudalen a ddefnyddir yn yr URL cyhoeddus. e.e.: fy-lythyr-newyddiadur-edisiwn-2","campaigns.attachments": "Atodiadau",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Does dim modd diweddaru ymgyrch fyw neu ymgyrch sydd wedi dod i ben.","campaigns.clicks": "Cliciau","campaigns.confirmDelete": "Dileu {name}",@@ -224,6 +225,7 @@"globals.states.off": "Ffwrdd","globals.terms.all": "Pawb","globals.terms.analytics": "Dadansoddeg",+ "globals.terms.attribs": "Priodoleddau","globals.terms.bounce": "Wedi sboncio'n ôl","globals.terms.bounces": "Wedi sboncio'n ôl","globals.terms.campaign": "Ymgyrch | Ymgyrchoedd",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Uwch","subscribers.advancedQueryHelp": "Mynegiad SQL rhannol i wneud ymholiad ynghylch priodoleddau tanysgrifiwr",- "subscribers.attribs": "Priodoleddau","subscribers.attribsHelp": "Mae priodoleddau'n cael eu diffinio fel map JSON","subscribers.blocklistedHelp": "Ni fydd tanysgrifwyr ar y rhestr rwystro byth yn derbyn unrhyw e-byst.","subscribers.confirmBlocklist": "Rhoi {num} tanysgrifiwr ar y rhestr rwystro?",diff --git a/i18n/da.json b/i18n/da.jsonindex e5586080..663c5928 100644--- a/i18n/da.json+++ b/i18n/da.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL-slug","campaigns.archiveSlugHelp": "Et kort navn til siden, der skal bruges i den offentlige URL. fx: min-nyhedsbrev-udgave-2","campaigns.attachments": "Vedhæftninger",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Kan ike opdatere en kørende eller afsluttet kampagne.","campaigns.clicks": "Klik","campaigns.confirmDelete": "Slet {name}",@@ -224,6 +225,7 @@"globals.states.off": "Lukket","globals.terms.all": "Alle","globals.terms.analytics": "Analyse",+ "globals.terms.attribs": "Attributter","globals.terms.bounce": "Fejlsendt | Fejlsendte","globals.terms.bounces": "Fejlsendte","globals.terms.campaign": "Kampagne | Kampagner",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Avanceret","subscribers.advancedQueryHelp": "Delvist SQL-udtryk til forespørgsel på abonnentattributter",- "subscribers.attribs": "Attributter","subscribers.attribsHelp": "Attributter defineres som et JSON-kort, f.eks.:","subscribers.blocklistedHelp": "Blokerede abonnenter vil aldrig modtage nogen e-mails.","subscribers.confirmBlocklist": "Blokeringsliste {num} abonnent(er)?",diff --git a/i18n/de.json b/i18n/de.jsonindex 12f084f3..76ead6d2 100644--- a/i18n/de.json+++ b/i18n/de.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL-Slug","campaigns.archiveSlugHelp": "Ein kurzer Name für die Seite, der in der öffentlichen URL verwendet wird. z. B.: meine-newsletter-ausgabe-2","campaigns.attachments": "Anhänge",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Eine laufende oder abgeschlossene Kampagne kann nicht verändert werden.","campaigns.clicks": "Klicks","campaigns.confirmDelete": "Lösche {name}",@@ -224,6 +225,7 @@"globals.states.off": "Aus","globals.terms.all": "Alle","globals.terms.analytics": "Statistiken",+ "globals.terms.attribs": "Attribute","globals.terms.bounce": "Bounce | Bounces","globals.terms.bounces": "Bounces","globals.terms.campaign": "Kampagne | Kampagnen",@@ -580,7 +582,6 @@"subscribers.activity": "Aktivität","subscribers.advancedQuery": "Erweitert","subscribers.advancedQueryHelp": "Partieller SQL Ausdruck um Attribute der Abonnenten abzufragen",- "subscribers.attribs": "Attribute","subscribers.attribsHelp": "Attribute sind als JSON Map definiert, z.B.:","subscribers.blocklistedHelp": "Blockierte Abonnenten werden nie wieder E-Mails erhalten.","subscribers.confirmBlocklist": "Blockiere {num} Abonnent(en)?",diff --git a/i18n/el.json b/i18n/el.jsonindex c512105e..2a18a3c7 100644--- a/i18n/el.json+++ b/i18n/el.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL Slug","campaigns.archiveSlugHelp": "Ένα σύντομο όνομα για τη σελίδα που θα χρησιμοποιείται στο δημόσιο URL. π.χ .: έκδοση-του-ενημερωτικού-δελτίου-μου-2","campaigns.attachments": "Συνημμένα",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Δεν είναι δυνατή η ενημέρωση μιας εκστρατείας που βρίσκεται σε εξέλιξη ή έχει ολοκληρωθεί.","campaigns.clicks": "Κλικ","campaigns.confirmDelete": "Διαγραφή {name}",@@ -224,6 +225,7 @@"globals.states.off": "Απενεργοποιημένο","globals.terms.all": "Όλα","globals.terms.analytics": "Στατιστικά",+ "globals.terms.attribs": "Χαρακτηριστικά","globals.terms.bounce": "Bounce | Bounce","globals.terms.bounces": "Bounce","globals.terms.campaign": "Εκστρατεία | Εκστρατείες",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Για προχωρημένους","subscribers.advancedQueryHelp": "Μερική έκφραση SQL για την αναζήτηση χαρακτηριστικών συνδρομητών",- "subscribers.attribs": "Χαρακτηριστικά","subscribers.attribsHelp": "Τα χαρακτηριστικά ορίζονται ως JSON map, για παράδειγμα:","subscribers.blocklistedHelp": "Οι αποκλεισμένοι συνδρομητές δεν θα λάβουν ποτέ κανένα μήνυμα ηλεκτρονικού ταχυδρομείου.","subscribers.confirmBlocklist": "Να αποκλειστούν {αριθμός} συνδρομητές;",diff --git a/i18n/en.json b/i18n/en.jsonindex 23f1d285..a87b0848 100644--- a/i18n/en.json+++ b/i18n/en.json@@ -25,6 +25,8 @@"campaigns.archiveMetaHelp": "Dummy subscriber data to use in the public message including name, email, and any optional attributes used in the campaign message or template.","campaigns.archiveSlug": "URL Slug","campaigns.archiveSlugHelp": "A short name for the page to be used in the public URL. eg: my-newsletter-edition-2",+ "globals.terms.attribs": "Attributes",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.attachments": "Attachments","campaigns.cantUpdate": "Cannot update a running or a finished campaign.","campaigns.clicks": "Clicks",@@ -570,7 +572,6 @@"settings.updateAvailable": "A new update {version} is available.","subscribers.advancedQuery": "Advanced","subscribers.advancedQueryHelp": "Partial SQL expression to query subscriber attributes",- "subscribers.attribs": "Attributes","subscribers.attribsHelp": "Attributes are defined as a JSON map, for example:","subscribers.blocklistedHelp": "Blocklisted subscribers will never receive any e-mails.","subscribers.confirmBlocklist": "Blocklist {num} subscriber(s)?",diff --git a/i18n/eo.json b/i18n/eo.jsonindex 94b2304b..f71dc1ac 100644--- a/i18n/eo.json+++ b/i18n/eo.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL-nomo","campaigns.archiveSlugHelp": "Mallonga nomo por la paĝo, kiu estos uzita en la publika URL, ekzemple: mia-bulteno-2","campaigns.attachments": "Kunsendaĵoj",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Oni ne povas ĝisdatigi kurantan kampajnon aŭ finitan kampajnon.","campaigns.clicks": "Klakoj","campaigns.confirmDelete": "Forviŝu {name}",@@ -224,6 +225,7 @@"globals.states.off": "Apagat","globals.terms.all": "Tot","globals.terms.analytics": "Indicadors",+ "globals.terms.attribs": "Atributs","globals.terms.bounce": "Rebot | Rebots","globals.terms.bounces": "Rebots","globals.terms.campaign": "Campanya | Campanyes",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Avançat","subscribers.advancedQueryHelp": "Expressió SQL parcial per consultar els atributs del subscriptor",- "subscribers.attribs": "Atributs","subscribers.attribsHelp": "Els atributs es defineixen com un mapa JSON, per exemple:","subscribers.blocklistedHelp": "Els subscriptors bloquejats no rebran mai cap correu electrònic.","subscribers.confirmBlocklist": "Afegir a la llista de bloqueig {nombre} subscriptors?",diff --git a/i18n/es.json b/i18n/es.jsonindex 31b7635c..47698a59 100644--- a/i18n/es.json+++ b/i18n/es.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "Slug de URL","campaigns.archiveSlugHelp": "Nombre corto para la página que se utilizará en la URL pública. Ejemplo: mi-boletin-edicion-2","campaigns.attachments": "Archivos adjuntos",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "No es posible actualizar una campaña iniciada o finalizada.","campaigns.clicks": "Clics","campaigns.confirmDelete": "Eliminar {name}",@@ -224,6 +225,7 @@"globals.states.off": "Apagado","globals.terms.all": "Todos","globals.terms.analytics": "Analítica",+ "globals.terms.attribs": "Atributos","globals.terms.bounce": "Rebote | Rebotes","globals.terms.bounces": "Rebotes","globals.terms.campaign": "Campaña | Campañas",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Avanzado","subscribers.advancedQueryHelp": "Expresión SQL parcial para consultar los atributos de un suscriptor",- "subscribers.attribs": "Atributos","subscribers.attribsHelp": "Los atributos son definidos como un objeto JSON llave/valor, por ejemplo:","subscribers.blocklistedHelp": "Las suscripciones en la lista de bloqueos (blocklisted) nunca recibirán correos.","subscribers.confirmBlocklist": "¿Bloquear {num} suscripcion(es)?",diff --git a/i18n/fi.json b/i18n/fi.jsonindex 4550b536..9171492c 100644--- a/i18n/fi.json+++ b/i18n/fi.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL-slugi","campaigns.archiveSlugHelp": "Lyhyt nimi sivulle, jota käytetään julkisessa URL:ssa. Esim: oma-uutiskirje-versio-2","campaigns.attachments": "Liitteet",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Käynnissä olevaa tai päättynyttä kampanjaa ei voi päivittää.","campaigns.clicks": "Klikkaukset","campaigns.confirmDelete": "Poista {name}",@@ -224,6 +225,7 @@"globals.states.off": "Pois päältä","globals.terms.all": "Kaikki","globals.terms.analytics": "Tilastot",+ "globals.terms.attribs": "Ominaisuudet","globals.terms.bounce": "Bounce | Bouncet","globals.terms.bounces": "Bouncet","globals.terms.campaign": "Kampanja | Kampanjat",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Edistynyt","subscribers.advancedQueryHelp": "Osa SQL-lauseketta tilaajien ominaisuuksien kyselyä varten",- "subscribers.attribs": "Ominaisuudet","subscribers.attribsHelp": "Ominaisuudet on määritelty JSON-listana, esimerkiksi:","subscribers.blocklistedHelp": "Estetyt tilaajat eivät koskaan saa sähköposteja.","subscribers.confirmBlocklist": "Estä {num} tilaaja(a)?",diff --git a/i18n/fr-CA.json b/i18n/fr-CA.jsonindex 2bd2f87e..52c0526b 100644--- a/i18n/fr-CA.json+++ b/i18n/fr-CA.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "Slug URL","campaigns.archiveSlugHelp": "Un nom court pour la page à utiliser dans l'URL publique. par exemple: mon-newsletter-edition-2","campaigns.attachments": "Pièces jointes",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Impossible de mettre à jour une campagne en cours ou terminée.","campaigns.clicks": "Clics","campaigns.confirmDelete": "Supprimer la campagne {name}",@@ -224,6 +225,7 @@"globals.states.off": "Désactivé","globals.terms.all": "Tout","globals.terms.analytics": "Analyses",+ "globals.terms.attribs": "Attributs","globals.terms.bounce": "Rebond | Rebonds","globals.terms.bounces": "Rebonds","globals.terms.campaign": "Campagne | Campagnes",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Requête avancée","subscribers.advancedQueryHelp": "Expression SQL partielle pour interroger les attributs de l'abonné·e",- "subscribers.attribs": "Attributs","subscribers.attribsHelp": "Les attributs sont définis comme une map JSON, par exemple :","subscribers.blocklistedHelp": "Les abonné·es bloqué·es ne recevront jamais de courriels.","subscribers.confirmBlocklist": "Bloquer {num} abonné·e(s) ?",diff --git a/i18n/fr.json b/i18n/fr.jsonindex 3c6bf304..5450d506 100644--- a/i18n/fr.json+++ b/i18n/fr.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "Slug URL","campaigns.archiveSlugHelp": "Un nom court pour la page à utiliser dans l'URL publique. par exemple: mon-newsletter-edition-2","campaigns.attachments": "Pièces jointes",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Impossible de mettre à jour une campagne en cours ou terminée.","campaigns.clicks": "Clics","campaigns.confirmDelete": "Supprimer la campagne {name}",@@ -224,6 +225,7 @@"globals.states.off": "Désactivé","globals.terms.all": "Tout","globals.terms.analytics": "Analyses",+ "globals.terms.attribs": "Attributs","globals.terms.bounce": "Rebond | Rebonds","globals.terms.bounces": "Rebonds","globals.terms.campaign": "Campagne | Campagnes",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Requête avancée","subscribers.advancedQueryHelp": "Expression SQL partielle pour interroger les attributs de l'abonné·e",- "subscribers.attribs": "Attributs","subscribers.attribsHelp": "Les attributs sont définis comme une map JSON, par exemple :","subscribers.blocklistedHelp": "Les abonné·es bloqué·es ne recevront jamais d'e-mails.","subscribers.confirmBlocklist": "Bloquer {num} abonné·e(s) ?",diff --git a/i18n/he.json b/i18n/he.jsonindex 3f1dc982..f95af202 100644--- a/i18n/he.json+++ b/i18n/he.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "אימות כתובת","campaigns.archiveSlugHelp": "שם קצר לדף המשמש בכתובת ה-URL הציבורית. לדוגמה: מכתב-חדשות-2","campaigns.attachments": "קבצים מצורפים",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "לא ניתן לעדכן קמפיין בריצה או שהושלם.","campaigns.clicks": "לחיצות","campaigns.confirmDelete": "מחק את {name}",@@ -224,6 +225,7 @@"globals.states.off": "כבוי","globals.terms.all": "הכל","globals.terms.analytics": "סטטיסטיקות",+ "globals.terms.attribs": "מאפיינים","globals.terms.bounce": "להקפיץ | קופץ","globals.terms.bounces": "קופץ","globals.terms.campaign": "קמפיין | קמפיינים",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "מתקדם","subscribers.advancedQueryHelp": "הביטוי הדו־לשוני הוא להשתמש בביטוי SQL חלקיאָני לחיפוש אחריות במאפיינים בעלי חיפוש מתקדם.",- "subscribers.attribs": "מאפיינים","subscribers.attribsHelp": "האטריביוטים מוגדרים כמפתח JSON, לדוגמה:","subscribers.blocklistedHelp": "מנויים מהות מעוניינים באימייל שום גבול?","subscribers.confirmBlocklist": "שמירה ל- {num} מנויים ברשימה השחורה?",diff --git a/i18n/hu.json b/i18n/hu.jsonindex fdcbb2d2..4d353670 100644--- a/i18n/hu.json+++ b/i18n/hu.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL Slug","campaigns.archiveSlugHelp": "Egy rövid név a nyilvános URL-címben való használathoz. Például: az-en-hirlevelem-2","campaigns.attachments": "Mellékletek",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Nem lehet frissíteni futó vagy befejezett kampányt.","campaigns.clicks": "Kattintások","campaigns.confirmDelete": "Kampány törlése: {name}",@@ -224,6 +225,7 @@"globals.states.off": "Ki","globals.terms.all": "Összes","globals.terms.analytics": "Kimutatások",+ "globals.terms.attribs": "Adatok","globals.terms.bounce": "Visszapattanó","globals.terms.bounces": "Visszapattanók","globals.terms.campaign": "Kampány",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Adatbázis lekérdezés","subscribers.advancedQueryHelp": "Részleges SQL kifejezés a tagok lekérdezéséhez",- "subscribers.attribs": "Adatok","subscribers.attribsHelp": "Tetszőleges adat hozzáadása (JSON formátumban). Például:","subscribers.blocklistedHelp": "A tiltólistán szereplő tagok soha nem kapnak e-mailt.","subscribers.confirmBlocklist": "{num} tag tiltása?",diff --git a/i18n/it.json b/i18n/it.jsonindex 184ede83..ab830485 100644--- a/i18n/it.json+++ b/i18n/it.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "Slug URL","campaigns.archiveSlugHelp": "Un nome breve per la pagina da utilizzare nell'URL pubblico. es: mia-newsletter-edizione-2","campaigns.attachments": "Allegati",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Impossibile aggiornare una campagna in corso o già effettuata.","campaigns.clicks": "Click","campaigns.confirmDelete": "Cancellare {nome}",@@ -224,6 +225,7 @@"globals.states.off": "Spenti","globals.terms.all": "Tutti","globals.terms.analytics": "Analytics",+ "globals.terms.attribs": "Attributi","globals.terms.bounce": "Rimbalzo | Rimbalzi","globals.terms.bounces": "Rimbalzi","globals.terms.campaign": "Campagna | Campagne",@@ -580,7 +582,6 @@"subscribers.activity": "Attività","subscribers.advancedQuery": "Avanzate","subscribers.advancedQueryHelp": "Espressione SQL parziale per interrogare gli attributi del sottoscrittore",- "subscribers.attribs": "Attributi","subscribers.attribsHelp": "Gli attributi sono definiti come un JSON, ad esempio:","subscribers.blocklistedHelp": "Gli abbonati bloccati non riceveranno mai email.","subscribers.confirmBlocklist": "Lista di blocco {num} iscritto(i)?",diff --git a/i18n/jp.json b/i18n/jp.jsonindex 6d55e865..119e5150 100644--- a/i18n/jp.json+++ b/i18n/jp.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URLスラッグ","campaigns.archiveSlugHelp": "パブリックURLで使用されるページの短い名前。例:my-newsletter-edition-2","campaigns.attachments": "添付ファイル",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "実行中又は終了しているキャンペーンの更新はできません。","campaigns.clicks": "クリック","campaigns.confirmDelete": "削除 {name}",@@ -224,6 +225,7 @@"globals.states.off": "オフ","globals.terms.all": "全部","globals.terms.analytics": "分析",+ "globals.terms.attribs": "属性","globals.terms.bounce": "バウンス | バウンス","globals.terms.bounces": "バウンス","globals.terms.campaign": "キャンペーン | キャンペーン",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "アドバンスド","subscribers.advancedQueryHelp": "加入者属性を問い合わせる部分的なSQL式",- "subscribers.attribs": "属性","subscribers.attribsHelp": "属性はJSONマップとして定義されます。例えば:","subscribers.blocklistedHelp": "ブロックリストされた加入者は二度とメールを受け取りません。","subscribers.confirmBlocklist": "加入者を {num}ブロックリストしますか ?",diff --git a/i18n/ko.json b/i18n/ko.jsonindex 920a203d..6c249850 100644--- a/i18n/ko.json+++ b/i18n/ko.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL 슬러그","campaigns.archiveSlugHelp": "공개 URL에서 사용할 페이지의 짧은 이름. 예: my-newsletter-edition-2","campaigns.attachments": "첨부파일",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "진행 중이거나 완료된 캠페인은 수정할 수 없습니다.","campaigns.clicks": "클릭","campaigns.confirmDelete": "{name} 삭제",@@ -224,6 +225,7 @@"globals.states.off": "꺼짐","globals.terms.all": "전체","globals.terms.analytics": "분석",+ "globals.terms.attribs": "속성","globals.terms.bounce": "바운스","globals.terms.bounces": "바운스","globals.terms.campaign": "캠페인",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "고급","subscribers.advancedQueryHelp": "구독자 속성을 쿼리할 부분 SQL 표현식",- "subscribers.attribs": "속성","subscribers.attribsHelp": "속성은 JSON 맵으로 정의됩니다. 예:","subscribers.blocklistedHelp": "차단된 구독자는 이메일을 절대 받지 않습니다.","subscribers.confirmBlocklist": "{num}명의 구독자를 차단 목록에 추가하시겠습니까?",diff --git a/i18n/ml.json b/i18n/ml.jsonindex de809685..1ff37f41 100644--- a/i18n/ml.json+++ b/i18n/ml.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL സ്ലഗ്","campaigns.archiveSlugHelp": "പൊതു യുആർഎൽ - ന്റെയും ഉപയോഗിക്കുന്നതിന് ആയിരുന്നു പേജിന്റെയും സംക്ഷേപമായി. ഉദാ: എന്റെ-ന്യൂസ്-ലെറ്റർ-എഡിഷൻ-2","campaigns.attachments": "അറ്റാച്ച്മെന്റ്സ്",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "ഇപ്പോൾ നടന്നുകൊണ്ടിരിയ്ക്കുന്നതോ, അവസാനിച്ചതോ ആയ ക്യാമ്പേയ്ൻ പുതുക്കാനാകില്ല.","campaigns.clicks": "ക്ലീക്കുകൾ","campaigns.confirmDelete": "{name} നീക്കം ചെയ്യുക",@@ -224,6 +225,7 @@"globals.states.off": "ഓഫ്","globals.terms.all": "എല്ലാം","globals.terms.analytics": "അനലറ്റിക്സ്",+ "globals.terms.attribs": "ആട്രിബ്യൂട്ടുകൾ","globals.terms.bounce": "ബൗൺസ് | ങൗൺസുകൾ","globals.terms.bounces": "ബൗൺസുകൾ","globals.terms.campaign": "ക്യാമ്പേയ്ൻ | ക്യാമ്പേയ്നുകൾ",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "വിപുലമായത്","subscribers.advancedQueryHelp": "വരിക്കാരുടെ വിവരങ്ങൾ മനസിലാക്കുന്നതിനായുള്ള ഭാഗികമായ SQL പ്രയേഗം",- "subscribers.attribs": "ആട്രിബ്യൂട്ടുകൾ","subscribers.attribsHelp": "ജേസൺ മാപ്പായി ആട്രിബ്യൂട്ടുകൾ നിർവ്വചിക്കുക. ഉദാഹരണത്തിന്:","subscribers.blocklistedHelp": "തടയുന്ന പട്ടികയിലുള്ള വരിക്കാർക്ക് ഇ-മെയിലുകളൊന്നും അയക്കില്ല. | തടയുന്ന പട്ടികയിലുള്ള വരിക്കാർ ഇ-മെയിലുകളൊന്നും സ്വീകരിക്കില്ല","subscribers.confirmBlocklist": "വരിക്കാരനെ തടയുന്ന പട്ടികയിൽ ചേർക്കട്ടേ? | {num} വരിക്കാരേ തടയുന്ന പട്ടികയിൽ ചേർക്കട്ടേ?",diff --git a/i18n/nl.json b/i18n/nl.jsonindex fafdc7d3..269e9881 100644--- a/i18n/nl.json+++ b/i18n/nl.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL-slug","campaigns.archiveSlugHelp": "Een korte naam voor de pagina die gebruikt wordt in de openbare URL. Bijv: mijn-nieuwsbrief-editie-2","campaigns.attachments": "Bijlagen",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Kan een lopende of afgelopen campagne niet updaten.","campaigns.clicks": "Kliks","campaigns.confirmDelete": "Verwijder {name}",@@ -224,6 +225,7 @@"globals.states.off": "Uit","globals.terms.all": "Alle","globals.terms.analytics": "Analyse",+ "globals.terms.attribs": "Attributen","globals.terms.bounce": "Bounce | Bounces","globals.terms.bounces": "Bounces","globals.terms.campaign": "Campagne | Campagnes",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Geavanceerd","subscribers.advancedQueryHelp": "Gedeeltelijke SQL uitdrukking om abonnees attributen op te vragen",- "subscribers.attribs": "Attributen","subscribers.attribsHelp": "Attributen worden gedefinieerd in een JSON map, bijvoorbeeld:","subscribers.blocklistedHelp": "Geblokkeerde abonnees zullen nooit e-mails ontvangen.","subscribers.confirmBlocklist": "{num} abonnee(s) blokkeren?",diff --git a/i18n/no.json b/i18n/no.jsonindex 13eceb64..26e5041e 100644--- a/i18n/no.json+++ b/i18n/no.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL Slug","campaigns.archiveSlugHelp": "Et kort navn for siden som brukes i den offentlige URL-en, f.eks.: min-nyhetsbrev-utgave-2","campaigns.attachments": "Vedlegg",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Kan ikke oppdatere en kampanje som kjører eller er fullført.","campaigns.clicks": "Klikk","campaigns.confirmDelete": "Slett {name}",@@ -224,6 +225,7 @@"globals.states.off": "Av","globals.terms.all": "Alle","globals.terms.analytics": "Analyse",+ "globals.terms.attribs": "Attributter","globals.terms.bounce": "Retur | Returnerer","globals.terms.bounces": "Returnerer","globals.terms.campaign": "Kampanje | Kampanjer",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Avansert","subscribers.advancedQueryHelp": "Delvis SQL-uttrykk for å søke i abonnentattributter",- "subscribers.attribs": "Attributter","subscribers.attribsHelp": "Attributter er definert som en JSON-mappe, for eksempel:","subscribers.blocklistedHelp": "Blokkerte abonnenter vil aldri motta e-poster.","subscribers.confirmBlocklist": "Blokker {num} abonnent(er)?",diff --git a/i18n/pl.json b/i18n/pl.jsonindex a3809265..6f0146a0 100644--- a/i18n/pl.json+++ b/i18n/pl.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL Slug","campaigns.archiveSlugHelp": "Krótka nazwa strony do użycia w publicznym adresie URL. np. moje-wydanie-newslettera-2","campaigns.attachments": "Załączniki",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Nie można aktualizować aktywnej ani zakończonej kampanii","campaigns.clicks": "Kliknięcia","campaigns.confirmDelete": "Usuń {name}",@@ -224,6 +225,7 @@"globals.states.off": "Wyłączone","globals.terms.all": "Wszystkie","globals.terms.analytics": "Analityka",+ "globals.terms.attribs": "Atrybuty","globals.terms.bounce": "Odbicie","globals.terms.bounces": "Odbicia","globals.terms.campaign": "Kampania | Kampanie",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Zaawansowane","subscribers.advancedQueryHelp": "Częściowe zapytania SQL w celu pobrania atrybutów subskrybentów",- "subscribers.attribs": "Atrybuty","subscribers.attribsHelp": "Atrybuty są definiowane jako mapa w JSON, np:","subscribers.blocklistedHelp": "Zablokowani subskrybenci nigdy nie dostaną żadnego emaila.","subscribers.confirmBlocklist": "Czy zablokować {num} subskrybentów?",diff --git a/i18n/pt-BR.json b/i18n/pt-BR.jsonindex 47e779ba..c35a70b5 100644--- a/i18n/pt-BR.json+++ b/i18n/pt-BR.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "Slug do URL","campaigns.archiveSlugHelp": "Um nome curto para a página a ser usada no URL público. Ex: edicao-minha-newsletter-2","campaigns.attachments": "Anexos",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Não é possível atualizar uma campanha em execução ou finalizada.","campaigns.clicks": "Cliques","campaigns.confirmDelete": "Excluir {name}",@@ -224,6 +225,7 @@"globals.states.off": "Desligado","globals.terms.all": "Tudo","globals.terms.analytics": "Análises",+ "globals.terms.attribs": "Atributos","globals.terms.bounce": "Rejeição | Rejeições","globals.terms.bounces": "Rejeições","globals.terms.campaign": "Campanha | Campanhas",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Avançado","subscribers.advancedQueryHelp": "Expressão de SQL parcial para consultar atributos dos inscritos",- "subscribers.attribs": "Atributos","subscribers.attribsHelp": "Atributos são definidos como um mapa JSON, por exemplo:","subscribers.blocklistedHelp": "Inscritos bloqueados nunca receberão quaisquer e-mails.","subscribers.confirmBlocklist": "Bloquear {num} inscrito(s)?",diff --git a/i18n/pt.json b/i18n/pt.jsonindex 923a3c03..5506af90 100644--- a/i18n/pt.json+++ b/i18n/pt.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "Slug do URL","campaigns.archiveSlugHelp": "Um nome curto para a página a ser usado no URL público. ex: edicao-da-minha-newsletter-2","campaigns.attachments": "Anexos",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Não é possível atualizar uma campanha em curso ou terminada.","campaigns.clicks": "Cliques","campaigns.confirmDelete": "Eliminar {name}",@@ -224,6 +225,7 @@"globals.states.off": "Desligado","globals.terms.all": "Todos(as)","globals.terms.analytics": "Analítica",+ "globals.terms.attribs": "Atributos","globals.terms.bounce": "Rejeição | Rejeições","globals.terms.bounces": "Rejeições","globals.terms.campaign": "Campanha | Campanhas",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Avançado","subscribers.advancedQueryHelp": "Expressão SQL parcial para consultar atributos de subscritores",- "subscribers.attribs": "Atributos","subscribers.attribsHelp": "Atributos estão definidos como uma mapa JSON, por exemplo:","subscribers.blocklistedHelp": "Subscritores bloqueados nunca irão receber emails.","subscribers.confirmBlocklist": "Adicionar {num} subscritor(es) à lista de bloqueio?",diff --git a/i18n/ro.json b/i18n/ro.jsonindex bec581d0..1945638f 100644--- a/i18n/ro.json+++ b/i18n/ro.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "Slug URL","campaigns.archiveSlugHelp": "Un nume scurt pentru pagina care va fi utilizat în URL-ul public. ex: editia-mea-de-newsletter-2","campaigns.attachments": "Fișiere atașate",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Nu se poate actualiza o campanie care rulează sau s-a terminat.","campaigns.clicks": "Click-uri","campaigns.confirmDelete": "Ștergerea {name}",@@ -224,6 +225,7 @@"globals.states.off": "Oprit","globals.terms.all": "Tot","globals.terms.analytics": "Analitice",+ "globals.terms.attribs": "Atribute","globals.terms.bounce": "Saritura | Bounces","globals.terms.bounces": "Neachitate","globals.terms.campaign": "Campanie | Campanii",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Avansat","subscribers.advancedQueryHelp": "Expresie SQL parțială pentru a interoga atributele abonatului",- "subscribers.attribs": "Atribute","subscribers.attribsHelp": "Atributele sunt definite ca o hartă JSON, de exemplu:","subscribers.blocklistedHelp": "Abonații din lista neagră nu vor primi niciodată e-mailuri.","subscribers.confirmBlocklist": "Lista de blocări {num} abonaților?",diff --git a/i18n/ru.json b/i18n/ru.jsonindex 3a0198d6..5f1a31d2 100644--- a/i18n/ru.json+++ b/i18n/ru.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL-идентификатор","campaigns.archiveSlugHelp": "Краткое имя страницы, которое будет использоваться в публичном URL. Например: my-newsletter-edition-2","campaigns.attachments": "Вложения",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Невозможно обновить запущенную или завершённую кампанию.","campaigns.clicks": "Клики","campaigns.confirmDelete": "Удалить {name}",@@ -224,6 +225,7 @@"globals.states.off": "Выкл","globals.terms.all": "Все","globals.terms.analytics": "Аналитика",+ "globals.terms.attribs": "Атрибуты","globals.terms.bounce": "Отказ | Отказы","globals.terms.bounces": "Отказы","globals.terms.campaign": "Кампания | Кампании",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Расширенный","subscribers.advancedQueryHelp": "Частичное SQL-выражение для запроса атрибутов подписчиков",- "subscribers.attribs": "Атрибуты","subscribers.attribsHelp": "Атрибуты определяются как JSON-карта, например:","subscribers.blocklistedHelp": "Подписчики, добавленные в чёрный список, никогда не будут получать письма.","subscribers.confirmBlocklist": "Добавить в чёрный список {num} подписчика(ов)?",diff --git a/i18n/se.json b/i18n/se.jsonindex bdf0193c..32841ada 100644--- a/i18n/se.json+++ b/i18n/se.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL-slug","campaigns.archiveSlugHelp": "Ett kort namn för sidan som används i den offentliga URL-adressen. t.ex: min-nyhetsbrev-upplaga-2","campaigns.attachments": "Bilagor",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Kan inte uppdatera en pågående eller avslutad kampanj.","campaigns.clicks": "Klick","campaigns.confirmDelete": "Ta bort {name}",@@ -224,6 +225,7 @@"globals.states.off": "Av","globals.terms.all": "Alla","globals.terms.analytics": "Analyser",+ "globals.terms.attribs": "Attribut","globals.terms.bounce": "Studs","globals.terms.bounces": "Studsar","globals.terms.campaign": "Kampanj",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Avancerad","subscribers.advancedQueryHelp": "Del SQL-uttryck för att fråga prenumerantattribut",- "subscribers.attribs": "Attribut","subscribers.attribsHelp": "Attribut definieras som en JSON-map, till exempel:","subscribers.blocklistedHelp": "Blocklistade prenumeranter kommer aldrig att få några e-postmeddelanden.","subscribers.confirmBlocklist": "Blocka {num} prenumerant(er)?",diff --git a/i18n/sk.json b/i18n/sk.jsonindex 03ed95b6..100ae385 100644--- a/i18n/sk.json+++ b/i18n/sk.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL slug","campaigns.archiveSlugHelp": "Krátky názov stránky, ktorý sa používa v verejnom URL. Napríklad: moj-newsletter-edicia-2","campaigns.attachments": "Prílohy",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Nedá sa aktualizovať spustená alebo dokončená kampaň.","campaigns.clicks": "Kliknutia","campaigns.confirmDelete": "Odstrániť {name}",@@ -224,6 +225,7 @@"globals.states.off": "Vypnuté","globals.terms.all": "Všetko","globals.terms.analytics": "Analytika",+ "globals.terms.attribs": "Atribúty","globals.terms.bounce": "Nedoručitelný | Nedoručiteľné","globals.terms.bounces": "Nedoručiteľné","globals.terms.campaign": "Kampaň | Kampane",@@ -580,7 +582,6 @@"subscribers.activity": "Aktivita","subscribers.advancedQuery": "Rozšírené","subscribers.advancedQueryHelp": "Časť výrazu SQL k dotazu na atribúty odberateľov",- "subscribers.attribs": "Atribúty","subscribers.attribsHelp": "Atribúty sú definované ako mapa JSON, napr.:","subscribers.blocklistedHelp": "Odberateľlia na zozname blokovaných nikdy nedostanú žiadne emaily.","subscribers.confirmBlocklist": "Blokovať {num} odberateľov?",diff --git a/i18n/sl.json b/i18n/sl.jsonindex f9ab37bf..84a34e33 100644--- a/i18n/sl.json+++ b/i18n/sl.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL naslov","campaigns.archiveSlugHelp": "Kratko ime za stran, ki bo uporabljena v javnem URL-ju. Npr.: my-newsletter-edition-2","campaigns.attachments": "Priloge",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Ne morem posodobiti tekoče ali končane akcije.","campaigns.clicks": "Kliki","campaigns.confirmDelete": "Izbriši {name}",@@ -224,6 +225,7 @@"globals.states.off": "Izklopljeno","globals.terms.all": "Vse","globals.terms.analytics": "Analitika",+ "globals.terms.attribs": "Atributi","globals.terms.bounce": "Odbiti | Odbiti","globals.terms.bounces": "Odboji","globals.terms.campaign": "Akcija | Oglaševalske akcije",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Napredno","subscribers.advancedQueryHelp": "Delni izraz SQL za poizvedovanje atributov naročnika",- "subscribers.attribs": "Atributi","subscribers.attribsHelp": "Atributi so definirani kot zemljevid JSON, na primer:","subscribers.blocklistedHelp": "Naročniki na seznamu blokiranih ne bodo nikoli prejeli e-pošte.","subscribers.confirmBlocklist": "Blokiraj {num} naročnikov?",diff --git a/i18n/tr.json b/i18n/tr.jsonindex 83a280d6..1863a270 100644--- a/i18n/tr.json+++ b/i18n/tr.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL Parçası","campaigns.archiveSlugHelp": "Halka açık URL'de kullanılacak kısa bir ad. örn: benim-bülten-baskısı-2","campaigns.attachments": "Ekler",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Gönderilmekte olan veya gönderilmiş kampaynalar güncellenemez.","campaigns.clicks": "Tıklama","campaigns.confirmDelete": "Sil {name}",@@ -224,6 +225,7 @@"globals.states.off": "Kapalı","globals.terms.all": "Tümü","globals.terms.analytics": "Analitik",+ "globals.terms.attribs": "Nitelikler","globals.terms.bounce": "Ters Dökülme | Ters Dökülmeler","globals.terms.bounces": "Ters Dökülmeler","globals.terms.campaign": "Kampanya | Kampanyalar",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "İleri düzey","subscribers.advancedQueryHelp": "Üye attributes verisini görüntülemek için SQL verisi",- "subscribers.attribs": "Nitelikler","subscribers.attribsHelp": "Nitelikler verisi JSON map olarak tanımlı, örnek olarak:","subscribers.blocklistedHelp": "Erişime engelli üyeler hiçbir zaman e-posta alamayacak.","subscribers.confirmBlocklist": "Erişime engelli {num} üye(leri)?",diff --git a/i18n/uk.json b/i18n/uk.jsonindex 6e6c820a..64e8d14d 100644--- a/i18n/uk.json+++ b/i18n/uk.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL-ідентифікатор","campaigns.archiveSlugHelp": "Коротке ім'я сторінки, яке буде використовуватися в публічному URL. Наприклад: my-newsletter-edition-2","campaigns.attachments": "Вкладення",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Неможливо оновити запущену чи завершену кампанію.","campaigns.clicks": "Переходи","campaigns.confirmDelete": "Видалити {name}",@@ -224,6 +225,7 @@"globals.states.off": "Вимкнено","globals.terms.all": "Все","globals.terms.analytics": "Аналітика",+ "globals.terms.attribs": "Властивості","globals.terms.bounce": "Помилка | Помилки","globals.terms.bounces": "Помилки","globals.terms.campaign": "Кампанія | Кампанії",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Складніший запит","subscribers.advancedQueryHelp": "Частковий SQL-вираз для пошуку властивостей підписни_ць",- "subscribers.attribs": "Властивості","subscribers.attribsHelp": "Формат властивостей — JSON-об'єкт, наприклад:","subscribers.blocklistedHelp": "Заблоковані підписни_ці не отримуватимуть жодних листів.","subscribers.confirmBlocklist": "Заблокувати {num} підписни_ць?",diff --git a/i18n/vi.json b/i18n/vi.jsonindex 4cc8339c..24754238 100644--- a/i18n/vi.json+++ b/i18n/vi.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "Slug URL","campaigns.archiveSlugHelp": "Một tên ngắn cho trang được sử dụng trong đường dẫn URL công khai. Ví dụ: my-newsletter-edition-2","campaigns.attachments": "Tệp đính kèm",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "Không thể cập nhật chiến dịch đang chạy hoặc đã kết thúc.","campaigns.clicks": "Số lần nhấp chuột","campaigns.confirmDelete": "Xóa {name}",@@ -224,6 +225,7 @@"globals.states.off": "Tắt","globals.terms.all": "Tất cả","globals.terms.analytics": "phân tích",+ "globals.terms.attribs": "Thuộc tính","globals.terms.bounce": "Bounces | Bounces","globals.terms.bounces": "Bị trả lại","globals.terms.campaign": "Chiến dịch | Chiến dịch",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "Trình độ cao","subscribers.advancedQueryHelp": "Biểu thức SQL một phần để truy vấn thuộc tính người đăng ký",- "subscribers.attribs": "Thuộc tính","subscribers.attribsHelp": "Các thuộc tính được định nghĩa như một bản đồ JSON, ví dụ:","subscribers.blocklistedHelp": "Những người đăng ký bị chặn sẽ không bao giờ nhận được bất kỳ e-mail nào.","subscribers.confirmBlocklist": "Danh sách chặn {num} người đăng ký?",diff --git a/i18n/zh-CN.json b/i18n/zh-CN.jsonindex 17cae2fa..eee2a6c5 100644--- a/i18n/zh-CN.json+++ b/i18n/zh-CN.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL 别名","campaigns.archiveSlugHelp": "公共 URL 中用于页面的简短名称。例如:my-newsletter-edition-2","campaigns.attachments": "附件",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "无法更新正在运行或已完成的广告系列。","campaigns.clicks": "点击次数","campaigns.confirmDelete": "删除{名称}",@@ -224,6 +225,7 @@"globals.states.off": "关闭","globals.terms.all": "所有","globals.terms.analytics": "统计",+ "globals.terms.attribs": "属性","globals.terms.bounce": "反弹 | 多个反弹","globals.terms.bounces": "反弹","globals.terms.campaign": "广告 | 多个广告",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "高级","subscribers.advancedQueryHelp": "查询订阅者属性的部分SQL表达式",- "subscribers.attribs": "属性","subscribers.attribsHelp": "属性定义为JSON映射,例如:","subscribers.blocklistedHelp": "列入黑名单的订阅者永远不会收到任何电子邮件。","subscribers.confirmBlocklist": "屏蔽 {num} 个订阅者?",diff --git a/i18n/zh-TW.json b/i18n/zh-TW.jsonindex 64b57c36..30a94bb9 100644--- a/i18n/zh-TW.json+++ b/i18n/zh-TW.json@@ -26,6 +26,7 @@"campaigns.archiveSlug": "URL 別名","campaigns.archiveSlugHelp": "用於公開 URL 的頁面的簡短名稱,例如:我的電子報第二期","campaigns.attachments": "附件",+ "campaigns.attribsHelp": "Custom JSON object {} attributes for this campaign. Use in template with {{ .Campaign.Attribs.$key }}","campaigns.cantUpdate": "無法更新正在執行中或已完成的活動。","campaigns.clicks": "點擊次數","campaigns.confirmDelete": "刪除 {name}",@@ -224,6 +225,7 @@"globals.states.off": "關閉","globals.terms.all": "全部","globals.terms.analytics": "分析",+ "globals.terms.attribs": "屬性","globals.terms.bounce": "退回 (Bounce)","globals.terms.bounces": "退回 (Bounces)","globals.terms.campaign": "廣告| 多個廣告",@@ -580,7 +582,6 @@"subscribers.activity": "Activity","subscribers.advancedQuery": "高級","subscribers.advancedQueryHelp": "查看訂閱者屬性的部分 SQL 表達式",- "subscribers.attribs": "屬性","subscribers.attribsHelp": "屬性定義為 JSON map,例如:","subscribers.blocklistedHelp": "列入黑名單的訂閱者永遠不會收到任何電子郵件。","subscribers.confirmBlocklist": "將 {num} 個訂閱者加入黑名單?",diff --git a/internal/bounce/mailbox/pop.go b/internal/bounce/mailbox/pop.goindex 511c003d..85b4c1a3 100644--- a/internal/bounce/mailbox/pop.go+++ b/internal/bounce/mailbox/pop.go@@ -201,7 +201,6 @@ func (p *POP) Scan(limit int, ch chan models.Bounce) error {bounceType, bounceReason := classifyBounce(b.Bytes())// Additional bounce e-mail metadata.- fmt.Println(bounceReason)meta, _ := json.Marshal(bounceMeta{From: hdr[models.EmailHeaderFrom],Subject: hdr[models.EmailHeaderSubject],diff --git a/internal/core/campaigns.go b/internal/core/campaigns.goindex f11fb34e..14aca638 100644--- a/internal/core/campaigns.go+++ b/internal/core/campaigns.go@@ -181,6 +181,7 @@ func (c *Core) CreateCampaign(o models.Campaign, listIDs []int, mediaIDs []int)o.ContentType,o.SendAt,o.Headers,+ o.Attribs,pq.StringArray(normalizeTags(o.Tags)),o.Messenger,o.TemplateID,@@ -220,6 +221,7 @@ func (c *Core) UpdateCampaign(id int, o models.Campaign, listIDs []int, mediaIDso.ContentType,o.SendAt,o.Headers,+ o.Attribs,pq.StringArray(normalizeTags(o.Tags)),o.Messenger,o.TemplateID,diff --git a/internal/migrations/v5.2.0.go b/internal/migrations/v5.2.0.goindex 4e7465cf..991f5645 100644--- a/internal/migrations/v5.2.0.go+++ b/internal/migrations/v5.2.0.go@@ -48,5 +48,11 @@ func V5_2_0(db *sqlx.DB, fs stuffbin.FileSystem, ko *koanf.Koanf, lo *log.Loggerreturn err}+ // Add attribs field to campaigns table.+ _, err = db.Exec(`ALTER TABLE campaigns ADD COLUMN IF NOT EXISTS attribs JSONB NOT NULL DEFAULT '{}'`)+ if err != nil {+ return err+ }+return nil}diff --git a/models/campaigns.go b/models/campaigns.goindex 10af385f..b7f38f65 100644--- a/models/campaigns.go+++ b/models/campaigns.go@@ -52,6 +52,7 @@ type Campaign struct {ContentType string `db:"content_type" json:"content_type"`Tags pq.StringArray `db:"tags" json:"tags"`Headers Headers `db:"headers" json:"headers"`+ Attribs JSON `db:"attribs" json:"attribs"`TemplateID null.Int `db:"template_id" json:"template_id"`Messenger string `db:"messenger" json:"messenger"`Archive bool `db:"archive" json:"archive"`diff --git a/models/common.go b/models/common.goindex 273b629d..83bfc7d8 100644--- a/models/common.go+++ b/models/common.go@@ -121,16 +121,16 @@ func (s JSON) Value() (driver.Value, error) {}// Scan unmarshals JSONB from the DB.-func (s JSON) Scan(src any) error {- if src == nil {+func (s JSON) Scan(b any) error {+ if b == nil {s = make(JSON)return nil}- if data, ok := src.([]byte); ok {+ if data, ok := b.([]byte); ok {return json.Unmarshal(data, &s)}- return fmt.Errorf("could not not decode type %T -> %T", src, s)+ return fmt.Errorf("could not not decode type %T -> %T", b, s)}// Scan unmarshals JSONB from the DB.diff --git a/queries/campaigns.sql b/queries/campaigns.sqlindex 02903a95..5e5a680a 100644--- a/queries/campaigns.sql+++ b/queries/campaigns.sql@@ -17,39 +17,39 @@ WITH tpl AS (CASE-- If a template ID is present, use it. If not, use the default template only if-- it's not a visual template.- WHEN $13::INT IS NOT NULL THEN id = $13::INT+ WHEN $14::INT IS NOT NULL THEN id = $14::INTELSE $8 != 'visual' AND is_default = TRUEENDLIMIT 1),camp AS (INSERT INTO campaigns (uuid, type, name, subject, from_email, body, altbody,- content_type, send_at, headers, tags, messenger, template_id, to_send,+ content_type, send_at, headers, attribs, tags, messenger, template_id, to_send,max_subscriber_id, archive, archive_slug, archive_template_id, archive_meta, body_source)SELECT $1, $2, $3, $4, $5,-- bodyCOALESCE(NULLIF($6, ''), (SELECT body FROM tpl), ''),$7,$8::content_type,- $9, $10, $11, $12,+ $9, $10, $11, $12, $13,(SELECT id FROM tpl),0,0,- $15, $16,+ $16, $17,-- archive_template_id- $17,$18,+ $19,-- body_source- COALESCE($20, (SELECT body_source FROM tpl))+ COALESCE($21, (SELECT body_source FROM tpl))RETURNING id),med AS (INSERT INTO campaign_media (campaign_id, media_id, filename)- (SELECT (SELECT id FROM camp), id, filename FROM media WHERE id=ANY($19::INT[]))+ (SELECT (SELECT id FROM camp), id, filename FROM media WHERE id=ANY($20::INT[]))),insLists AS (INSERT INTO campaign_lists (campaign_id, list_id, list_name)- SELECT (SELECT id FROM camp), id, name FROM lists WHERE id=ANY($14::INT[])+ SELECT (SELECT id FROM camp), id, name FROM lists WHERE id=ANY($15::INT[]))SELECT id FROM camp;@@ -371,33 +371,34 @@ WITH camp AS (END),headers=$9,- tags=$10::VARCHAR(100)[],- messenger=$11,+ attribs=$10,+ tags=$11::VARCHAR(100)[],+ messenger=$12,-- template_id shouldn't be saved for visual campaigns.- template_id=(CASE WHEN $7::content_type = 'visual' THEN NULL ELSE $12::INT END),- archive=$14,- archive_slug=$15,- archive_template_id=(CASE WHEN $7::content_type = 'visual' THEN NULL ELSE $16::INT END),- archive_meta=$17,- body_source=$19,+ template_id=(CASE WHEN $7::content_type = 'visual' THEN NULL ELSE $13::INT END),+ archive=$15,+ archive_slug=$16,+ archive_template_id=(CASE WHEN $7::content_type = 'visual' THEN NULL ELSE $17::INT END),+ archive_meta=$18,+ body_source=$20,updated_at=NOW()WHERE id = $1 RETURNING id),clists AS (-- Reset list relationships- DELETE FROM campaign_lists WHERE campaign_id = $1 AND NOT(list_id = ANY($13))+ DELETE FROM campaign_lists WHERE campaign_id = $1 AND NOT(list_id = ANY($14))),med AS (DELETE FROM campaign_media WHERE campaign_id = $1- AND ( media_id IS NULL or NOT(media_id = ANY($18))) RETURNING media_id+ AND ( media_id IS NULL or NOT(media_id = ANY($19))) RETURNING media_id),medi AS (INSERT INTO campaign_media (campaign_id, media_id, filename)- (SELECT $1 AS campaign_id, id, filename FROM media WHERE id=ANY($18::INT[]))+ (SELECT $1 AS campaign_id, id, filename FROM media WHERE id=ANY($19::INT[]))ON CONFLICT (campaign_id, media_id) DO NOTHING)INSERT INTO campaign_lists (campaign_id, list_id, list_name)- (SELECT $1 as campaign_id, id, name FROM lists WHERE id=ANY($13::INT[]))+ (SELECT $1 as campaign_id, id, name FROM lists WHERE id=ANY($14::INT[]))ON CONFLICT (campaign_id, list_id) DO UPDATE SET list_name = EXCLUDED.list_name;-- name: update-campaign-countsdiff --git a/schema.sql b/schema.sqlindex 80a0cd81..308161b4 100644--- a/schema.sql+++ b/schema.sql@@ -104,6 +104,7 @@ CREATE TABLE campaigns (content_type content_type NOT NULL DEFAULT 'richtext',send_at TIMESTAMP WITH TIME ZONE,headers JSONB NOT NULL DEFAULT '[]',+ attribs JSONB NOT NULL DEFAULT '{}',status campaign_status NOT NULL DEFAULT 'draft',tags VARCHAR(100)[],