diff --git a/backend/src/locales/de.json b/backend/src/locales/de.json deleted file mode 100644 index 8b34f61f4..000000000 --- a/backend/src/locales/de.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "emails": { - "accountActivation": { - "activateAccount": "Konto aktivieren", - "emailRegistered": "deine E-Mail-Adresse wurde soeben bei Gradido registriert.", - "pleaseClickLink": "Klicke bitte hier, um die Registrierung abzuschließen und dein Gradido-Konto zu aktivieren.", - "subject": "E-Mail Überprüfung", - "title": "E-Mail Überprüfung" - }, - "accountMultiRegistration": { - "contactSupport": "Support kontaktieren", - "emailExists": "Es existiert jedoch zu deiner E-Mail-Adresse schon ein Konto.", - "emailReused": "deine E-Mail-Adresse wurde soeben erneut benutzt, um bei Gradido ein Konto zu registrieren.", - "ifYouAreNotTheOne": "Wenn du nicht versucht hast dich erneut zu registrieren, wende dich bitte an unseren Support:", - "onForgottenPasswordClickLink": "Solltest du dein Passwort vergessen haben, klicke bitte hier.", - "subject": "Erneuter Registrierungsversuch mit deiner E-Mail", - "title": "Erneuter Registrierungsversuch mit deiner E-Mail" - }, - "addedContributionMessage": { - "commonGoodContributionMessage": "du hast zu deinem Gemeinwohl-Beitrag „{contributionMemo}“ eine Nachricht von {senderFirstName} {senderLastName} erhalten.", - "readMessage": "Nachricht lesen und beantworten", - "subject": "Nachricht zu deinem Gemeinwohl-Beitrag", - "title": "Nachricht zu deinem Gemeinwohl-Beitrag", - "message": "„{message}“", - "toSeeAndAnswerMessage": "Um auf die Nachricht zu antworten, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“." - }, - "contribution": { - "toSeeContributionsAndMessages": "Um deine Gemeinwohl-Beiträge und dazugehörige Nachrichten zu sehen, gehe in deinem Gradido-Konto ins Menü „Schöpfen“ auf den Tab „Meine Beiträge“." - }, - "contributionChangedByModerator": { - "subject": "Dein Gemeinwohl-Beitrag wurde geändert", - "text": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde soeben von {senderFirstName} {senderLastName} geändert und lautet jetzt „{contributionMemoUpdated}“", - "title": "Dein Gemeinwohl-Beitrag wurde geändert" - }, - "contributionConfirmed": { - "commonGoodContributionConfirmed": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde soeben von {senderFirstName} {senderLastName} bestätigt. Es wurden deinem Gradido-Konto {amountGDD} GDD gutgeschrieben.", - "subject": "Dein Gemeinwohl-Beitrag wurde bestätigt", - "title": "Dein Gemeinwohl-Beitrag wurde bestätigt" - }, - "contributionDeleted": { - "commonGoodContributionDeleted": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} gelöscht.", - "subject": "Dein Gemeinwohl-Beitrag wurde gelöscht", - "title": "Dein Gemeinwohl-Beitrag wurde gelöscht" - }, - "contributionDenied": { - "commonGoodContributionDenied": "dein Gemeinwohl-Beitrag „{contributionMemo}“ wurde von {senderFirstName} {senderLastName} abgelehnt.", - "subject": "Dein Gemeinwohl-Beitrag wurde abgelehnt", - "title": "Dein Gemeinwohl-Beitrag wurde abgelehnt" - }, - "footer": { - "contactOurSupport": "Bei weiteren Fragen kontaktiere bitte unseren Support.", - "imprint": "Impressum", - "imprintAddress": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland", - "imprintImageAlt": "Gradido-Akademie Logo", - "privacyPolicy": "Datenschutzerklärung", - "supportEmail": "support@gradido.net" - }, - "general": { - "amountGDD": "Betrag: {amountGDD} GDD", - "answerNow": "Jetzt antworten", - "completeRegistration": "Registrierung abschließen", - "contribution": "Gemeinwohl-Beitrag: {contributionMemo}", - "contributionDetails": "Beitragsdetails", - "detailsYouFindOnLinkToYourAccount": "Details zur Transaktion findest du in deinem Gradido-Konto.", - "helloName": "Hallo {firstName} {lastName},", - "linkValidity": "Der Link hat eine Gültigkeit von {hours} Stunden.\nSollte die Gültigkeit des Links bereits abgelaufen sein, kannst du dir hier einen neuen Link schicken lassen.", - "linkValidityWithMinutes": "Der Link hat eine Gültigkeit von {hours} Stunden und {minutes} Minuten.\nSollte die Gültigkeit des Links bereits abgelaufen sein, kannst du dir hier einen neuen Link schicken lassen.", - "message": "Nachricht", - "newLink": "Neuer Link", - "orCopyLink": "Oder kopiere den Link in dein Browserfenster.", - "pleaseDoNotReply": "Bitte antworte nicht auf diese E-Mail.", - "requestNewLink": "Neuen gültigen Link anfordern", - "reset": "zurücksetzen", - "sincerelyYours": "Liebe Grüße", - "toAccount": "Zum Konto", - "transactionDetails": "Transaktionsdetails", - "yourGradidoTeam": "dein Gradido-Team" - }, - "resetPassword": { - "pleaseClickLink": "Wenn du es warst, klicke bitte hier.", - "subject": "Passwort zurücksetzen", - "title": "Passwort zurücksetzen", - "youOrSomeoneResetPassword": "du oder jemand anderes, hast für dieses Konto ein Zurücksetzen des Passworts angefordert." - }, - "transactionLinkRedeemed": { - "hasRedeemedYourLink": "{senderFirstName} {senderLastName} ({senderEmail}) hat soeben deinen Link eingelöst.", - "memo": "Nachricht: {transactionMemo}", - "subject": "{senderFirstName} {senderLastName} hat deinen Gradido-Link eingelöst", - "title": "{senderFirstName} {senderLastName} hat deinen Gradido-Link eingelöst" - }, - "transactionReceived": { - "haveReceivedAmountGDDFrom": "du hast soeben {transactionAmount} GDD erhalten von {senderFirstName} {senderLastName}", - "subject": "{senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet", - "replySubject": "Re: {senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet", - "title": "{senderFirstName} {senderLastName} hat dir {transactionAmount} Gradido gesendet" - } - }, - "general": { - "decimalSeparator": "," - } -} diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json deleted file mode 100644 index fb90a0334..000000000 --- a/backend/src/locales/en.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "emails": { - "accountActivation": { - "activateAccount": "Activate account", - "emailRegistered": "Your email address has just been registered with Gradido.", - "pleaseClickLink": "Please click here to complete the registration and activate your Gradido account.", - "subject": "Email Verification", - "title": "Email Verification" - }, - "accountMultiRegistration": { - "contactSupport": "Contact support", - "emailExists": "However, an account already exists for your email address.", - "emailReused": "Your email address has just been used again to register an account with Gradido.", - "ifYouAreNotTheOne": "If you did not try to register again, please contact our support:", - "onForgottenPasswordClickLink": "If you have forgotten your password, please click here.", - "subject": "Try To Register Again With Your Email", - "title": "Try To Register Again With Your Email" - }, - "addedContributionMessage": { - "commonGoodContributionMessage": "You have received a message from {senderFirstName} {senderLastName} regarding your common good contribution “{contributionMemo}”.", - "readMessage": "Read and reply to message", - "subject": "Message about your common good contribution", - "title": "Message about your common good contribution", - "message": "„{message}“", - "toSeeAndAnswerMessage": "To reply to the message, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab." - }, - "contribution": { - "toSeeContributionsAndMessages": "To see your common good contributions and related messages, go to the “Creation” menu in your Gradido account and click on the “My contributions” tab." - }, - "contributionChangedByModerator": { - "subject": "Your common good contribution has been changed", - "text": "your common good contribution '{contributionMemo}' has just been changed by {senderFirstName} {senderLastName} and now reads as '{contributionMemoUpdated}'", - "title": "Your common good contribution has been changed" - }, - "contributionConfirmed": { - "commonGoodContributionConfirmed": "Your common good contribution “{contributionMemo}” has just been approved by {senderFirstName} {senderLastName}. Your Gradido account has been credited with {amountGDD} GDD.", - "subject": "Your contribution to the common good was confirmed", - "title": "Your contribution to the common good was confirmed" - }, - "contributionDeleted": { - "commonGoodContributionDeleted": "Your common good contribution “{contributionMemo}” was deleted by {senderFirstName} {senderLastName}.", - "subject": "Your common good contribution was deleted", - "title": "Your common good contribution was deleted" - }, - "contributionDenied": { - "commonGoodContributionDenied": "Your common good contribution “{contributionMemo}” was rejected by {senderFirstName} {senderLastName}.", - "subject": "Your common good contribution was rejected", - "title": "Your common good contribution was rejected" - }, - "footer": { - "contactOurSupport": "If you have any further questions, please contact our support.", - "imprint": "Impressum", - "imprintAddress": "Gradido-Akademie\nInstitut für Wirtschaftsbionik\nPfarrweg 2\n74653 Künzelsau\nDeutschland", - "imprintImageAlt": "Gradido-Akademie Logo", - "privacyPolicy": "Privacy Policy", - "supportEmail": "support@gradido.net" - }, - "general": { - "amountGDD": "Amount: {amountGDD} GDD", - "answerNow": "Reply", - "completeRegistration": "Complete registration", - "contribution": "Contribution: : {contributionMemo}", - "contributionDetails": "Contribution details", - "detailsYouFindOnLinkToYourAccount": "You can find transaction details in your Gradido account.", - "helloName": "Hello {firstName} {lastName},", - "linkValidity": "The link has a validity of {hours} hours.\nIf the validity of the link has already expired, you can have a new link sent to you here.", - "linkValidityWithMinutes": "The link has a validity of {hours} hours and {minutes} minutes.\nIf the validity of the link has already expired, you can have a new link sent to you here.", - "message": "Message", - "newLink": "New link", - "orCopyLink": "Or copy the link into your browser window.", - "pleaseDoNotReply": "Please do not reply to this email.", - "requestNewLink": "Request new valid link", - "reset": "reset", - "sincerelyYours": "Kind regards,", - "toAccount": "To account", - "transactionDetails": "Transaction details", - "yourGradidoTeam": "your Gradido team" - }, - "resetPassword": { - "pleaseClickLink": "If it was you, please click here.", - "subject": "Reset password", - "title": "Reset password", - "youOrSomeoneResetPassword": "You, or someone else, requested a password reset for this account." - }, - "transactionLinkRedeemed": { - "hasRedeemedYourLink": "{senderFirstName} {senderLastName} ({senderEmail}) has just redeemed your link.", - "memo": "Message: {transactionMemo}", - "subject": "{senderFirstName} {senderLastName} has redeemed your Gradido link", - "title": "{senderFirstName} {senderLastName} has redeemed your Gradido link" - }, - "transactionReceived": { - "haveReceivedAmountGDDFrom": "You have just received {transactionAmount} GDD from {senderFirstName} {senderLastName}", - "replySubject": "RE: {senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido", - "subject": "{senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido", - "title": "{senderFirstName} {senderLastName} has sent you {transactionAmount} Gradido" - } - }, - "general": { - "decimalSeparator": "." - } -} diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts index 5f3bb02ef..eaa2ea5b4 100644 --- a/backend/src/server/createServer.ts +++ b/backend/src/server/createServer.ts @@ -1,4 +1,5 @@ import { CONFIG } from '@/config' +import { CONFIG as CORE_CONFIG } from 'core' import { schema } from '@/graphql/schema' import { elopageWebhook } from '@/webhook/elopage' import { gmsWebhook } from '@/webhook/gms' @@ -28,7 +29,6 @@ interface ServerDef { export const createServer = async ( apolloLogger: Logger, context: any = serverContext, - localization: i18n.I18n = i18n, ): Promise => { const logger = getLogger(`${LOG4JS_BASE_CATEGORY_NAME}.server.createServer`) logger.debug('createServer...') @@ -73,9 +73,9 @@ export const createServer = async ( app.use(json()) // bodyparser urlencoded for elopage app.use(urlencoded({ extended: true })) - + // i18n - app.use(localization.init) + app.use(i18n.init) // Elopage Webhook @@ -100,7 +100,7 @@ export const createServer = async ( }) apollo.applyMiddleware({ app, path: '/' }) logger.info( - `running with PRODUCTION=${CONFIG.PRODUCTION}, sending EMAIL enabled=${CONFIG.EMAIL} and EMAIL_TEST_MODUS=${CONFIG.EMAIL_TEST_MODUS} ...`, + `running with PRODUCTION=${CONFIG.PRODUCTION}, sending EMAIL enabled=${CORE_CONFIG.EMAIL} and EMAIL_TEST_MODUS=${CORE_CONFIG.EMAIL_TEST_MODUS} ...`, ) logger.debug('createServer...successful') diff --git a/backend/src/server/localization.ts b/backend/src/server/localization.ts index 1e587104a..16f9d54b6 100644 --- a/backend/src/server/localization.ts +++ b/backend/src/server/localization.ts @@ -1,4 +1,3 @@ -import path from 'node:path' import { LOG4JS_BASE_CATEGORY_NAME } from '@/config/const' import i18n from 'i18n' import { getLogger } from 'log4js' @@ -9,7 +8,7 @@ i18n.configure({ locales: ['en', 'de'], defaultLocale: 'en', retryInDefaultLocale: false, - directory: path.join(__dirname, '..', 'locales'), + staticCatalog: {'en': {}, 'de': {}}, // autoReload: true, // if this is activated the seeding hangs at the very end updateFiles: false, objectNotation: true,