mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix strings

This commit is contained in:
Andrey Meshkov 2018-10-10 17:32:36 +03:00
parent 90bef94500
commit a6172d1966
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/actions/index.js
View File

@ -297,7 +297,7 @@ export const setRules = rules => async (dispatch) => {
.replace(/^\n/g, '') .replace(/^\n/g, '')
.replace(/\n\s*\n/g, '\n'); .replace(/\n\s*\n/g, '\n');
await apiClient.setRules(replacedLineEndings); await apiClient.setRules(replacedLineEndings);
dispatch(addSuccessToast('Custom rules saved')); dispatch(addSuccessToast('Updated the custom filtering rules'));
dispatch(setRulesSuccess()); dispatch(setRulesSuccess());
} catch (error) { } catch (error) {
dispatch(addErrorToast({ error })); dispatch(addErrorToast({ error }));
@ -456,7 +456,7 @@ export const setUpstream = url => async (dispatch) => {
dispatch(setUpstreamRequest()); dispatch(setUpstreamRequest());
try { try {
await apiClient.setUpstream(url); await apiClient.setUpstream(url);
dispatch(addSuccessToast('Upstream DNS servers saved')); dispatch(addSuccessToast('Updated the upstream DNS servers'));
dispatch(setUpstreamSuccess()); dispatch(setUpstreamSuccess());
} catch (error) { } catch (error) {
dispatch(addErrorToast({ error })); dispatch(addErrorToast({ error }));

2
client/src/components/Dashboard/Clients.js
View File

@ -15,7 +15,7 @@ const Clients = props => (
Header: 'IP', Header: 'IP',
accessor: 'ip', accessor: 'ip',
}, { }, {
Header: 'Request count', Header: 'Requests count',
accessor: 'count', accessor: 'count',
}]} }]}
showPagination={false} showPagination={false}

2
client/src/components/Dashboard/QueriedDomains.js
View File

@ -15,7 +15,7 @@ const QueriedDomains = props => (
Header: 'IP', Header: 'IP',
accessor: 'ip', accessor: 'ip',
}, { }, {
Header: 'Request count', Header: 'Requests count',
accessor: 'count', accessor: 'count',
}]} }]}
showPagination={false} showPagination={false}

6
client/src/components/Filters/index.js
View File

@ -39,11 +39,11 @@ class Filters extends Component {
width: 90, width: 90,
className: 'text-center', className: 'text-center',
}, { }, {
Header: 'Filter name', Header: 'Name',
accessor: 'name', accessor: 'name',
Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>), 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', 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>), 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', accessor: 'rulesCount',
className: 'text-center', className: 'text-center',
}, { }, {
Header: 'Last time update', Header: 'Last time updated',
accessor: 'lastUpdated', accessor: 'lastUpdated',
className: 'text-center', className: 'text-center',
}, { }, {

4
client/src/components/Logs/index.js
View File

@ -51,10 +51,10 @@ class Logs extends Component {
if (userRules.match(preparedBlockingRule)) { if (userRules.match(preparedBlockingRule)) {
this.props.setRules(userRules.replace(`${blockingRule}`, '')); 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)) { } else if (!userRules.match(preparedUnblockingRule)) {
this.props.setRules(`${userRules}${lineEnding}${unblockingRule}\n`); 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(); this.props.getFilteringStatus();