public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'development' of github.com:Mailtrain-org/mailtrain into development

Browse source
This commit is contained in:
Tomas Bures 2018-12-21 22:44:51 +00:00
commit dd9b8b464a
2 changed files with 12 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

29
client/dev-fragments.txt
View file

@ -1,29 +0,0 @@
FancyTree
---------
<link rel="stylesheet" href="/fancytree/skin-bootstrap/ui.fancytree.min.css" >
<style type="text/css">
#tree .fancytree-container {
height: 100px;
overflow: auto;
position: relative;
}
#tree .fancytree-active {
background-color: #5094ce;
}
#tree .fancytree-title {
background-color: transparent;
border-color: transparent;
}
</style>
<script src="/javascript/jquery-ui-1.12.1.min.js" type="text/javascript" charset="utf-8"></script>
<script src="/fancytree/jquery.fancytree-all.min.js"></script>
i18next-conv
------------
node_modules/.bin/i18next-conv -s ../languages/de_DE.mo -t locales/de_DE.json -l de_DE

15
client/src/send-configurations/helpers.js
View file

@ -127,10 +127,16 @@ export function getMailerTypes(t) {
validateNumber(state, 'smtpMaxMessages', 'Max messages');
}
const typeNames = {
[MailerType.GENERIC_SMTP]: t('genericSmtp'),
[MailerType.ZONE_MTA]: t('zoneMta'),
[MailerType.AWS_SES]: t('amazonSes')
};
const typeOptions = [
{ key: MailerType.GENERIC_SMTP, label: t('genericSmtp')},
{ key: MailerType.ZONE_MTA, label: t('zoneMta')},
{ key: MailerType.AWS_SES, label: t('amazonSes')}
{ key: MailerType.GENERIC_SMTP, label: typeNames[MailerType.GENERIC_SMTP]},
{ key: MailerType.ZONE_MTA, label: typeNames[MailerType.ZONE_MTA]},
{ key: MailerType.AWS_SES, label: typeNames[MailerType.AWS_SES]}
];
const smtpEncryptionOptions = [
@ -155,6 +161,7 @@ export function getMailerTypes(t) {
zoneMtaTypeOptions.push({ key: ZoneMTAType.REGULAR, label: t('No dynamic configuration of DKIM keys')});
mailerTypes[MailerType.GENERIC_SMTP] = {
typeName: typeNames[MailerType.GENERIC_SMTP],
getForm: owner =>
<div>
<Fieldset label={t('mailerSettings')}>
@ -197,6 +204,7 @@ export function getMailerTypes(t) {
};
mailerTypes[MailerType.ZONE_MTA] = {
typeName: typeNames[MailerType.ZONE_MTA],
getForm: owner => {
const zoneMtaType = Number.parseInt(owner.getFormValue('zoneMtaType'));
return (
@ -283,6 +291,7 @@ export function getMailerTypes(t) {
};
mailerTypes[MailerType.AWS_SES] = {
typeName: typeNames[MailerType.AWS_SES],
getForm: owner =>
<div>
<Fieldset label={t('mailerSettings')}>