IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove i18n, change state to status.

Browse Source
This commit is contained in:
elweyn 2023-01-25 16:40:32 +01:00
parent 9e7da0f451
commit 8b3423b91b
3 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
backend/src/graphql/resolver/ContributionResolver.ts
View File

@ -180,38 +180,27 @@ export class ContributionResolver {
async listAllContributions( async listAllContributions(
@Args() @Args()
{ currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated, { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
@Arg('filterState', () => [ContributionStatus], { nullable: true }) @Arg('statusFilter', () => [ContributionStatus], { nullable: true })
filterStates: ContributionStatus[] | null, statusFilters: ContributionStatus[] | null,
@Ctx() context: Context,
): Promise<ContributionListResult> { ): Promise<ContributionListResult> {
const where: { const where: {
contributionStatus?: FindOperator<string> | null contributionStatus?: FindOperator<string> | null
} = {} } = {}
const typeStatus = Object.values(ContributionStatus) const typeStatus = Object.values(ContributionStatus)
const user = getUser(context) if (statusFilters !== null) {
i18n.setLocale(user.language) const statusFilterArray = []
if (filterStates !== null) { const length = statusFilters.length
const filterStateArray = []
const length = filterStates.length
let i = 0 let i = 0
for (i; i < length; i++) { for (i; i < length; i++) {
const filterState = filterStates[i] const statusFilter = statusFilters[i]
if (!typeStatus.includes(filterState)) { if (!typeStatus.includes(statusFilter)) {
logger.error( logger.error(`Nicht definierter Status wurde gesendet: ${statusFilters[i]}`)
`${i18n.__('error.contributions.wrongFilterState', { throw new Error(`Nicht definierter Status wurde gesendet: ${statusFilters[i]}`)
contributionState: filterStates[i],
})}`,
)
throw new Error(
`${i18n.__('error.contributions.wrongFilterState', {
contributionState: filterStates[i],
})}`,
)
} }
filterStateArray.push(filterState) statusFilterArray.push(statusFilter)
} }
if (filterStateArray.length > 0) { if (statusFilterArray.length > 0) {
where.contributionStatus = In(filterStateArray) where.contributionStatus = In(statusFilterArray)
} }
} }

5
backend/src/locales/de.json
View File

@ -55,11 +55,6 @@
"subject": "Gradido: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet" "subject": "Gradido: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet"
} }
}, },
"error": {
"contributions": {
"wrongFilterState": "Nicht definierter Status wurde gesendet: {contributionState}"
}
},
"general": { "general": {
"decimalSeparator": ",", "decimalSeparator": ",",
"imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland", "imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland",

5
backend/src/locales/en.json
View File

@ -56,11 +56,6 @@
"subject": "Gradido: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido" "subject": "Gradido: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido"
} }
}, },
"error": {
"contributions": {
"wrongFilterState": "Send a state that isn't defined: {contributionState}"
}
},
"general": { "general": {
"decimalSeparator": ".", "decimalSeparator": ".",
"imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland", "imprint": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland",