diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 76da78f72..618720040 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -86,8 +86,7 @@ "short_hash": "({shortHash})" }, "form": { - "cancel": "Abbrechen", - "submit": "Senden" + "cancel": "Abbrechen" }, "help": { "help": "Hilfe", @@ -111,7 +110,6 @@ "request": "Die Anfrage wurde gesendet." }, "moderator": { - "chat": "Chat", "history": "Die Daten wurden geƤndert. Dies sind die alten Daten.", "show-submission-form": "warten auf Erinnerung?", "moderator": "Moderator", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index d771dd54c..7f4acfbac 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -86,8 +86,7 @@ "short_hash": "({shortHash})" }, "form": { - "cancel": "Cancel", - "submit": "Send" + "cancel": "Cancel" }, "help": { "help": "Help", @@ -111,7 +110,6 @@ "request": "Request has been sent." }, "moderator": { - "chat": "Chat", "history": "The data has been changed. This is the old data.", "show-submission-form": "wait for reminder?", "moderator": "Moderator", diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts index 452ed67e8..4803cea09 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/restrict-template-expressions */ import { EntityManager, FindOptionsRelations, getConnection } from '@dbTools/typeorm' -import { Contribution, Contribution as DbContribution } from '@entity/Contribution' +import { Contribution as DbContribution } from '@entity/Contribution' import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage' import { User as DbUser } from '@entity/User' import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql' diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts index 53935ef06..ab3435ef8 100644 --- a/backend/src/graphql/resolver/util/findContributions.ts +++ b/backend/src/graphql/resolver/util/findContributions.ts @@ -1,7 +1,14 @@ /* eslint-disable security/detect-object-injection */ -import { Brackets, In, IsNull, LessThanOrEqual, Like, Not, SelectQueryBuilder } from '@dbTools/typeorm' +import { + Brackets, + In, + IsNull, + LessThanOrEqual, + Like, + Not, + SelectQueryBuilder, +} from '@dbTools/typeorm' import { Contribution as DbContribution } from '@entity/Contribution' -import { ContributionMessage } from '@entity/ContributionMessage' import { Paginated } from '@arg/Paginated' import { SearchContributionsFilterArgs } from '@arg/SearchContributionsFilterArgs'