diff --git a/client/src/account/API.js b/client/src/account/API.js
index a712bb7b..beb3f2bc 100644
--- a/client/src/account/API.js
+++ b/client/src/account/API.js
@@ -342,10 +342,10 @@ export default class API extends Component {
curl -XGET '{getUrl(`api/lists/test@example.com?access_token=${accessToken}`)}'
- GET /api/rss/fetch/:campaignCid – {t('Trigger fetch of a campaign')}
+ GET /api/rss/fetch/:campaignCid – {t('triggerFetchOfACampaign')}
- {t('Forces the RSS feed check to immediately check the campaign with the given CID (in :campaignCid). It works only for RSS campaigns.')}
+ {t('forcesTheRssFeedCheckToImmediatelyCheck')}
@@ -364,7 +364,7 @@ export default class API extends Component {
POST /api/templates/:templateId/send – {t('sendTransactionalEmail')}
- {t('sendSingleEmailByTemplateId')}
+ {t('sendSingleEmailByTemplateWithGiven')}
@@ -379,10 +379,10 @@ export default class API extends Component {
EMAIL – {t('emailAddress')} ({t('required')} )
- SEND_CONFIGURATION_ID – {t('sendConfigurationId')}
+ SEND_CONFIGURATION_ID – {t('idOfConfigurationUsedToCreateMailer')}
SUBJECT – {t('subject')}
- DATA – {t('templateData')}: {'{'} "any": ["type", {'{'}"of": "data"{'}'}] {'}'}
- VARIABLES – {t('templateVariables')}: {'{'} "FOO": "bar" {'}'}
+ DATA – {t('dataPassedToTemplateWhenCompilingWith')}: {'{'} "any": ["type", {'{'}"of": "data"{'}'}] {'}'}
+ VARIABLES – {t('mapOfTemplatesubjectVariablesToReplace')}: {'{'} "FOO": "bar" {'}'}
diff --git a/client/src/campaigns/CUD.js b/client/src/campaigns/CUD.js
index c1640137..6eac01ed 100644
--- a/client/src/campaigns/CUD.js
+++ b/client/src/campaigns/CUD.js
@@ -409,26 +409,26 @@ export default class CUD extends Component {
if (submitResult) {
if (this.props.entity) {
if (afterSubmitAction === CUD.AfterSubmitAction.STATUS) {
- this.navigateToWithFlashMessage(`/campaigns/${this.props.entity.id}/status`, 'success', t('Campaign updated'));
+ this.navigateToWithFlashMessage(`/campaigns/${this.props.entity.id}/status`, 'success', t('campaignUpdated'));
} else if (afterSubmitAction === CUD.AfterSubmitAction.LEAVE) {
- this.navigateToWithFlashMessage('/campaigns', 'success', t('Campaign updated'));
+ this.navigateToWithFlashMessage('/campaigns', 'success', t('campaignUpdated'));
} else {
await this.getFormValuesFromURL(`rest/campaigns-settings/${this.props.entity.id}`);
this.enableForm();
- this.setFormStatusMessage('success', t('Campaign updated'));
+ this.setFormStatusMessage('success', t('campaignUpdated'));
}
} else {
const sourceTypeKey = Number.parseInt(this.getFormValue('source'));
if (sourceTypeKey === CampaignSource.CUSTOM || sourceTypeKey === CampaignSource.CUSTOM_FROM_TEMPLATE || sourceTypeKey === CampaignSource.CUSTOM_FROM_CAMPAIGN) {
- this.navigateToWithFlashMessage(`/campaigns/${submitResult}/content`, 'success', t('Campaign created'));
+ this.navigateToWithFlashMessage(`/campaigns/${submitResult}/content`, 'success', t('campaignCreated'));
} else {
if (afterSubmitAction === CUD.AfterSubmitAction.STATUS) {
- this.navigateToWithFlashMessage(`/campaigns/${submitResult}/status`, 'success', t('Campaign created'));
+ this.navigateToWithFlashMessage(`/campaigns/${submitResult}/status`, 'success', t('campaignCreated'));
} else if (afterSubmitAction === CUD.AfterSubmitAction.LEAVE) {
- this.navigateToWithFlashMessage(`/campaigns`, 'success', t('Campaign created'));
+ this.navigateToWithFlashMessage(`/campaigns`, 'success', t('campaignCreated'));
} else {
- this.navigateToWithFlashMessage(`/campaigns/${submitResult}/edit`, 'success', t('Campaign created'));
+ this.navigateToWithFlashMessage(`/campaigns/${submitResult}/edit`, 'success', t('campaignCreated'));
}
}
}
@@ -739,7 +739,7 @@ export default class CUD extends Component {
-
+
@@ -759,12 +759,12 @@ export default class CUD extends Component {
{!isEdit && (sourceTypeKey === CampaignSource.CUSTOM || sourceTypeKey === CampaignSource.CUSTOM_FROM_TEMPLATE || sourceTypeKey === CampaignSource.CUSTOM_FROM_CAMPAIGN) ?
-
+
:
<>
-
- await this.submitHandler(CUD.AfterSubmitAction.LEAVE)}/>
- await this.submitHandler(CUD.AfterSubmitAction.STATUS)}/>
+
+ await this.submitHandler(CUD.AfterSubmitAction.LEAVE)}/>
+ await this.submitHandler(CUD.AfterSubmitAction.STATUS)}/>
>
}
{canDelete && }
diff --git a/client/src/campaigns/Content.js b/client/src/campaigns/Content.js
index 34b587a5..c1e42816 100644
--- a/client/src/campaigns/Content.js
+++ b/client/src/campaigns/Content.js
@@ -143,13 +143,13 @@ export default class CustomContent extends Component {
if (submitResult) {
if (afterSubmitAction === CustomContent.AfterSubmitAction.STATUS) {
- this.navigateToWithFlashMessage(`/campaigns/${this.props.entity.id}/status`, 'success', t('Campaign updated'));
+ this.navigateToWithFlashMessage(`/campaigns/${this.props.entity.id}/status`, 'success', t('campaignUpdated'));
} else if (afterSubmitAction === CustomContent.AfterSubmitAction.LEAVE) {
- this.navigateToWithFlashMessage('/campaigns', 'success', t('Campaign updated'));
+ this.navigateToWithFlashMessage('/campaigns', 'success', t('campaignUpdated'));
} else {
await this.getFormValuesFromURL(`rest/campaigns-content/${this.props.entity.id}`);
this.enableForm();
- this.setFormStatusMessage('success', t('Campaign updated'));
+ this.setFormStatusMessage('success', t('campaignUpdated'));
}
} else {
this.enableForm();
@@ -258,9 +258,9 @@ export default class CustomContent extends Component {
{customTemplateTypeKey && getEditForm(this, customTemplateTypeKey, 'data_sourceCustom_')}
-
- await this.submitHandler(CustomContent.AfterSubmitAction.LEAVE)}/>
- await this.submitHandler(CustomContent.AfterSubmitAction.STATUS)}/>
+
+ await this.submitHandler(CustomContent.AfterSubmitAction.LEAVE)}/>
+ await this.submitHandler(CustomContent.AfterSubmitAction.STATUS)}/>
this.setState({showTestSendModal: true})}/>
diff --git a/client/src/campaigns/Statistics.js b/client/src/campaigns/Statistics.js
index 0abad10a..fa0d99d0 100644
--- a/client/src/campaigns/Statistics.js
+++ b/client/src/campaigns/Statistics.js
@@ -122,8 +122,8 @@ export default class Statistics extends Component {
- {t('Quick Reports')}
- Below, you can download pre-made reports related to this campaign. Each link generates a CSV file that can be viewed in a spreadsheet editor. Custom reports and reports that cover more than one campaign can be created through Reports functionality of Mailtrain.
+ {t('quickReports')}
+ Below, you can download pre-made reports related to this campaign. Each link generates a CSV file that can be viewed in a spreadsheet editor. Custom reports and reports that cover more than one campaign can be created through Reports functionality of Mailtrain.
diff --git a/client/src/campaigns/Status.js b/client/src/campaigns/Status.js
index 0eaba972..10d3bf34 100644
--- a/client/src/campaigns/Status.js
+++ b/client/src/campaigns/Status.js
@@ -201,7 +201,7 @@ class SendControls extends Component {
const t = this.props.t;
this.actionDialog(
t('confirmLaunch'),
- t('doYouWantToLaunchTheCampaign?All'),
+ t('doYouWantToLaunchTheCampaign?'),
async () => {
await this.startAsync();
await this.refreshEntity();
@@ -281,7 +281,7 @@ class SendControls extends Component {
{this.getFormValue('sendLater') &&
-
+
{/* TODO: Timezone selector */}
}
diff --git a/client/src/campaigns/triggers/CUD.js b/client/src/campaigns/triggers/CUD.js
index d90ae009..2db20013 100644
--- a/client/src/campaigns/triggers/CUD.js
+++ b/client/src/campaigns/triggers/CUD.js
@@ -170,17 +170,17 @@ export default class CUD extends Component {
if (submitResult) {
if (this.props.entity) {
if (submitAndLeave) {
- this.navigateToWithFlashMessage(`/campaigns/${this.props.campaign.id}/triggers`, 'success', t('Trigger updated'));
+ this.navigateToWithFlashMessage(`/campaigns/${this.props.campaign.id}/triggers`, 'success', t('triggerUpdated'));
} else {
await this.getFormValuesFromURL(`rest/triggers/${this.props.campaign.id}/${this.props.entity.id}`, ::this.getFormValuesMutator);
this.enableForm();
- this.setFormStatusMessage('success', t('Trigger updated'));
+ this.setFormStatusMessage('success', t('triggerUpdated'));
}
} else {
if (submitAndLeave) {
- this.navigateToWithFlashMessage(`/campaigns/${this.props.campaign.id}/triggers`, 'success', t('Trigger created'));
+ this.navigateToWithFlashMessage(`/campaigns/${this.props.campaign.id}/triggers`, 'success', t('triggerCreated'));
} else {
- this.navigateToWithFlashMessage(`/campaigns/${this.props.campaign.id}/triggers/${submitResult}/edit`, 'success', t('Trigger created'));
+ this.navigateToWithFlashMessage(`/campaigns/${this.props.campaign.id}/triggers/${submitResult}/edit`, 'success', t('triggerCreated'));
}
}
} else {
@@ -245,8 +245,8 @@ export default class CUD extends Component {
-
- await this.submitHandler(true)}/>
+
+ await this.submitHandler(true)}/>
{isEdit && }
diff --git a/client/src/lib/files.js b/client/src/lib/files.js
index 318fafa9..9792e55c 100644
--- a/client/src/lib/files.js
+++ b/client/src/lib/files.js
@@ -150,7 +150,7 @@ export default class Files extends Component {
{ label: t('no'), className: 'btn-primary', onClickAsync: ::this.hideDeleteFile },
{ label: t('yes'), className: 'btn-danger', onClickAsync: ::this.performDeleteFile }
]}>
- {t('filesareYouSureToDeleteFile', {name: this.state.fileToDeleteName})}
+ {t('areYouSureYouWantToDeleteTheFile?', {name: this.state.fileToDeleteName})}
{this.props.title && {this.props.title} }
diff --git a/client/src/lib/namespace.js b/client/src/lib/namespace.js
index 40599c1c..2e0d5ba8 100644
--- a/client/src/lib/namespace.js
+++ b/client/src/lib/namespace.js
@@ -21,7 +21,7 @@ class NamespaceSelect extends Component {
function validateNamespace(t, state) {
if (!state.getIn(['namespace', 'value'])) {
- state.setIn(['namespace', 'error'], t('namespacemustBeSelected'));
+ state.setIn(['namespace', 'error'], t('namespaceMustBeSelected'));
} else {
state.setIn(['namespace', 'error'], null);
}
diff --git a/client/src/lib/sandboxed-ckeditor.js b/client/src/lib/sandboxed-ckeditor.js
index efff79e8..7e0c96d1 100644
--- a/client/src/lib/sandboxed-ckeditor.js
+++ b/client/src/lib/sandboxed-ckeditor.js
@@ -99,10 +99,10 @@ export class CKEditorHost extends Component {
{this.props.title}
diff --git a/client/src/lib/sandboxed-codeeditor.js b/client/src/lib/sandboxed-codeeditor.js
index 85cac3b8..21d59a8a 100644
--- a/client/src/lib/sandboxed-codeeditor.js
+++ b/client/src/lib/sandboxed-codeeditor.js
@@ -94,12 +94,12 @@ export class CodeEditorHost extends Component {
{this.props.title}
diff --git a/client/src/lib/sandboxed-grapesjs.js b/client/src/lib/sandboxed-grapesjs.js
index 27e0ae31..42fa23a4 100644
--- a/client/src/lib/sandboxed-grapesjs.js
+++ b/client/src/lib/sandboxed-grapesjs.js
@@ -75,11 +75,11 @@ export class GrapesJSHost extends Component {
{this.props.title}
diff --git a/client/src/lib/sandboxed-mosaico.js b/client/src/lib/sandboxed-mosaico.js
index d3f9370d..7704c0d1 100644
--- a/client/src/lib/sandboxed-mosaico.js
+++ b/client/src/lib/sandboxed-mosaico.js
@@ -77,10 +77,10 @@ export class MosaicoHost extends Component {
{this.props.title}
diff --git a/client/src/lib/untrusted.js b/client/src/lib/untrusted.js
index 6e37276f..6948f9c7 100644
--- a/client/src/lib/untrusted.js
+++ b/client/src/lib/untrusted.js
@@ -244,7 +244,7 @@ export class UntrustedContentRoot extends Component {
} else {
return (
- {t('loading-1')}
+ {t('loading')}
);
}
diff --git a/client/src/lists/CUD.js b/client/src/lists/CUD.js
index fedb64c9..083d8478 100644
--- a/client/src/lists/CUD.js
+++ b/client/src/lists/CUD.js
@@ -137,17 +137,17 @@ export default class CUD extends Component {
if (submitResult) {
if (this.props.entity) {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/lists', 'success', t('List updated'));
+ this.navigateToWithFlashMessage('/lists', 'success', t('listUpdated'));
} else {
await this.getFormValuesFromURL(`rest/lists/${this.props.entity.id}`);
this.enableForm();
- this.setFormStatusMessage('success', t('List updated'));
+ this.setFormStatusMessage('success', t('listUpdated'));
}
} else {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/lists', 'success', t('List created'));
+ this.navigateToWithFlashMessage('/lists', 'success', t('listCreated'));
} else {
- this.navigateToWithFlashMessage(`/lists/${submitResult}/edit`, 'success', t('List created'));
+ this.navigateToWithFlashMessage(`/lists/${submitResult}/edit`, 'success', t('listCreated'));
}
}
} else {
@@ -215,14 +215,14 @@ export default class CUD extends Component {
toNameFields = ;
} else {
const fieldWizardOptions = [
- {key: FieldWizard.NONE, label: t('Empty / Custom (no fields)')},
- {key: FieldWizard.NAME, label: t('Name (one field)')},
- {key: FieldWizard.FIRST_LAST_NAME, label: t('First name and Last name (two fields)')},
+ {key: FieldWizard.NONE, label: t('emptyCustomNoFields')},
+ {key: FieldWizard.NAME, label: t('nameOneField')},
+ {key: FieldWizard.FIRST_LAST_NAME, label: t('firstNameAndLastNameTwoFields')},
];
const fieldWizardValue = this.getFormValue('fieldWizard');
- const fieldWizardSelector =
+ const fieldWizardSelector =
if (fieldWizardValue === FieldWizard.NONE) {
toNameFields = (
@@ -282,8 +282,8 @@ export default class CUD extends Component {
-
- await this.submitHandler(true)}/>
+
+ await this.submitHandler(true)}/>
{canDelete && }
diff --git a/client/src/lists/fields/CUD.js b/client/src/lists/fields/CUD.js
index 2e30b51e..45d13af8 100644
--- a/client/src/lists/fields/CUD.js
+++ b/client/src/lists/fields/CUD.js
@@ -310,17 +310,17 @@ export default class CUD extends Component {
if (submitResult) {
if (this.props.entity) {
if (submitAndLeave) {
- this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/fields`, 'success', t('Field updated'));
+ this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/fields`, 'success', t('fieldUpdated'));
} else {
await this.getFormValuesFromURL(`rest/fields/${this.props.list.id}/${this.props.entity.id}`);
this.enableForm();
- this.setFormStatusMessage('success', t('Field updated'));
+ this.setFormStatusMessage('success', t('fieldUpdated'));
}
} else {
if (submitAndLeave) {
- this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/fields`, 'success', t('Field created'));
+ this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/fields`, 'success', t('fieldCreated'));
} else {
- this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/fields/${submitResult}/edit`, 'success', t('Field created'));
+ this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/fields/${submitResult}/edit`, 'success', t('fieldCreated'));
}
}
} else {
@@ -459,14 +459,14 @@ export default class CUD extends Component {
fieldSettings =
-
+
{isInGroup &&
-
+
}
{!isInGroup &&
<>
-
-
+
+
>
}
@@ -512,8 +512,8 @@ export default class CUD extends Component {
}
-
- await this.submitHandler(true)}/>
+
+ await this.submitHandler(true)}/>
{isEdit && }
diff --git a/client/src/lists/forms/CUD.js b/client/src/lists/forms/CUD.js
index cac47dfe..a10ae8d7 100644
--- a/client/src/lists/forms/CUD.js
+++ b/client/src/lists/forms/CUD.js
@@ -402,17 +402,17 @@ export default class CUD extends Component {
if (submitResult) {
if (this.props.entity) {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/lists/forms', 'success', t('Custom forms updated'));
+ this.navigateToWithFlashMessage('/lists/forms', 'success', t('customFormsUpdated'));
} else {
await this.getFormValuesFromURL(`rest/forms/${this.props.entity.id}`);
this.enableForm();
- this.setFormStatusMessage('success', t('Custom forms updated'));
+ this.setFormStatusMessage('success', t('customFormsUpdated'));
}
} else {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/lists/forms', 'success', t('Custom forms created'));
+ this.navigateToWithFlashMessage('/lists/forms', 'success', t('customFormsCreated'));
} else {
- this.navigateToWithFlashMessage(`/lists/forms/${submitResult}/edit`, 'success', t('Custom forms created'));
+ this.navigateToWithFlashMessage(`/lists/forms/${submitResult}/edit`, 'success', t('customFormsCreated'));
}
}
} else {
@@ -533,9 +533,9 @@ export default class CUD extends Component {
{t('formPreview') + ' ' + this.state.previewLabel}
@@ -553,8 +553,8 @@ export default class CUD extends Component {
}
-
- await this.submitHandler(true)}/>
+
+ await this.submitHandler(true)}/>
{canDelete && }
diff --git a/client/src/lists/segments/CUD.js b/client/src/lists/segments/CUD.js
index 537c3ad8..ec625623 100644
--- a/client/src/lists/segments/CUD.js
+++ b/client/src/lists/segments/CUD.js
@@ -173,18 +173,18 @@ export default class CUD extends Component {
if (submitResult) {
if (this.props.entity) {
if (submitAndLeave) {
- this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/segments`, 'success', t('Segment updated'));
+ this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/segments`, 'success', t('segmentUpdated'));
} else {
await this.getFormValuesFromURL(`rest/segments/${this.props.list.id}/${this.props.entity.id}`);
this.enableForm();
- this.setFormStatusMessage('success', t('Segment updated'));
+ this.setFormStatusMessage('success', t('segmentUpdated'));
}
} else {
if (submitAndLeave) {
- this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/segments`, 'success', t('Segment created'));
+ this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/segments`, 'success', t('segmentCreated'));
} else {
- this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/segments/${submitResult}/edit`, 'success', t('Segment created'));
+ this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/segments/${submitResult}/edit`, 'success', t('segmentCreated'));
}
}
} else {
@@ -389,7 +389,7 @@ export default class CUD extends Component {
await this.submitHandler(false)}/>
- await this.submitHandler(true)}/>
+ await this.submitHandler(true)}/>
{isEdit && }
diff --git a/client/src/lists/segments/List.js b/client/src/lists/segments/List.js
index 915aafcd..b95c134c 100644
--- a/client/src/lists/segments/List.js
+++ b/client/src/lists/segments/List.js
@@ -63,7 +63,7 @@ export default class List extends Component {
}
- {t('Segments')}
+ {t('segments')}
this.table = node} withHeader dataUrl={`rest/segments-table/${this.props.list.id}`} columns={columns} />
diff --git a/client/src/lists/segments/helpers.js b/client/src/lists/segments/helpers.js
index aeb7587f..cc6d01ba 100644
--- a/client/src/lists/segments/helpers.js
+++ b/client/src/lists/segments/helpers.js
@@ -409,7 +409,7 @@ export function getRuleHelpers(t, fields) {
},
{
column: 'is_test',
- name: t('Test user'),
+ name: t('testUser'),
type: 'option'
}
];
diff --git a/client/src/lists/subscriptions/CUD.js b/client/src/lists/subscriptions/CUD.js
index 18c02331..54456e67 100644
--- a/client/src/lists/subscriptions/CUD.js
+++ b/client/src/lists/subscriptions/CUD.js
@@ -144,17 +144,17 @@ export default class CUD extends Component {
if (submitResult) {
if (this.props.entity) {
if (submitAndLeave) {
- this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/subscriptions`, 'success', t('Subscription updated'));
+ this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/subscriptions`, 'success', t('subscriptionUpdated'));
} else {
await this.getFormValuesFromURL(`rest/subscriptions/${this.props.list.id}/${this.props.entity.id}`);
this.enableForm();
- this.setFormStatusMessage('success', t('Subscription updated'));
+ this.setFormStatusMessage('success', t('subscriptionUpdated'));
}
} else {
if (submitAndLeave) {
- this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/subscriptions`, 'success', t('Subscription created'));
+ this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/subscriptions`, 'success', t('subscriptionCreated'));
} else {
- this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/subscriptions/${submitResult}/edit`, 'success', t('Subscription created'));
+ this.navigateToWithFlashMessage(`/lists/${this.props.list.id}/subscriptions/${submitResult}/edit`, 'success', t('subscriptionCreated'));
}
}
} else {
@@ -237,8 +237,8 @@ export default class CUD extends Component {
}
-
- await this.submitHandler(true)}/>
+
+ await this.submitHandler(true)}/>
{isEdit && }
diff --git a/client/src/namespaces/CUD.js b/client/src/namespaces/CUD.js
index 8ab8e5ca..c90d27dd 100644
--- a/client/src/namespaces/CUD.js
+++ b/client/src/namespaces/CUD.js
@@ -143,19 +143,19 @@ export default class CUD extends Component {
if (submitResult) {
if (this.props.entity) {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/namespaces', 'success', t('Namespace updated'));
+ this.navigateToWithFlashMessage('/namespaces', 'success', t('namespaceUpdated'));
} else {
await this.getFormValuesFromURL(`rest/namespaces/${this.props.entity.id}`);
await this.loadTreeData();
this.enableForm();
- this.setFormStatusMessage('success', t('Namespace updated'));
+ this.setFormStatusMessage('success', t('namespaceUpdated'));
}
} else {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/namespaces', 'success', t('Namespace created'));
+ this.navigateToWithFlashMessage('/namespaces', 'success', t('namespaceCreated'));
} else {
- this.navigateToWithFlashMessage(`/namespaces/${submitResult}/edit`, 'success', t('Namespace created'));
+ this.navigateToWithFlashMessage(`/namespaces/${submitResult}/edit`, 'success', t('namespaceCreated'));
}
}
} else {
@@ -216,8 +216,8 @@ export default class CUD extends Component {
}
-
- await this.submitHandler(true)}/>
+
+ await this.submitHandler(true)}/>
{canDelete && }
diff --git a/client/src/reports/CUD.js b/client/src/reports/CUD.js
index b7d8f9d5..7776f31b 100644
--- a/client/src/reports/CUD.js
+++ b/client/src/reports/CUD.js
@@ -174,17 +174,17 @@ export default class CUD extends Component {
if (submitResult) {
if (this.props.entity) {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/reports', 'success', t('Report updated'));
+ this.navigateToWithFlashMessage('/reports', 'success', t('reportUpdated'));
} else {
await this.getFormValuesFromURL(`rest/reports/${this.props.entity.id}`);
this.enableForm();
- this.setFormStatusMessage('success', t('Report updated'));
+ this.setFormStatusMessage('success', t('reportUpdated'));
}
} else {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/reports', 'success', t('Report created'));
+ this.navigateToWithFlashMessage('/reports', 'success', t('reportCreated'));
} else {
- this.navigateToWithFlashMessage(`/reports/${submitResult}/edit`, 'success', t('Report created'));
+ this.navigateToWithFlashMessage(`/reports/${submitResult}/edit`, 'success', t('reportCreated'));
}
}
} else {
@@ -281,8 +281,8 @@ export default class CUD extends Component {
}
-
- await this.submitHandler(true)}/>
+
+ await this.submitHandler(true)}/>
{canDelete &&
}
diff --git a/client/src/reports/ViewAndOutput.js b/client/src/reports/ViewAndOutput.js
index 85342934..dd27907e 100644
--- a/client/src/reports/ViewAndOutput.js
+++ b/client/src/reports/ViewAndOutput.js
@@ -32,7 +32,7 @@ export default class ViewAndOutput extends Component {
this.viewTypes = {
view: {
url: 'rest/report-content',
- getTitle: name => t('reportName', { name }),
+ getTitle: name => t('reportName-1', { name }),
loading: t('loadingReport'),
finishedStates: new Set([ReportState.FINISHED]),
getContent: content =>
diff --git a/client/src/reports/root.js b/client/src/reports/root.js
index 467a11d5..26ae78d5 100644
--- a/client/src/reports/root.js
+++ b/client/src/reports/root.js
@@ -20,7 +20,7 @@ function getMenus(t) {
panelComponent: ReportsList,
children: {
':reportId([0-9]+)': {
- title: resolved => t('reportName-1', {name: ellipsizeBreadcrumbLabel(resolved.report.name)}),
+ title: resolved => t('reportName', {name: ellipsizeBreadcrumbLabel(resolved.report.name)}),
resolve: {
report: params => `rest/reports/${params.reportId}`
},
diff --git a/client/src/reports/templates/CUD.js b/client/src/reports/templates/CUD.js
index a7ec1330..9bf1f27f 100644
--- a/client/src/reports/templates/CUD.js
+++ b/client/src/reports/templates/CUD.js
@@ -273,17 +273,17 @@ export default class CUD extends Component {
if (submitResult) {
if (this.props.entity) {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/reports/templates', 'success', t('Report template updated'));
+ this.navigateToWithFlashMessage('/reports/templates', 'success', t('reportTemplateUpdated'));
} else {
await this.getFormValuesFromURL(`rest/report-templates/${this.props.entity.id}`);
this.enableForm();
- this.setFormStatusMessage('success', t('Report template updated'));
+ this.setFormStatusMessage('success', t('reportTemplateUpdated'));
}
} else {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/reports/templates', 'success', t('Report template created'));
+ this.navigateToWithFlashMessage('/reports/templates', 'success', t('reportTemplateCreated'));
} else {
- this.navigateToWithFlashMessage(`/reports/templates/${submitResult}/edit`, 'success', t('Report template created'));
+ this.navigateToWithFlashMessage(`/reports/templates/${submitResult}/edit`, 'success', t('reportTemplateCreated'));
}
}
} else {
@@ -322,8 +322,8 @@ export default class CUD extends Component {
Use HTML with Handlebars syntax. See documentation here .}/>
-
- await this.submitHandler(true)}/>
+
+ await this.submitHandler(true)}/>
{canDelete &&
}
diff --git a/client/src/send-configurations/CUD.js b/client/src/send-configurations/CUD.js
index eb5cc1f0..992c2875 100644
--- a/client/src/send-configurations/CUD.js
+++ b/client/src/send-configurations/CUD.js
@@ -166,17 +166,17 @@ export default class CUD extends Component {
if (submitResult) {
if (this.props.entity) {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/send-configurations', 'success', t('Send configuration updated'));
+ this.navigateToWithFlashMessage('/send-configurations', 'success', t('sendConfigurationUpdated'));
} else {
await this.getFormValuesFromURL(`rest/send-configurations-private/${this.props.entity.id}`);
this.enableForm();
- this.setFormStatusMessage('success', t('Send configuration updated'));
+ this.setFormStatusMessage('success', t('sendConfigurationUpdated'));
}
} else {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/send-configurations', 'success', t('Send configuration created'));
+ this.navigateToWithFlashMessage('/send-configurations', 'success', t('sendConfigurationCreated'));
} else {
- this.navigateToWithFlashMessage(`/send-configurations/${submitResult}/edit`, 'success', t('Send configuration created'));
+ this.navigateToWithFlashMessage(`/send-configurations/${submitResult}/edit`, 'success', t('sendConfigurationCreated'));
}
}
} else {
@@ -259,8 +259,8 @@ export default class CUD extends Component {
-
- await this.submitHandler(true)}/>
+
+ await this.submitHandler(true)}/>
{canDelete &&
}
diff --git a/client/src/shares/Share.js b/client/src/shares/Share.js
index f7ad7857..f8723fda 100644
--- a/client/src/shares/Share.js
+++ b/client/src/shares/Share.js
@@ -124,11 +124,11 @@ export default class Share extends Component {
this.usersTableSelect.refresh();
}
},
- { icon: 'trash-alt', label: t('Unshare') },
- t('Confirm Unsharing'),
- t('Are you sure you want to remove the share to user "{{username}}"?', {username}),
- t('Removing share for user "{{username}}"', {username}),
- t('Share for user "{{username}}" removed', {username}),
+ { icon: 'trash-alt', label: t('unshare') },
+ t('confirmUnsharing'),
+ t('areYouSureYouWantToRemoveTheShareToUser', {username}),
+ t('removingShareForUserUsername', {username}),
+ t('shareForUserUsernameRemoved', {username}),
null
);
}
diff --git a/client/src/shares/UserShares.js b/client/src/shares/UserShares.js
index 68a2e8c8..1adf5a7d 100644
--- a/client/src/shares/UserShares.js
+++ b/client/src/shares/UserShares.js
@@ -62,11 +62,11 @@ export default class UserShares extends Component {
}
}
},
- { icon: 'trash-alt', label: t('Unshare') },
- t('Confirm Unsharing'),
- t('Are you sure you want to remove the sharing of the {{typeName}} "{{name}}"?', {typeName, name}),
- t('Removing sharing of the {{typeName}} "{{name}}"', {typeName, name}),
- t('Sharing of the {{typeName}} "{{name}}" removed', {typeName, name}),
+ { icon: 'trash-alt', label: t('unshare') },
+ t('confirmUnsharing'),
+ t('areYouSureYouWantToRemoveTheSharingOfThe', {typeName, name}),
+ t('removingSharingOfTheTypeNameName', {typeName, name}),
+ t('sharingOfTheTypeNameNameRemoved', {typeName, name}),
null
);
}
@@ -89,15 +89,15 @@ export default class UserShares extends Component {
{tableRestActionDialogRender(this)}
{t('sharesForUserUsername', {username: this.props.user.username})}
- {renderSharesTable('namespace', t('namespaces'), t('namespace-lc'))}
- {renderSharesTable('list', t('lists'), t('list-lc'))}
- {renderSharesTable('template', t('Templates'), t('template-lc'))}
- {renderSharesTable('mosaicoTemplate', t('Mosaico Templates'), t('Mosaico template'))}
- {renderSharesTable('campaign', t('Campaigns'), t('campaign-lc'))}
- {renderSharesTable('customForm', t('customForms-1', t('custom forms')))}
- {renderSharesTable('report', t('reports'), t('report-lc'))}
- {renderSharesTable('reportTemplate', t('reportTemplates'), t('report template'))}
- {renderSharesTable('sendConfiguration', t('Send Configurations'), t('send configuration'))}
+ {renderSharesTable('namespace', t('namespaces'), t('namespace-1'))}
+ {renderSharesTable('list', t('lists'), t('list-1'))}
+ {renderSharesTable('template', t('templates'), t('template-1'))}
+ {renderSharesTable('mosaicoTemplate', t('mosaicoTemplates'), t('mosaicoTemplate'))}
+ {renderSharesTable('campaign', t('campaigns'), t('campaign-1'))}
+ {renderSharesTable('customForm', t('customForms-1', t('customForms-2')))}
+ {renderSharesTable('report', t('reports'), t('report-1'))}
+ {renderSharesTable('reportTemplate', t('reportTemplates'), t('reportTemplate-2'))}
+ {renderSharesTable('sendConfiguration', t('sendConfigurations-1'), t('sendConfiguration-1'))}
);
}
diff --git a/client/src/templates/CUD.js b/client/src/templates/CUD.js
index 974e02bb..7129b86b 100644
--- a/client/src/templates/CUD.js
+++ b/client/src/templates/CUD.js
@@ -144,7 +144,7 @@ export default class CUD extends Component {
}
if (state.getIn(['fromSourceTemplate', 'value']) && !state.getIn(['sourceTemplate', 'value'])) {
- state.setIn(['sourceTemplate', 'error'], t('Source template must not be empty'));
+ state.setIn(['sourceTemplate', 'error'], t('sourceTemplateMustNotBeEmpty'));
} else {
state.setIn(['sourceTemplate', 'error'], null);
}
@@ -181,17 +181,17 @@ export default class CUD extends Component {
if (submitResult) {
if (this.props.entity) {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/templates', 'success', t('Template updated'));
+ this.navigateToWithFlashMessage('/templates', 'success', t('templateUpdated'));
} else {
await this.getFormValuesFromURL(`rest/templates/${this.props.entity.id}`);
this.enableForm();
- this.setFormStatusMessage('success', t('Template updated'));
+ this.setFormStatusMessage('success', t('templateUpdated'));
}
} else {
if (submitAndLeave) {
- this.navigateToWithFlashMessage('/templates', 'success', t('Template created'));
+ this.navigateToWithFlashMessage('/templates', 'success', t('templateCreated'));
} else {
- this.navigateToWithFlashMessage(`/templates/${submitResult}/edit`, 'success', t('Template created'));
+ this.navigateToWithFlashMessage(`/templates/${submitResult}/edit`, 'success', t('templateCreated'));
}
}
} else {
@@ -327,7 +327,7 @@ export default class CUD extends Component {