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

Updates in translation

Browse source
This commit is contained in:
Tomas Bures 2018-11-22 00:16:14 +03:00
parent 92ca1c0f28
commit c784d2fbb6
6 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/src/lib/i18n.js
View file

@ -93,3 +93,6 @@ export function withTranslation(opts) {
}
}
export function tMark(key) {
return key;
}

4
client/src/lists/forms/CUD.js
View file

@ -209,7 +209,7 @@ export default class CUD extends Component {
help: helpMjmlGeneral
},
web_privacy_policy_notice: {
label: t('Privacy policy'),
label: t('privacyPolicy'),
mode: 'html',
help: helpMjmlGeneral
}
@ -261,7 +261,7 @@ export default class CUD extends Component {
]
},
gdpr: {
label: t('Data protection'),
label: t('dataProtection'),
options: [
'web_privacy_policy_notice'
]

2
client/src/lists/imports/CUD.js
View file

@ -410,7 +410,7 @@ export default class CUD extends Component {
saveButtons.push(<Button key="default" type="submit" className="btn-primary" icon="ok" label={t('saveAndEditSettings')}/>);
} else {
saveButtons.push(<Button key="default" type="submit" className="btn-primary" icon="ok" label={t('save')}/>);
saveButtons.push(<Button key="saveAndRun" className="btn-primary" icon="ok" label={t('Save and Run')} onClickAsync={async () => await this.save(true)}/>);
saveButtons.push(<Button key="saveAndRun" className="btn-primary" icon="ok" label={t('saveAndRun')} onClickAsync={async () => await this.save(true)}/>);
}
return (

4
client/src/lists/segments/helpers.js
View file

@ -3,7 +3,7 @@
import React from 'react';
import {DatePicker, Dropdown, InputField} from "../../lib/form";
import { parseDate, parseBirthday, formatDate, formatBirthday, DateFormat, birthdayYear, getDateFormatString, getBirthdayFormatString } from '../../../../shared/date';
import { tMark } from "../../lib/i18n";
export function getRuleHelpers(t, fields) {
@ -102,7 +102,7 @@ export function getRuleHelpers(t, fields) {
} else if (rule.value > 0) {
return t(variants[1], {colName: ruleHelpers.getColumnName(rule.column), value: rule.value});
} else {
return t(variants[2], {colName: ruleHelpers.getColumnName(rule.column), value: rule.value});
return t(variants[2], {colName: ruleHelpers.getColumnName(rule.column), value: -rule.value});
}
}

2
client/src/lists/subscriptions/List.js
View file

@ -91,7 +91,7 @@ export default class List extends Component {
const columns = [
{ data: 1, title: t('id'), render: data => <code>{data}</code> },
{ data: 2, title: t('email'), render: data => data === null ? <span className={listStyles.erased}>{t('[ERASED]')}</span> : data },
{ data: 2, title: t('email'), render: data => data === null ? <span className={listStyles.erased}>{t('erased')}</span> : data },
{ data: 3, title: t('status'), render: (data, display, rowData) => this.subscriptionStatusLabels[data] + (rowData[5] ? ', ' + t('blacklisted') : '') },
{ data: 4, title: t('created'), render: data => data ? moment(data).fromNow() : '' }
];

9
locales/en/common.json
View file

@ -429,10 +429,12 @@
"mailUnsubscriptionConfirmedMjml": "Mail - Unsubscription Confirmed (MJML)",
"mailUnsubscriptionConfirmedText": "Mail - Unsubscription Confirmed (Text)",
"webManualUnsubscribeNotice": "Web - Manual Unsubscribe Notice",
"privacyPolicy": "Privacy policy",
"general": "General",
"subscribe": "Subscribe",
"manage": "Manage",
"unsubscribe": "Unsubscribe",
"dataProtection": "Data protection",
"listOfErrorsInTemplates": "List of errors in templates",
"formsSaved": "Forms saved",
"deletingForm": "Deleting form ...",
@ -457,6 +459,7 @@
"checkImportedEmails": "Check imported emails",
"mapping": "Mapping",
"saveAndEditSettings": "Save and edit settings",
"saveAndRun": "Save and Run",
"deletingImport": "Deleting import ...",
"importDeleted": "Import deleted",
"editImport": "Edit Import",
@ -555,22 +558,17 @@
"afterOrOn": "After or on",
"dateInColumnColNameIsAfterOrOnValue": "Date in column \"{{colName}}\" is after or on {{value}}",
"onXthDayBeforeafterCurrentDate": "On x-th day before/after current date",
"dateInColumnIsTheCurrentDate": "Date in column is the current date",
"dateInColumnIsValuethDayAfterTheCurrent": "Date in column is {{value}}-th day after the current date",
"dateInColumnIsValuethDayBeforeTheCurrent": "Date in column is {{value}}-th day before the current date",
"beforeXthDayBeforeafterCurrentDate": "Before x-th day before/after current date",
"dateInColumnIsBeforeTheCurrentDate": "Date in column is before the current date",
"dateInColumnIsBeforeValuethDayAfterThe": "Date in column is before {{value}}-th day after the current date",
"dateInColumnIsBeforeValuethDayBeforeThe": "Date in column is before {{value}}-th day before the current date",
"beforeOrOnXthDayBeforeafterCurrentDate": "Before or on x-th day before/after current date",
"dateInColumnIsBeforeOrOnTheCurrentDate": "Date in column is before or on the current date",
"dateInColumnIsBeforeOrOnValuethDayAfter": "Date in column is before or on {{value}}-th day after the current date",
"dateInColumnIsBeforeOrOnValuethDayBefore": "Date in column is before or on {{value}}-th day before the current date",
"afterXthDayBeforeafterCurrentDate": "After x-th day before/after current date",
"dateInColumnIsAfterTheCurrentDate": "Date in column is after the current date",
"dateInColumnIsAfterValuethDayAfterThe": "Date in column is after {{value}}-th day after the current date",
"afterOrOnXthDayBeforeafterCurrentDate": "After or on x-th day before/after current date",
"dateInColumnIsAfterOrOnTheCurrentDate": "Date in column is after or on the current date",
"dateInColumnIsAfterOrOnValuethDayAfter": "Date in column is after or on {{value}}-th day after the current date",
"isSelected": "Is selected",
"valueInColumnColNameIsSelected": "Value in column \"{{colName}}\" is selected",
@ -615,6 +613,7 @@
"subscriptionStatus": "Subscription status",
"testUser?": "Test user?",
"ifCheckedThenThisSubscriptionCanBeUsed": "If checked then this subscription can be used for previewing campaign messages",
"erased": "[ERASED]",
"blacklisted": "Blacklisted",
"allSubscriptions": "All subscriptions",
"subscriptionForm": "Subscription Form",