Skip to content

Commit

Permalink
Merge pull request #21 from beabee-communityrm/v0.16.x
Browse files Browse the repository at this point in the history
Merge v0.16.x changes
  • Loading branch information
wpf500 authored Jul 23, 2024
2 parents 87e6ac9 + d591d08 commit f9f640c
Show file tree
Hide file tree
Showing 10 changed files with 96 additions and 41 deletions.
36 changes: 24 additions & 12 deletions apps/frontend/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -236,16 +236,13 @@
"advancedSearch": {
"addRule": "Filter hinzufügen",
"button": "Filter",
"createFilters": "Filter für die Suche erstellen",
"createFiltersAfter": "Regeln",
"createFiltersBefore": "Nur Ergebnisse anzeigen, die mit",
"createdSegment": "Erstelltes Segment \"{segment}\"",
"matchAfter": "der folgenden Filter enthalten",
"matchBefore": "Ergebnisse sollen",
"matchType": {
"AND": "alle",
"OR": "mindestens einen"
"createFiltersAfter": "Regeln entsprechen",
"createFiltersBefore": "Nur Ergebnisse anzeigen, die",
"createFiltersType": {
"all": "allen",
"any": "einer dieser"
},
"createdSegment": "Erstelltes Segment \"{segment}\"",
"matchWord": {
"AND": "und",
"OR": "oder"
Expand Down Expand Up @@ -435,11 +432,14 @@
"bucket": "Ordner",
"callout": "Callout",
"contact": "Kontakt",
"createdAt": "Beantwortet am",
"createdAt": "Teilgenommen am",
"tags": "Tags",
"updatedAt": "Geändert am"
},
"dataGroup": {}
"dataGroup": {
"answers": "Antworten",
"response": "Informationen"
}
},
"calloutResponseBuckets": {
"inbox": "Eingang",
Expand Down Expand Up @@ -578,6 +578,14 @@
"until": "bis",
"yes": "Ja"
},
"contactAccount": {
"confirmDelete": {
"text": "Dadurch werden alle mit der Email-Adresse {email} verbundenen Daten gelöscht. Aktive Mitgliedschaften werden dadurch beendet.",
"title": "Kontakt löschen",
"warning": "Dieser Schritt kann nicht rückgängig gemacht werden. Sicher, dass du fortfahren möchtest?"
},
"contactDeleted": "Kontakt gelöscht."
},
"contactContribution": {
"confirmCancel": {
"confirm": "Ja, Mitgliedschaft kündigen",
Expand Down Expand Up @@ -619,7 +627,10 @@
},
"contacts": {
"addContact": "Kontakt hinzufügen",
"advancedSearch": {},
"advancedSearch": {
"hasAnswered": "Hat teilgenommen?",
"selectCallout": "Callout auswählen..."
},
"allContacts": "Alle Kontakte",
"data": {
"activeMembership": "Aktive Mitgliedschaft",
Expand Down Expand Up @@ -656,6 +667,7 @@
},
"dataGroup": {
"callout": "Callout",
"contact": "Kontaktdaten",
"contribution": "Beitrag",
"role": "Rolle"
},
Expand Down
5 changes: 4 additions & 1 deletion apps/frontend/locales/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
}
},
"advancedSearch": {
"matchType": {},
"createFiltersType": {},
"matchWord": {},
"operators": {
"all": {},
Expand Down Expand Up @@ -157,6 +157,9 @@
"timeAgo": "vor",
"timeIn": "in"
},
"contactAccount": {
"confirmDelete": {}
},
"contactContribution": {
"confirmCancel": {},
"updateNotice": {}
Expand Down
34 changes: 24 additions & 10 deletions apps/frontend/locales/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,13 @@
"advancedSearch": {
"addRule": "Filter hinzufügen",
"button": "Filter",
"createFilters": "Filter für die Suche erstellen",
"createdSegment": "Erstelltes Segment \"{segment}\"",
"matchAfter": "der folgenden Filter enthalten",
"matchBefore": "Ergebnisse sollen",
"matchType": {
"AND": "alle",
"OR": "mindestens einen"
"createFiltersAfter": "Regeln entsprechen",
"createFiltersBefore": "Nur Ergebnisse anzeigen, die",
"createFiltersType": {
"all": "allen",
"any": "einer dieser"
},
"createdSegment": "Erstelltes Segment \"{segment}\"",
"matchWord": {
"AND": "und",
"OR": "oder"
Expand Down Expand Up @@ -433,11 +432,14 @@
"bucket": "Ordner",
"callout": "Callout",
"contact": "Kontakt",
"createdAt": "Beantwortet am",
"createdAt": "Teilgenommen am",
"tags": "Tags",
"updatedAt": "Geändert am"
},
"dataGroup": {}
"dataGroup": {
"answers": "Antworten",
"response": "Informationen"
}
},
"calloutResponseBuckets": {
"inbox": "Eingang",
Expand Down Expand Up @@ -576,6 +578,14 @@
"until": "bis",
"yes": "Ja"
},
"contactAccount": {
"confirmDelete": {
"text": "Dadurch werden alle mit der Email-Adresse {email} verbundenen Daten gelöscht. Aktive Mitgliedschaften werden dadurch beendet.",
"title": "Kontakt löschen",
"warning": "Dieser Schritt kann nicht rückgängig gemacht werden. Sicher, dass du fortfahren möchtest?"
},
"contactDeleted": "Kontakt gelöscht."
},
"contactContribution": {
"confirmCancel": {
"confirm": "Ja, Mitgliedschaft kündigen",
Expand Down Expand Up @@ -617,7 +627,10 @@
},
"contacts": {
"addContact": "Kontakt hinzufügen",
"advancedSearch": {},
"advancedSearch": {
"hasAnswered": "Hat teilgenommen?",
"selectCallout": "Callout auswählen..."
},
"allContacts": "Alle Kontakte",
"data": {
"activeMembership": "Aktive Mitgliedschaft",
Expand Down Expand Up @@ -654,6 +667,7 @@
},
"dataGroup": {
"callout": "Callout",
"contact": "Kontaktdaten",
"contribution": "Beitrag",
"role": "Rolle"
},
Expand Down
19 changes: 12 additions & 7 deletions apps/frontend/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -236,16 +236,13 @@
"advancedSearch": {
"addRule": "Add rule",
"button": "Filters",
"createFilters": "Create filters for your search",
"createFiltersAfter": "rules",
"createFiltersBefore": "Only show results matching",
"createdSegment": "Created segment \"{segment}\"",
"matchAfter": "of the following",
"matchBefore": "Match",
"matchType": {
"AND": "all",
"OR": "any"
"createFiltersType": {
"all": "all",
"any": "any"
},
"createdSegment": "Created segment \"{segment}\"",
"matchWord": {
"AND": "and",
"OR": "or"
Expand Down Expand Up @@ -585,6 +582,14 @@
"until": "until",
"yes": "Yes"
},
"contactAccount": {
"confirmDelete": {
"text": "This will delete all data associated with {email}. If they have an active contribution this will be cancelled.",
"title": "Delete contact",
"warning": "This is irreversible. Are you sure you want to proceed?"
},
"contactDeleted": "Contact deleted."
},
"contactContribution": {
"confirmCancel": {
"confirm": "Yes, cancel it",
Expand Down
11 changes: 9 additions & 2 deletions apps/frontend/locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
}
},
"advancedSearch": {
"matchType": {},
"createFiltersType": {},
"matchWord": {},
"operators": {
"all": {},
Expand Down Expand Up @@ -197,6 +197,9 @@
"until": "fino",
"yes": ""
},
"contactAccount": {
"confirmDelete": {}
},
"contactContribution": {
"confirmCancel": {
"confirm": "Sì, sono sicuro",
Expand All @@ -212,8 +215,12 @@
}
},
"contacts": {
"advancedSearch": {},
"data": {},
"dataGroup": {}
"dataGroup": {
"callout": "Callout",
"contact": "Informazioni di contatto"
}
},
"contribution": {
"cancelContribution": "Cancella il tuo contributo",
Expand Down
9 changes: 5 additions & 4 deletions apps/frontend/locales/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
}
},
"advancedSearch": {
"matchType": {},
"createFiltersType": {},
"matchWord": {},
"operators": {
"all": {},
Expand Down Expand Up @@ -162,6 +162,9 @@
"timeAgo": "{time} geleden",
"timeIn": "in {time}"
},
"contactAccount": {
"confirmDelete": {}
},
"contactContribution": {
"confirmCancel": {},
"updateNotice": {}
Expand All @@ -177,9 +180,7 @@
"contacts": {
"advancedSearch": {},
"data": {},
"dataGroup": {
"callout": "Chamada"
}
"dataGroup": {}
},
"contribution": {
"paymentHistory": {}
Expand Down
6 changes: 5 additions & 1 deletion apps/frontend/locales/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
}
},
"advancedSearch": {
"matchType": {},
"createFiltersType": {},
"matchWord": {},
"operators": {
"all": {},
Expand Down Expand Up @@ -369,6 +369,9 @@
"until": "até",
"yes": "Sim"
},
"contactAccount": {
"confirmDelete": {}
},
"contactContribution": {
"confirmCancel": {},
"updateNotice": {}
Expand Down Expand Up @@ -420,6 +423,7 @@
},
"dataGroup": {
"callout": "Опрос",
"contact": "Контакты",
"contribution": "Contribuição",
"role": "Cargo"
},
Expand Down
10 changes: 8 additions & 2 deletions apps/frontend/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
}
},
"advancedSearch": {
"matchType": {},
"createFiltersType": {},
"matchWord": {},
"operators": {
"all": {},
Expand Down Expand Up @@ -340,6 +340,9 @@
"until": "до",
"yes": "Да"
},
"contactAccount": {
"confirmDelete": {}
},
"contactContribution": {
"confirmCancel": {},
"updateNotice": {}
Expand Down Expand Up @@ -386,7 +389,10 @@
"preferredChannel": "Предпочтительный канал",
"tags": "Теги"
},
"dataGroup": {}
"dataGroup": {
"callout": "Chamada",
"contact": "Informação de contacto"
}
},
"contribution": {
"adminCancelDescription": "Если вы отмените взнос этого контакта, он будет считаться членом клуба до завершения подписки {date}.",
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/components/search/AppSearchForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<AppSelect
v-model="ruleGroup.condition"
:items="[
{ id: 'AND', label: t('advancedSearch.matchType.AND') },
{ id: 'OR', label: t('advancedSearch.matchType.OR') },
{ id: 'AND', label: t('advancedSearch.createFiltersType.all') },
{ id: 'OR', label: t('advancedSearch.createFiltersType.any') },
]"
required
/>
Expand Down
3 changes: 3 additions & 0 deletions apps/frontend/src/pages/admin/callouts/new.vue
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ async function handlePreview() {
}
async function reset() {
// Clear any existing steps data to force form reset
steps.value = undefined;
const callout = props.id
? await fetchCallout(props.id, ['form', 'responseViewSchema', 'variants'])
: undefined;
Expand Down

0 comments on commit f9f640c

Please sign in to comment.