From a993c06aafaeed129a14e3250621eab3f10b67b7 Mon Sep 17 00:00:00 2001 From: Tomas Bures Date: Thu, 22 Nov 2018 11:32:30 +0100 Subject: [PATCH] Updates in translations --- client/src/blacklist/List.js | 8 +++---- client/src/lists/segments/helpers.js | 10 ++++---- client/src/lists/subscriptions/List.js | 16 ++++++------- locales/en/common.json | 32 ++++++++++++++++++-------- 4 files changed, 39 insertions(+), 27 deletions(-) diff --git a/client/src/blacklist/List.js b/client/src/blacklist/List.js index 07061b75..eacb4224 100644 --- a/client/src/blacklist/List.js +++ b/client/src/blacklist/List.js @@ -106,10 +106,10 @@ export default class List extends Component { actions, this, { method: HTTPMethod.DELETE, url: `rest/blacklist/${email}`}, { icon: 'remove', label: t('removeFromBlacklist') }, - t('Confirm Removal From Blacklist'), - t('Are you sure you want to remove {{email}} from the blacklist?', {email}), - t('Removing {{email}} from the blacklist', {email}), - t('{{email}} removed from the blacklist', {email}), + t('confirmRemovalFromBlacklist'), + t('areYouSureYouWantToRemoveEmailFromThe', {email}), + t('removingEmailFromTheBlacklist', {email}), + t('emailRemovedFromTheBlacklist', {email}), null ); diff --git a/client/src/lists/segments/helpers.js b/client/src/lists/segments/helpers.js index de19d765..aa4c5846 100644 --- a/client/src/lists/segments/helpers.js +++ b/client/src/lists/segments/helpers.js @@ -129,23 +129,23 @@ export function getRuleHelpers(t, fields) { }, eqTodayPlusDays: { dropdownLabel: t('onXthDayBeforeafterCurrentDate'), - treeLabel: rule => getRelativeDateTreeLabel(rule, [tMark('dateInColumnColNameIsTheCurrentDate'), tMark('dateInColumnColNameIsValuethDayAfterThe'), tMark('dateInColumnColNameIsValuethDayBeforeThe')]), + treeLabel: rule => getRelativeDateTreeLabel(rule, [tMark('dateInColumnColNameIsTheCurrentDate'), tMark('dateInColumnColNameIsTheValuethDayAfter'), tMark('dateInColumnColNameIsTheValuethDayBefore')]), }, ltTodayPlusDays: { dropdownLabel: t('beforeXthDayBeforeafterCurrentDate'), - treeLabel: rule => getRelativeDateTreeLabel(rule, [tMark('dateInColumnColNameIsBeforeTheCurrent'), tMark('dateInColumnColNameIsBeforeValuethDay'), tMark('dateInColumnColNameIsBeforeValuethDay-1')]), + treeLabel: rule => getRelativeDateTreeLabel(rule, [tMark('dateInColumnColNameIsBeforeTheCurrent'), tMark('dateInColumnColNameIsBeforeTheValuethDay'), tMark('dateInColumnColNameIsBeforeTheValuethDay-1')]), }, leTodayPlusDays: { dropdownLabel: t('beforeOrOnXthDayBeforeafterCurrentDate'), - treeLabel: rule => getRelativeDateTreeLabel(rule, [tMark('dateInColumnColNameIsBeforeOrOnThe'), tMark('dateInColumnColNameIsBeforeOrOnValueth'), tMark('dateInColumnColNameIsBeforeOrOnValueth-1')]), + treeLabel: rule => getRelativeDateTreeLabel(rule, [tMark('dateInColumnColNameIsBeforeOrOnThe'), tMark('dateInColumnColNameIsBeforeOrOnThe-1'), tMark('dateInColumnColNameIsBeforeOrOnThe-2')]), }, gtTodayPlusDays: { dropdownLabel: t('afterXthDayBeforeafterCurrentDate'), - treeLabel: rule => getRelativeDateTreeLabel(rule, [tMark('dateInColumnColNameIsAfterTheCurrentDate'), tMark('dateInColumnColNameIsAfterValuethDay'), tMark('dateInColumnColNameIsAfterValuethDay-1')]), + treeLabel: rule => getRelativeDateTreeLabel(rule, [tMark('dateInColumnColNameIsAfterTheCurrentDate'), tMark('dateInColumnColNameIsAfterTheValuethDay'), tMark('dateInColumnColNameIsAfterTheValuethDay-1')]), }, geTodayPlusDays: { dropdownLabel: t('afterOrOnXthDayBeforeafterCurrentDate'), - treeLabel: rule => getRelativeDateTreeLabel(rule, [tMark('dateInColumnColNameIsAfterOrOnTheCurrent'), tMark('dateInColumnColNameIsAfterOrOnValuethDay'), tMark('dateInColumnColNameIsAfterOrOnValuethDay-1')]), + treeLabel: rule => getRelativeDateTreeLabel(rule, [tMark('dateInColumnColNameIsAfterOrOnTheCurrent'), tMark('dateInColumnColNameIsAfterOrOnTheValueth'), tMark('dateInColumnColNameIsAfterOrOnTheValueth-1')]), } }; diff --git a/client/src/lists/subscriptions/List.js b/client/src/lists/subscriptions/List.js index 7470d2aa..068557b8 100644 --- a/client/src/lists/subscriptions/List.js +++ b/client/src/lists/subscriptions/List.js @@ -119,10 +119,10 @@ export default class List extends Component { actions, this, { method: HTTPMethod.POST, url: `rest/subscriptions-unsubscribe/${this.props.list.id}/${id}`}, { icon: 'off', label: t('unsubscribe') }, - t('Confirm Unsubscription'), - t('Are you sure you want to unsubscribe {{email}}?', {email}), - t('Unsubscribing {{email}}', {email}), - t('{{email}} unsubscribed', {email}), + t('confirmUnsubscription'), + t('areYouSureYouWantToUnsubscribeEmail?', {email}), + t('unsubscribingEmail', {email}), + t('emailUnsubscribed', {email}), null ); } @@ -132,10 +132,10 @@ export default class List extends Component { actions, this, { method: HTTPMethod.POST, url: `rest/blacklist`, data: {email} }, { icon: 'ban-circle', label: t('blacklist') }, - t('Confirm Email Blacklisting'), - t('Are you sure you want to blacklist {{email}}?', {email}), - t('Blacklisting {{email}}', {email}), - t('{{email}} blacklisted', {email}), + t('confirmEmailBlacklisting'), + t('areYouSureYouWantToBlacklistEmail?', {email}), + t('blacklistingEmail', {email}), + t('emailBlacklisted', {email}), null ); } diff --git a/locales/en/common.json b/locales/en/common.json index 943604d2..f1c6cbb7 100644 --- a/locales/en/common.json +++ b/locales/en/common.json @@ -108,6 +108,10 @@ "saving": "Saving ...", "thereAreErrorsInTheFormPleaseFixThemAnd-1": "There are errors in the form. Please fix them and try again.", "removeFromBlacklist": "Remove from blacklist", + "confirmRemovalFromBlacklist": "Confirm Removal From Blacklist", + "areYouSureYouWantToRemoveEmailFromThe": "Are you sure you want to remove {{email}} from the blacklist?", + "removingEmailFromTheBlacklist": "Removing {{email}} from the blacklist", + "emailRemovedFromTheBlacklist": "{{email}} removed from the blacklist", "blacklist": "Blacklist", "addEmailToBlacklist-1": "Add Email to Blacklist", "addToBlacklist": "Add to Blacklist", @@ -559,24 +563,24 @@ "dateInColumnColNameIsAfterOrOnValue": "Date in column \"{{colName}}\" is after or on {{value}}", "onXthDayBeforeafterCurrentDate": "On x-th day before/after current date", "dateInColumnColNameIsTheCurrentDate": "Date in column \"{{colName}}\" is the current date", - "dateInColumnColNameIsValuethDayAfterThe": "Date in column \"{{colName}}\" is the {{value}}-th day after the current date", - "dateInColumnColNameIsValuethDayBeforeThe": "Date in column \"{{colName}}\" is the {{value}}-th day before the current date", + "dateInColumnColNameIsTheValuethDayAfter": "Date in column \"{{colName}}\" is the {{value}}-th day after the current date", + "dateInColumnColNameIsTheValuethDayBefore": "Date in column \"{{colName}}\" is the {{value}}-th day before the current date", "beforeXthDayBeforeafterCurrentDate": "Before x-th day before/after current date", "dateInColumnColNameIsBeforeTheCurrent": "Date in column \"{{colName}}\" is before the current date", - "dateInColumnColNameIsBeforeValuethDay": "Date in column \"{{colName}}\" is before the {{value}}-th day after the current date", - "dateInColumnColNameIsBeforeValuethDay-1": "Date in column \"{{colName}}\" is before the {{value}}-th day before the current date", + "dateInColumnColNameIsBeforeTheValuethDay": "Date in column \"{{colName}}\" is before the {{value}}-th day after the current date", + "dateInColumnColNameIsBeforeTheValuethDay-1": "Date in column \"{{colName}}\" is before the {{value}}-th day before the current date", "beforeOrOnXthDayBeforeafterCurrentDate": "Before or on x-th day before/after current date", "dateInColumnColNameIsBeforeOrOnThe": "Date in column \"{{colName}}\" is before or on the current date", - "dateInColumnColNameIsBeforeOrOnValueth": "Date in column \"{{colName}}\" is before or on the {{value}}-th day after the current date", - "dateInColumnColNameIsBeforeOrOnValueth-1": "Date in column \"{{colName}}\" is before or on the {{value}}-th day before the current date", + "dateInColumnColNameIsBeforeOrOnThe-1": "Date in column \"{{colName}}\" is before or on the {{value}}-th day after the current date", + "dateInColumnColNameIsBeforeOrOnThe-2": "Date in column \"{{colName}}\" is before or on the {{value}}-th day before the current date", "afterXthDayBeforeafterCurrentDate": "After x-th day before/after current date", "dateInColumnColNameIsAfterTheCurrentDate": "Date in column \"{{colName}}\" is after the current date", - "dateInColumnColNameIsAfterValuethDay": "Date in column \"{{colName}}\" is after the {{value}}-th day after the current date", - "dateInColumnColNameIsAfterValuethDay-1": "Date in column \"{{colName}}\" is after the {{value}}-th day before the current date", + "dateInColumnColNameIsAfterTheValuethDay": "Date in column \"{{colName}}\" is after the {{value}}-th day after the current date", + "dateInColumnColNameIsAfterTheValuethDay-1": "Date in column \"{{colName}}\" is after the {{value}}-th day before the current date", "afterOrOnXthDayBeforeafterCurrentDate": "After or on x-th day before/after current date", "dateInColumnColNameIsAfterOrOnTheCurrent": "Date in column \"{{colName}}\" is after or on the current date", - "dateInColumnColNameIsAfterOrOnValuethDay": "Date in column \"{{colName}}\" is after or on the {{value}}-th day after the current date", - "dateInColumnColNameIsAfterOrOnValuethDay-1": "Date in column \"{{colName}}\" is after or on the {{value}}-th day before the current date", + "dateInColumnColNameIsAfterOrOnTheValueth": "Date in column \"{{colName}}\" is after or on the {{value}}-th day after the current date", + "dateInColumnColNameIsAfterOrOnTheValueth-1": "Date in column \"{{colName}}\" is after or on the {{value}}-th day before the current date", "isSelected": "Is selected", "valueInColumnColNameIsSelected": "Value in column \"{{colName}}\" is selected", "isNotSelected": "Is not selected", @@ -622,6 +626,14 @@ "ifCheckedThenThisSubscriptionCanBeUsed": "If checked then this subscription can be used for previewing campaign messages", "erased": "[ERASED]", "blacklisted": "Blacklisted", + "confirmUnsubscription": "Confirm Unsubscription", + "areYouSureYouWantToUnsubscribeEmail?": "Are you sure you want to unsubscribe {{email}}?", + "unsubscribingEmail": "Unsubscribing {{email}}", + "emailUnsubscribed": "{{email}} unsubscribed", + "confirmEmailBlacklisting": "Confirm Email Blacklisting", + "areYouSureYouWantToBlacklistEmail?": "Are you sure you want to blacklist {{email}}?", + "blacklistingEmail": "Blacklisting {{email}}", + "emailBlacklisted": "{{email}} blacklisted", "allSubscriptions": "All subscriptions", "subscriptionForm": "Subscription Form", "exportAsCsv": "Export as CSV",