Skip to content

Commit

Permalink
Fix for #873
Browse files Browse the repository at this point in the history
  • Loading branch information
@bures
bures committed May 27, 2021
1 parent 0fbeed4 commit 9450e77
Show file tree
Hide file tree
Showing 8 changed files with 313 additions and 269 deletions.
24 changes: 21 additions & 3 deletions client/src/send-configurations/helpers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,27 @@ export function getMailerTypes(t) {
];

const sesRegionOptions = [
{ key: 'us-east-1', label: t('useast1')},
{ key: 'us-west-2', label: t('uswest2')},
{ key: 'eu-west-1', label: t('euwest1')}
{ key: 'us-east-2', label: t('usEastOhio')},
{ key: 'us-east-1', label: t('usEastNVirginia')},
{ key: 'us-west-1', label: t('usWestNCalifornia')},
{ key: 'us-west-2', label: t('usWestOregon')},
{ key: 'af-south-1', label: t('africaCapeTown')},
{ key: 'ap-east-1', label: t('asiaPacificHongKong')},
{ key: 'ap-south-1', label: t('asiaPacificMumbai')},
{ key: 'ap-northeast-3', label: t('asiaPacificOsaka')},
{ key: 'ap-northeast-2', label: t('asiaPacificSeoul')},
{ key: 'ap-southeast-1', label: t('asiaPacificSingapore')},
{ key: 'ap-southeast-2', label: t('asiaPacificSydney')},
{ key: 'ap-northeast-1', label: t('asiaPacificTokyo')},
{ key: 'ca-central-1', label: t('canadaCentral')},
{ key: 'eu-central-1', label: t('europeFrankfurt')},
{ key: 'eu-west-1', label: t('europeIreland')},
{ key: 'eu-west-2', label: t('europeLondon')},
{ key: 'eu-south-1', label: t('europeMilan')},
{ key: 'eu-west-3', label: t('europeParis')},
{ key: 'eu-north-1', label: t('europeStockholm')},
{ key: 'me-south-1', label: t('middleEastBahrain')},
{ key: 'sa-east-1', label: t('southAmericaSaoPaulo')}
];

