From a6172d1966a148cb6e64d7423fb67228981e40f5 Mon Sep 17 00:00:00 2001
From: Andrey Meshkov <am@adguard.com>
Date: Wed, 10 Oct 2018 17:32:36 +0300
Subject: [PATCH] Fix strings
---
client/src/actions/index.js | 4 ++--
client/src/components/Dashboard/Clients.js | 2 +-
client/src/components/Dashboard/QueriedDomains.js | 2 +-
client/src/components/Filters/index.js | 6 +++---
client/src/components/Logs/index.js | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/client/src/actions/index.js b/client/src/actions/index.js
index 015aecd1..cb6cd1ed 100644
--- a/client/src/actions/index.js
+++ b/client/src/actions/index.js
@@ -297,7 +297,7 @@ export const setRules = rules => async (dispatch) => {
.replace(/^\n/g, '')
.replace(/\n\s*\n/g, '\n');
await apiClient.setRules(replacedLineEndings);
- dispatch(addSuccessToast('Custom rules saved'));
+ dispatch(addSuccessToast('Updated the custom filtering rules'));
dispatch(setRulesSuccess());
} catch (error) {
dispatch(addErrorToast({ error }));
@@ -456,7 +456,7 @@ export const setUpstream = url => async (dispatch) => {
dispatch(setUpstreamRequest());
try {
await apiClient.setUpstream(url);
- dispatch(addSuccessToast('Upstream DNS servers saved'));
+ dispatch(addSuccessToast('Updated the upstream DNS servers'));
dispatch(setUpstreamSuccess());
} catch (error) {
dispatch(addErrorToast({ error }));
diff --git a/client/src/components/Dashboard/Clients.js b/client/src/components/Dashboard/Clients.js
index ab36fa90..a3f4ae14 100644
--- a/client/src/components/Dashboard/Clients.js
+++ b/client/src/components/Dashboard/Clients.js
@@ -15,7 +15,7 @@ const Clients = props => (
Header: 'IP',
accessor: 'ip',
}, {
- Header: 'Request count',
+ Header: 'Requests count',
accessor: 'count',
}]}
showPagination={false}
diff --git a/client/src/components/Dashboard/QueriedDomains.js b/client/src/components/Dashboard/QueriedDomains.js
index e8d2fcff..fd756e0e 100644
--- a/client/src/components/Dashboard/QueriedDomains.js
+++ b/client/src/components/Dashboard/QueriedDomains.js
@@ -15,7 +15,7 @@ const QueriedDomains = props => (
Header: 'IP',
accessor: 'ip',
}, {
- Header: 'Request count',
+ Header: 'Requests count',
accessor: 'count',
}]}
showPagination={false}
diff --git a/client/src/components/Filters/index.js b/client/src/components/Filters/index.js
index 043f0c5c..e2692aaa 100644
--- a/client/src/components/Filters/index.js
+++ b/client/src/components/Filters/index.js
@@ -39,11 +39,11 @@ class Filters extends Component {
width: 90,
className: 'text-center',
}, {
- Header: 'Filter name',
+ Header: 'Name',
accessor: 'name',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
}, {
- Header: 'Host file URL',
+ Header: 'Filter URL',
accessor: 'url',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><a href={value} target='_blank' rel='noopener noreferrer' className="link logs__text">{value}</a></div>),
}, {
@@ -51,7 +51,7 @@ class Filters extends Component {
accessor: 'rulesCount',
className: 'text-center',
}, {
- Header: 'Last time update',
+ Header: 'Last time updated',
accessor: 'lastUpdated',
className: 'text-center',
}, {
diff --git a/client/src/components/Logs/index.js b/client/src/components/Logs/index.js
index ad9a405d..343c1f1a 100644
--- a/client/src/components/Logs/index.js
+++ b/client/src/components/Logs/index.js
@@ -51,10 +51,10 @@ class Logs extends Component {
if (userRules.match(preparedBlockingRule)) {
this.props.setRules(userRules.replace(`${blockingRule}`, ''));
- this.props.addSuccessToast(`Removing rule from custom list: ${blockingRule}`);
+ this.props.addSuccessToast(`Rule removed from the custom filtering rules: ${blockingRule}`);
} else if (!userRules.match(preparedUnblockingRule)) {
this.props.setRules(`${userRules}${lineEnding}${unblockingRule}\n`);
- this.props.addSuccessToast(`Adding rule to custom list: ${unblockingRule}`);
+ this.props.addSuccessToast(`Rule added to the custom filtering rules: ${unblockingRule}`);
}
this.props.getFilteringStatus();