Extracted strings and fixes on localization support
Language chooser in the UI
This commit is contained in:
Tomas Bures
parent
9f449c0a2f
commit
dc7789c17b
126 changed files with 2919 additions and 2028 deletions
|
|
@ -1,11 +1,10 @@
|
|||
'use strict';
|
||||
|
||||
import React, {Component} from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import {
|
||||
Trans,
|
||||
translate
|
||||
} from 'react-i18next';
|
||||
import PropTypes
|
||||
from 'prop-types';
|
||||
import {Trans} from 'react-i18next';
|
||||
import {withTranslation} from '../lib/i18n';
|
||||
import {
|
||||
NavButton,
|
||||
requiresAuthenticatedUser,
|
||||
|
|
@ -38,12 +37,14 @@ import {
|
|||
MailerType
|
||||
} from "../../../shared/send-configurations";
|
||||
|
||||
import styles from "../lib/styles.scss";
|
||||
import styles
|
||||
from "../lib/styles.scss";
|
||||
|
||||
import mailtrainConfig from 'mailtrainConfig';
|
||||
import mailtrainConfig
|
||||
from 'mailtrainConfig';
|
||||
|
||||
|
||||
@translate()
|
||||
@withTranslation()
|
||||
@withForm
|
||||
@withPageHelpers
|
||||
@withErrorHandling
|
||||
|
|
@ -107,19 +108,19 @@ export default class CUD extends Component {
|
|||
const typeKey = state.getIn(['mailer_type', 'value']);
|
||||
|
||||
if (!state.getIn(['name', 'value'])) {
|
||||
state.setIn(['name', 'error'], t('Name must not be empty'));
|
||||
state.setIn(['name', 'error'], t('nameMustNotBeEmpty'));
|
||||
} else {
|
||||
state.setIn(['name', 'error'], null);
|
||||
}
|
||||
|
||||
if (!typeKey) {
|
||||
state.setIn(['mailer_type', 'error'], t('Mailer type must be selected'));
|
||||
state.setIn(['mailer_type', 'error'], t('mailerTypeMustBeSelected'));
|
||||
} else {
|
||||
state.setIn(['mailer_type', 'error'], null);
|
||||
}
|
||||
|
||||
if (state.getIn(['verpEnabled', 'value']) && !state.getIn(['verp_hostname', 'value'])) {
|
||||
state.setIn(['verp_hostname', 'error'], t('VERP hostname must not be empty'));
|
||||
state.setIn(['verp_hostname', 'error'], t('verpHostnameMustNotBeEmpty'));
|
||||
} else {
|
||||
state.setIn(['verp_hostname', 'error'], null);
|
||||
}
|
||||
|
|
@ -144,7 +145,7 @@ export default class CUD extends Component {
|
|||
}
|
||||
|
||||
this.disableForm();
|
||||
this.setFormStatusMessage('info', t('Saving ...'));
|
||||
this.setFormStatusMessage('info', t('saving'));
|
||||
|
||||
const submitSuccessful = await this.validateAndSendFormValuesToURL(sendMethod, url, data => {
|
||||
this.mailerTypes[data.mailer_type].beforeSave(data);
|
||||
|
|
@ -154,10 +155,10 @@ export default class CUD extends Component {
|
|||
});
|
||||
|
||||
if (submitSuccessful) {
|
||||
this.navigateToWithFlashMessage('/send-configurations', 'success', t('Send configuration saved'));
|
||||
this.navigateToWithFlashMessage('/send-configurations', 'success', t('sendConfigurationSaved'));
|
||||
} else {
|
||||
this.enableForm();
|
||||
this.setFormStatusMessage('warning', t('There are errors in the form. Please fix them and submit again.'));
|
||||
this.setFormStatusMessage('warning', t('thereAreErrorsInTheFormPleaseFixThemAnd'));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -183,60 +184,60 @@ export default class CUD extends Component {
|
|||
deleteUrl={`rest/send-configurations/${this.props.entity.id}`}
|
||||
backUrl={`/send-configurations/${this.props.entity.id}/edit`}
|
||||
successUrl="/send-configurations"
|
||||
deletingMsg={t('Deleting send configuration ...')}
|
||||
deletedMsg={t('Send configuration deleted')}/>
|
||||
deletingMsg={t('deletingSendConfiguration')}
|
||||
deletedMsg={t('sendConfigurationDeleted')}/>
|
||||
}
|
||||
|
||||
<Title>{isEdit ? t('Edit Send Configuration') : t('Create Send Configuration')}</Title>
|
||||
<Title>{isEdit ? t('editSendConfiguration') : t('createSendConfiguration')}</Title>
|
||||
|
||||
<Form stateOwner={this} onSubmitAsync={::this.submitHandler}>
|
||||
|
||||
<InputField id="name" label={t('Name')}/>
|
||||
<InputField id="name" label={t('name')}/>
|
||||
|
||||
{isEdit &&
|
||||
<StaticField id="cid" className={styles.formDisabled} label={t('ID')}>
|
||||
<StaticField id="cid" className={styles.formDisabled} label={t('id')}>
|
||||
{this.getFormValue('cid')}
|
||||
</StaticField>
|
||||
}
|
||||
|
||||
<TextArea id="description" label={t('Description')}/>
|
||||
<TextArea id="description" label={t('description')}/>
|
||||
<NamespaceSelect/>
|
||||
|
||||
<Fieldset label={t('Email Header')}>
|
||||
<InputField id="from_email" label={t('Default "from" email')}/>
|
||||
<CheckBox id="from_email_overridable" text={t('Overridable')}/>
|
||||
<InputField id="from_name" label={t('Default "from" name')}/>
|
||||
<CheckBox id="from_name_overridable" text={t('Overridable')}/>
|
||||
<InputField id="reply_to" label={t('Default "reply-to" email')}/>
|
||||
<CheckBox id="reply_to_overridable" text={t('Overridable')}/>
|
||||
<InputField id="subject" label={t('Subject')}/>
|
||||
<CheckBox id="subject_overridable" text={t('Overridable')}/>
|
||||
<InputField id="x_mailer" label={t('X-Mailer')}/>
|
||||
<Fieldset label={t('emailHeader')}>
|
||||
<InputField id="from_email" label={t('defaultFromEmail')}/>
|
||||
<CheckBox id="from_email_overridable" text={t('overridable')}/>
|
||||
<InputField id="from_name" label={t('defaultFromName')}/>
|
||||
<CheckBox id="from_name_overridable" text={t('overridable')}/>
|
||||
<InputField id="reply_to" label={t('defaultReplytoEmail')}/>
|
||||
<CheckBox id="reply_to_overridable" text={t('overridable')}/>
|
||||
<InputField id="subject" label={t('subject')}/>
|
||||
<CheckBox id="subject_overridable" text={t('overridable')}/>
|
||||
<InputField id="x_mailer" label={t('xMailer')}/>
|
||||
</Fieldset>
|
||||
|
||||
{mailerForm}
|
||||
{/* TODO - add "Check mail config" button */}
|
||||
|
||||
<Fieldset label={t('VERP Bounce Handling')}>
|
||||
<Trans><p>Mailtrain is able to use VERP based routing to detect bounces. In this case the message is sent to the recipient using a custom VERP address as the return path of the message. If the message is not accepted a bounce email is sent to this special VERP address and thus a bounce is detected.</p></Trans>
|
||||
<Trans><p>To get VERP working you need to set up a DNS MX record that points to your Mailtrain hostname. You must also ensure that Mailtrain VERP interface is available from port 25 of your server (port 25 usually requires root user privileges). This way if anyone tries to send email to someuser@verp-hostname then the email should end up to this server.</p></Trans>
|
||||
<Trans><p className="text-warning">VERP usually only works if you are using your own SMTP server. Regular relay services (SES, SparkPost, Gmail etc.) tend to remove the VERP address from the message.</p></Trans>
|
||||
<Fieldset label={t('verpBounceHandling')}>
|
||||
<Trans i18nKey="mailtrainIsAbleToUseVerpBasedRoutingTo"><p>Mailtrain is able to use VERP based routing to detect bounces. In this case the message is sent to the recipient using a custom VERP address as the return path of the message. If the message is not accepted a bounce email is sent to this special VERP address and thus a bounce is detected.</p></Trans>
|
||||
<Trans i18nKey="toGetVerpWorkingYouNeedToSetUpADnsMx"><p>To get VERP working you need to set up a DNS MX record that points to your Mailtrain hostname. You must also ensure that Mailtrain VERP interface is available from port 25 of your server (port 25 usually requires root user privileges). This way if anyone tries to send email to someuser@verp-hostname then the email should end up to this server.</p></Trans>
|
||||
<Trans i18nKey="verpUsuallyOnlyWorksIfYouAreUsingYourOwn"><p className="text-warning">VERP usually only works if you are using your own SMTP server. Regular relay services (SES, SparkPost, Gmail etc.) tend to remove the VERP address from the message.</p></Trans>
|
||||
{mailtrainConfig.verpEnabled ?
|
||||
<div>
|
||||
<CheckBox id="verpEnabled" text={t('verpEnabled')}/>
|
||||
{verpEnabled && <InputField id="verp_hostname" label={t('Server hostname')} placeholder={t('The VERP server hostname, eg. bounces.example.com')} help={t('VERP bounce handling server hostname. This hostname is used in the SMTP envelope FROM address and the MX DNS records should point to this server')}/>}
|
||||
{verpEnabled && <InputField id="verp_hostname" label={t('serverHostname')} placeholder={t('theVerpServerHostnameEgBouncesexamplecom')} help={t('verpBounceHandlingServerHostnameThis')}/>}
|
||||
</div>
|
||||
:
|
||||
<Trans><p>VERP bounce handling server is not enabled. Modify your server configuration file and restart server to enable it.</p></Trans>
|
||||
<Trans i18nKey="verpBounceHandlingServerIsNotEnabled"><p>VERP bounce handling server is not enabled. Modify your server configuration file and restart server to enable it.</p></Trans>
|
||||
}
|
||||
</Fieldset>
|
||||
|
||||
<hr/>
|
||||
|
||||
<ButtonRow>
|
||||
<Button type="submit" className="btn-primary" icon="ok" label={t('Save')}/>
|
||||
<Button type="submit" className="btn-primary" icon="ok" label={t('save')}/>
|
||||
{canDelete &&
|
||||
<NavButton className="btn-danger" icon="remove" label={t('Delete')} linkTo={`/send-configurations/${this.props.entity.id}/delete`}/>
|
||||
<NavButton className="btn-danger" icon="remove" label={t('delete')} linkTo={`/send-configurations/${this.props.entity.id}/delete`}/>
|
||||
}
|
||||
</ButtonRow>
|
||||
</Form>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue