a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix strings

This commit is contained in:
Andrey Meshkov 2018-10-10 17:24:12 +03:00
parent 945bd24f67
commit 90bef94500
9 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import map from 'lodash/map';
import Card from '../ui/Card'; import Card from '../ui/Card';
const Clients = props => ( const Clients = props => (
<Card title="Top blocked domains" subtitle="in the last 24 hours" bodyType="card-table" refresh={props.refreshButton}> <Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<ReactTable <ReactTable
data={map(props.topBlockedDomains, (value, prop) => ( data={map(props.topBlockedDomains, (value, prop) => (
{ ip: prop, domain: value } { ip: prop, domain: value }

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

@ -6,7 +6,7 @@ import map from 'lodash/map';
import Card from '../ui/Card'; import Card from '../ui/Card';
const Clients = props => ( const Clients = props => (
<Card title="Top clients" subtitle="in the last 24 hours" bodyType="card-table" refresh={props.refreshButton}> <Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<ReactTable <ReactTable
data={map(props.topClients, (value, prop) => ( data={map(props.topClients, (value, prop) => (
{ ip: prop, count: value } { ip: prop, count: value }

10
client/src/components/Dashboard/Counters.js
View File

@ -7,13 +7,13 @@ import Tooltip from '../ui/Tooltip';
const tooltipType = 'tooltip-custom--narrow'; const tooltipType = 'tooltip-custom--narrow';
const Counters = props => ( const Counters = props => (
<Card title="General statistics" subtitle="in the last 24 hours" bodyType="card-table" refresh={props.refreshButton}> <Card title="General statistics" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<table className="table card-table"> <table className="table card-table">
<tbody> <tbody>
<tr> <tr>
<td> <td>
DNS Queries DNS Queries
<Tooltip text="A number of DNS quieries processed in the last 24 hours" type={tooltipType} /> <Tooltip text="A number of DNS quieries processed for the last 24 hours" type={tooltipType} />
</td> </td>
<td className="text-right"> <td className="text-right">
<span className="text-muted"> <span className="text-muted">
@ -23,8 +23,8 @@ const Counters = props => (
</tr> </tr>
<tr> <tr>
<td> <td>
Blocked by filters Blocked by <a href="#filters">Filters</a>
<Tooltip text="A number of DNS requests blocked by filters" type={tooltipType} /> <Tooltip text="A number of DNS requests blocked by adblock filters and hosts blocklists" type={tooltipType} />
</td> </td>
<td className="text-right"> <td className="text-right">
<span className="text-muted"> <span className="text-muted">
@ -35,7 +35,7 @@ const Counters = props => (
<tr> <tr>
<td> <td>
Blocked malware/phishing Blocked malware/phishing
<Tooltip text="A number of DNS requests blocked" type={tooltipType} /> <Tooltip text="A number of DNS requests blocked by the AdGuard browsing security module" type={tooltipType} />
</td> </td>
<td className="text-right"> <td className="text-right">
<span className="text-muted"> <span className="text-muted">

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

@ -6,7 +6,7 @@ import map from 'lodash/map';
import Card from '../ui/Card'; import Card from '../ui/Card';
const QueriedDomains = props => ( const QueriedDomains = props => (
<Card title="Top queried domains" subtitle="in the last 24 hours" bodyType="card-table" refresh={props.refreshButton}> <Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<ReactTable <ReactTable
data={map(props.topQueriedDomains, (value, prop) => ( data={map(props.topQueriedDomains, (value, prop) => (
{ ip: prop, count: value } { ip: prop, count: value }

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

@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
import Card from '../ui/Card'; import Card from '../ui/Card';
const Statistics = props => ( const Statistics = props => (
<Card title="Statistics" subtitle="Last 24 hours" bodyType="card-graph" refresh={props.refreshButton}> <Card title="Statistics" subtitle="for the last 24 hours" bodyType="card-graph" refresh={props.refreshButton}>
{props.history ? {props.history ?
<ResponsiveLine <ResponsiveLine
data={props.history} data={props.history}

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

@ -73,7 +73,7 @@ class Filters extends Component {
<div className="row"> <div className="row">
<div className="col-md-12"> <div className="col-md-12">
<Card <Card
title="Blocking filters and hosts files" title="Filters and hosts blocklists"
subtitle="AdGuard DNS understands basic adblock rules and hosts files syntax." subtitle="AdGuard DNS understands basic adblock rules and hosts files syntax."
> >
<ReactTable <ReactTable
@ -104,7 +104,7 @@ class Filters extends Component {
addFilter={this.props.addFilter} addFilter={this.props.addFilter}
isFilterAdded={this.props.filtering.isFilterAdded} isFilterAdded={this.props.filtering.isFilterAdded}
title="New filter subscription" title="New filter subscription"
inputDescription="Enter valid URL or file path of the filter into field above. You will be subscribed to that filter." inputDescription="Enter a valid URL to a filter subscription or a hosts file."
/> />
</div> </div>
); );

2
client/src/components/Settings/Upstream.js
View File

@ -27,7 +27,7 @@ export default class Upstream extends Component {
return ( return (
<Card <Card
title="Upstream DNS servers" title="Upstream DNS servers"
subtitle="If you keep this field empty, AdGuard will use <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> as an upstream." subtitle="If you keep this field empty, AdGuard will use <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> as an upstream. Use tls:// prefix for DNS over TLS servers."
bodyType="card-body box-body--settings" bodyType="card-body box-body--settings"
> >
<div className="row"> <div className="row">

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

@ -17,7 +17,7 @@ export default class Settings extends Component {
safebrowsing: { safebrowsing: {
enabled: false, enabled: false,
title: 'Use AdGuard browsing security web service', title: 'Use AdGuard browsing security web service',
subtitle: 'AdGuard DNS will check if domain is blacklisted by the browsing security web service (sb.adtidy.org). It will use privacy-safe lookup API to do the check.', subtitle: 'AdGuard DNS will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.',
}, },
parental: { parental: {
enabled: false, enabled: false,
@ -27,7 +27,7 @@ export default class Settings extends Component {
safesearch: { safesearch: {
enabled: false, enabled: false,
title: 'Enforce safe search', title: 'Enforce safe search',
subtitle: 'AdGuard DNS can enforce safe search in the major search engines: Google, Bing, Yandex.', subtitle: 'AdGuard DNS can enforce safe search in the following search engines: Google, Bing, Yandex.',
}, },
}; };

6
coredns_plugin/querylog_top.go
View File

@ -19,12 +19,6 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
) )
// top domains/clients/blocked stats in the last 24 hours
// on start we read the saved stats from the last 24 hours and add them to the stats
// stats are counted using hourly LRU, rotating hourly and keeping last 24 hours
type hourTop struct { type hourTop struct {
domains gcache.Cache domains gcache.Cache
blocked gcache.Cache blocked gcache.Cache