const zoneMtaTypeOptions = [];
Expand Down
6 changes: 3 additions & 3 deletions client/src/templates/helpers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ export function getEditForm(owner, typeKey, prefix = '') {
{tg('LINK_PUBLIC_SUBSCRIBE')}
</th>
<td>
<Trans>URL that points to the subscribe page of the first list in the campaign that allows public subscriptions</Trans>
<Trans i18nKey="urlThatPointsToTheSubscribePageOfThe">URL that points to the subscribe page of the first list in the campaign that allows public subscriptions</Trans>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -774,15 +774,15 @@ export function getEditForm(owner, typeKey, prefix = '') {
{tg('LIST_ID_<index>')}
</th>
<td>
<Trans>Unique ID that identifies the list. The <code>index</code> is 0-based index of the list in the campaign. <code>LIST_ID_0</code> thus means the first list in the campaign.</Trans>
<Trans i18nKey="uniqueIdThatIdentifiesTheListTheIndexIs0">Unique ID that identifies the list. The <code>index</code> is 0-based index of the list in the campaign. <code>LIST_ID_0</code> thus means the first list in the campaign.</Trans>
</td>
</tr>
<tr>
<th scope="row">
{tg('PUBLIC_LIST_ID_<index>')}
</th>
<td>
<Trans>The same as above, but only taking into account the lists for which public subscribe is enabled. <code>PUBLIC_LIST_ID_0</code> thus means the first public list in the campaign.</Trans>
<Trans i18nKey="theSameAsAboveButOnlyTakingIntoAccount">The same as above, but only taking into account the lists for which public subscribe is enabled. <code>PUBLIC_LIST_ID_0</code> thus means the first public list in the campaign.</Trans>
</td>
</tr>
<tr>
Expand Down
103 changes: 48 additions & 55 deletions locales/de-DE/common.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1001,9 +1001,48 @@
"doNotUseEncryption": "Keine Verschlüsselung benutzen",
"useTls –UsuallySelectedForPort465": "TLS benutzen – normalerweise für Port 465",
"useStarttls –UsuallySelectedForPort587": "STARTTLS benutzen – normalerweise für Port 587 und 25 (empfohlen)",
"useast1": "US-EAST-1",
"uswest2": "US-WEST-2",
"euwest1": "EU-WEST-1",
"usEastOhio": "US East (Ohio)",
"usEastOhio - TODO: update line above and then delete this line to mark that the translation has been fixed": "US East (Ohio)",
"usEastNVirginia": "US East (N. Virginia)",
"usEastNVirginia - TODO: update line above and then delete this line to mark that the translation has been fixed": "US East (N. Virginia)",
"usWestNCalifornia": "US West (N. California)",
"usWestNCalifornia - TODO: update line above and then delete this line to mark that the translation has been fixed": "US West (N. California)",
"usWestOregon": "US West (Oregon)",
"usWestOregon - TODO: update line above and then delete this line to mark that the translation has been fixed": "US West (Oregon)",
"africaCapeTown": "Africa (Cape Town)",
"africaCapeTown - TODO: update line above and then delete this line to mark that the translation has been fixed": "Africa (Cape Town)",
"asiaPacificHongKong": "Asia Pacific (Hong Kong)",
"asiaPacificHongKong - TODO: update line above and then delete this line to mark that the translation has been fixed": "Asia Pacific (Hong Kong)",
"asiaPacificMumbai": "Asia Pacific (Mumbai)",
"asiaPacificMumbai - TODO: update line above and then delete this line to mark that the translation has been fixed": "Asia Pacific (Mumbai)",
"asiaPacificOsaka": "Asia Pacific (Osaka)",
"asiaPacificOsaka - TODO: update line above and then delete this line to mark that the translation has been fixed": "Asia Pacific (Osaka)",
"asiaPacificSeoul": "Asia Pacific (Seoul)",
"asiaPacificSeoul - TODO: update line above and then delete this line to mark that the translation has been fixed": "Asia Pacific (Seoul)",
"asiaPacificSingapore": "Asia Pacific (Singapore)",
"asiaPacificSingapore - TODO: update line above and then delete this line to mark that the translation has been fixed": "Asia Pacific (Singapore)",
"asiaPacificSydney": "Asia Pacific (Sydney)",
"asiaPacificSydney - TODO: update line above and then delete this line to mark that the translation has been fixed": "Asia Pacific (Sydney)",
"asiaPacificTokyo": "Asia Pacific (Tokyo)",
"asiaPacificTokyo - TODO: update line above and then delete this line to mark that the translation has been fixed": "Asia Pacific (Tokyo)",
"canadaCentral": "Canada (Central)",
"canadaCentral - TODO: update line above and then delete this line to mark that the translation has been fixed": "Canada (Central)",
"europeFrankfurt": "Europe (Frankfurt)",
"europeFrankfurt - TODO: update line above and then delete this line to mark that the translation has been fixed": "Europe (Frankfurt)",
"europeIreland": "Europe (Ireland)",
"europeIreland - TODO: update line above and then delete this line to mark that the translation has been fixed": "Europe (Ireland)",
"europeLondon": "Europe (London)",
"europeLondon - TODO: update line above and then delete this line to mark that the translation has been fixed": "Europe (London)",
"europeMilan": "Europe (Milan)",
"europeMilan - TODO: update line above and then delete this line to mark that the translation has been fixed": "Europe (Milan)",
"europeParis": "Europe (Paris)",
"europeParis - TODO: update line above and then delete this line to mark that the translation has been fixed": "Europe (Paris)",
"europeStockholm": "Europe (Stockholm)",
"europeStockholm - TODO: update line above and then delete this line to mark that the translation has been fixed": "Europe (Stockholm)",
"middleEastBahrain": "Middle East (Bahrain)",
"middleEastBahrain - TODO: update line above and then delete this line to mark that the translation has been fixed": "Middle East (Bahrain)",
"southAmericaSaoPaulo": "South America (São Paulo)",
"southAmericaSaoPaulo - TODO: update line above and then delete this line to mark that the translation has been fixed": "South America (São Paulo)",
"builtinZoneMta": "Eingebauter ZoneMTA",
"dynamicConfigurationOfDkimKeysViaZoneMt": "Dynamische Konfiguration von DKIM-Schlüsseln mittels des Mailtrain-Plugins für ZoneMTA",
"dynamicConfigurationOfDkimKeysViaZoneMt-1": "Dynamische Konfiguration von DKIM-Schlüsseln mittels des HTTP-Konfigurations-Plugins für ZoneMTA",
Expand Down Expand Up @@ -1137,11 +1176,17 @@
"mergeTagsAreTagsThatAreReplacedBefore-1 - TODO: update line above and then delete this line to mark that the translation has been fixed": "\n <1>Merge tags are tags that are replaced before sending out the message. The format of the merge tag is the following: <1>{tg('TAG_NAME')}</1>. </1>\n ",
"theWholeMessageIsInterpretedAsHandlebars": "\n <1>The whole message is interpreted as Handlebars template (see <1>http://handlebarsjs.com/</1>). You can use any Handlebars blocks and expressions\n in the template. The merge tags form the root context of the Handlebars template.</1>\n ",
"theWholeMessageIsInterpretedAsHandlebars - TODO: update line above and then delete this line to mark that the translation has been fixed": "\n <1>The whole message is interpreted as Handlebars template (see <1>http://handlebarsjs.com/</1>). You can use any Handlebars blocks and expressions\n in the template. The merge tags form the root context of the Handlebars template.</1>\n ",
"urlThatPointsToTheSubscribePageOfThe": "URL that points to the subscribe page of the first list in the campaign that allows public subscriptions",
"urlThatPointsToTheSubscribePageOfThe - TODO: update line above and then delete this line to mark that the translation has been fixed": "URL that points to the subscribe page of the first list in the campaign that allows public subscriptions",
"urlThatPointsToTheUnsubscribePage": "URL der Abmeldeseite",
"urlThatPointsToThePreferencesPageOfThe": "URL für die Einstellungen des Abonnenten",
"urlToPreviewTheMessageInABrowser": "URL für den Nachrichtenvorschau im Browser",
"uniqueIdThatIdentifiesTheRecipient": "Eindeutige ID des Empfängers",
"uniqueIdThatIdentifiesTheListUsedForThis": "Eindeutige ID der für diese Kampagne verwendeten Liste",
"uniqueIdThatIdentifiesTheListTheIndexIs0": "Unique ID that identifies the list. The <1>index</1> is 0-based index of the list in the campaign. <3>LIST_ID_0</3> thus means the first list in the campaign.",
"uniqueIdThatIdentifiesTheListTheIndexIs0 - TODO: update line above and then delete this line to mark that the translation has been fixed": "Unique ID that identifies the list. The <1>index</1> is 0-based index of the list in the campaign. <3>LIST_ID_0</3> thus means the first list in the campaign.",
"theSameAsAboveButOnlyTakingIntoAccount": "The same as above, but only taking into account the lists for which public subscribe is enabled. <1>PUBLIC_LIST_ID_0</1> thus means the first public list in the campaign.",
"theSameAsAboveButOnlyTakingIntoAccount - TODO: update line above and then delete this line to mark that the translation has been fixed": "The same as above, but only taking into account the lists for which public subscribe is enabled. <1>PUBLIC_LIST_ID_0</1> thus means the first public list in the campaign.",
"uniqueIdThatIdentifiesCurrentCampaign": "Eindeutige ID dieser Kampagne",
"forRssCampaignsTheFollowingFurtherTags": "\n<1>Für RSS-Kampagnen stehen folgende Variablennamen zusätzlich zur Verfügung:</1>\n",
"rssEntryTitle": "Titel des RSS-Eintrags",
Expand Down Expand Up @@ -1206,46 +1251,6 @@
"foundAddedMessagesNewCampaignMessages": "{{addedMessages}} neue Kampagnennachrichten gefunden, via RSS-Feed von {{campaignId}}",
"foundNothingNewFromTheFeed": "Keine Neuigkeiten in diesem RSS-Feed",
"missingEmail": "Fehlende E-Mail-Adresse",
"emailAddressAlreadyRegistered": "Email address already registered",
"emailAddressAlreadyRegistered - TODO: update line above and then delete this line to mark that the translation has been fixed": "Email address already registered",
"weHaveReceivedASubscriptionRequestYour": "We have received a subscription request. Your email address is however already registered.",
"weHaveReceivedASubscriptionRequestYour - TODO: update line above and then delete this line to mark that the translation has been fixed": "We have received a subscription request. Your email address is however already registered.",
"ifYouReceivedThisEmailByMistakeSimply": "If you received this email by mistake, simply delete it. Your existing subscription won't be affected.",
"ifYouReceivedThisEmailByMistakeSimply - TODO: update line above and then delete this line to mark that the translation has been fixed": "If you received this email by mistake, simply delete it. Your existing subscription won't be affected.",
"ifYouWantToModifyYourSubscriptionThenYou": "If you want to modify your subscription then you can",
"ifYouWantToModifyYourSubscriptionThenYou - TODO: update line above and then delete this line to mark that the translation has been fixed": "If you want to modify your subscription then you can",
"manageYourPreferences": "manage your preferences",
"manageYourPreferences - TODO: update line above and then delete this line to mark that the translation has been fixed": "manage your preferences",
"or": "or",
"or - TODO: update line above and then delete this line to mark that the translation has been fixed": "or",
"unsubscribeHere": "unsubscribe here",
"unsubscribeHere - TODO: update line above and then delete this line to mark that the translation has been fixed": "unsubscribe here",
"returnToOurWebsite": "Return to our website",
"returnToOurWebsite - TODO: update line above and then delete this line to mark that the translation has been fixed": "Return to our website",
"forQuestionsAboutThisListPleaseContact": "For questions about this list, please contact:",
"forQuestionsAboutThisListPleaseContact - TODO: update line above and then delete this line to mark that the translation has been fixed": "For questions about this list, please contact:",
"pleaseConfirmSubscriptionAddressChange": "Please Confirm Subscription Address Change",
"pleaseConfirmSubscriptionAddressChange - TODO: update line above and then delete this line to mark that the translation has been fixed": "Please Confirm Subscription Address Change",
"yesSubscribeMeToThisList": "Yes, subscribe me to this list",
"yesSubscribeMeToThisList - TODO: update line above and then delete this line to mark that the translation has been fixed": "Yes, subscribe me to this list",
"ifYouReceivedThisEmailByMistakeSimply-1": "If you received this email by mistake, simply delete it. You won't be subscribed unless you click the confirmation link above.",
"ifYouReceivedThisEmailByMistakeSimply-1 - TODO: update line above and then delete this line to mark that the translation has been fixed": "If you received this email by mistake, simply delete it. You won't be subscribed unless you click the confirmation link above.",
"yesSubscribeThisEmailAddressToTheList": "Yes, subscribe this email address to the list",
"yesSubscribeThisEmailAddressToTheList - TODO: update line above and then delete this line to mark that the translation has been fixed": "Yes, subscribe this email address to the list",
"pleaseConfirmUnsubscription": "Please Confirm Unsubscription",
"pleaseConfirmUnsubscription - TODO: update line above and then delete this line to mark that the translation has been fixed": "Please Confirm Unsubscription",
"yesUnsubscribeMe": "yesUnsubscribeMe",
"yesUnsubscribeMe - TODO: update line above and then delete this line to mark that the translation has been fixed": "yesUnsubscribeMe",
"ifYouReceivedThisEmailByMistakeSimply-2": "If you received this email by mistake, simply delete it. You won't be unsubscribed if you don't click the confirmation link above.",
"ifYouReceivedThisEmailByMistakeSimply-2 - TODO: update line above and then delete this line to mark that the translation has been fixed": "If you received this email by mistake, simply delete it. You won't be unsubscribed if you don't click the confirmation link above.",
"yourSubscriptionToOurListHasBeen": "Your subscription to our list has been confirmed.",
"yourSubscriptionToOurListHasBeen - TODO: update line above and then delete this line to mark that the translation has been fixed": "Your subscription to our list has been confirmed.",
"youAreNowUnsubscribed": "You Are Now Unsubscribed",
"youAreNowUnsubscribed - TODO: update line above and then delete this line to mark that the translation has been fixed": "You Are Now Unsubscribed",
"weHaveRemovedYourEmailAddressFromOurList": "We have removed your email address from our list.",
"weHaveRemovedYourEmailAddressFromOurList - TODO: update line above and then delete this line to mark that the translation has been fixed": "We have removed your email address from our list.",
"ifYouUnsubscribedByMistakeYouCan": "If you unsubscribed by mistake, you can re-subscribe at",
"ifYouUnsubscribedByMistakeYouCan - TODO: update line above and then delete this line to mark that the translation has been fixed": "If you unsubscribed by mistake, you can re-subscribe at",
"emailAddress-2": "E-Mail-Adresse",
"wantToChangeIt?": "Ändern?",
"downloadSignatureVerificationKey": "Öffentlicher Schlüssel zur Signaturverifikation herunterladen",
Expand All @@ -1257,18 +1262,6 @@
"updateEmailAddress": "E-Mail-Adresse aktualisieren",
"updateProfile": "Profil aktualisieren",
"subscribeToList": "Liste abonnieren",
"almostFinished": "Almost Finished",
"almostFinished - TODO: update line above and then delete this line to mark that the translation has been fixed": "Almost Finished",
"weNeedToConfirmYourEmailAddressTo": "We need to confirm your email address. To complete the subscription process, please click the link in the email we just sent you.",
"weNeedToConfirmYourEmailAddressTo - TODO: update line above and then delete this line to mark that the translation has been fixed": "We need to confirm your email address. To complete the subscription process, please click the link in the email we just sent you.",
"ifYouDontReceiveItPleaseCheckYourSpam": "If you don't receive it, please check your spam folder.",
"ifYouDontReceiveItPleaseCheckYourSpam - TODO: update line above and then delete this line to mark that the translation has been fixed": "If you don't receive it, please check your spam folder.",
"thankYouForSubscribing!": "Thank you for subscribing!",
"thankYouForSubscribing! - TODO: update line above and then delete this line to mark that the translation has been fixed": "Thank you for subscribing!",
"unsubscriptionConfirmed": "Unsubscription Confirmed",
"unsubscriptionConfirmed - TODO: update line above and then delete this line to mark that the translation has been fixed": "Unsubscription Confirmed",
"youHaveBeenRemovedFrom": "You have been removed from:",
"youHaveBeenRemovedFrom - TODO: update line above and then delete this line to mark that the translation has been fixed": "You have been removed from:",
"thePasswordMustBeAtLeastMinLength": "Das Passwort muss mindestens {{ minLength }} Zeichen lang sein",
"thePasswordMustBeFewerThanMaxLength": "Das Passwort darf höchstens als {{ maxLength }} Zeichen haben",
"thePasswordMayNotContainSequencesOfThree": "Das Passwort darf keine sich wiederholenden Zeichenketten (drei oder mehr Mal) beinhalten",
Expand Down
Loading

0 comments on commit 9450e77

Please sign in to comment.