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

Merge: + client: add link to the DNS filterting rules article 

Closes #721

* commit '3a5f9a7ad35aa7f0f0dc5eac5dfcb9b9a3276fc0':
  + client: add link to the DNS filterting rules article
This commit is contained in:
Ildar Kamalov 2019-07-08 18:05:02 +03:00
parent bcbfa43ea2 3a5f9a7ad3
commit 26db906e54
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/__locales/en.json
View File

@ -139,7 +139,7 @@
"example_comment": "! Here goes a comment", "example_comment": "! Here goes a comment",
"example_comment_meaning": "just a comment", "example_comment_meaning": "just a comment",
"example_comment_hash": "# Also a comment", "example_comment_hash": "# Also a comment",
"example_regex_meaning": "block access to the domains matching the specified regular expression", "example_regex_meaning": "block access to the domains matching the <0>specified regular expression</0>",
"example_upstream_regular": "regular DNS (over UDP)", "example_upstream_regular": "regular DNS (over UDP)",
"example_upstream_dot": "encrypted <0>DNS-over-TLS<\/0>", "example_upstream_dot": "encrypted <0>DNS-over-TLS<\/0>",
"example_upstream_doh": "encrypted <0>DNS-over-HTTPS<\/0>", "example_upstream_doh": "encrypted <0>DNS-over-HTTPS<\/0>",

40
client/src/components/Filters/UserRules.js
View File

@ -17,12 +17,13 @@ class UserRules extends Component {
render() { render() {
const { t } = this.props; const { t } = this.props;
return ( return (
<Card <Card title={t('custom_filter_rules')} subtitle={t('custom_filter_rules_hint')}>
title={ t('custom_filter_rules') }
subtitle={ t('custom_filter_rules_hint') }
>
<form onSubmit={this.handleSubmit}> <form onSubmit={this.handleSubmit}>
<textarea className="form-control form-control--textarea-large" value={this.props.userRules} onChange={this.handleChange} /> <textarea
className="form-control form-control--textarea-large"
value={this.props.userRules}
onChange={this.handleChange}
/>
<div className="card-actions"> <div className="card-actions">
<button <button
className="btn btn-success btn-standard" className="btn btn-success btn-standard"
@ -33,27 +34,42 @@ class UserRules extends Component {
</button> </button>
</div> </div>
</form> </form>
<hr/> <hr />
<div className="list leading-loose"> <div className="list leading-loose">
<Trans>examples_title</Trans>: <Trans>examples_title</Trans>:
<ol className="leading-loose"> <ol className="leading-loose">
<li> <li>
<code>||example.org^</code> - { t('example_meaning_filter_block') } <code>||example.org^</code> – {t('example_meaning_filter_block')}
</li> </li>
<li> <li>
<code> @@||example.org^</code> - { t('example_meaning_filter_whitelist') } <code> @@||example.org^</code> – {t('example_meaning_filter_whitelist')}
</li> </li>
<li> <li>
<code>127.0.0.1 example.org</code> - { t('example_meaning_host_block') } <code>127.0.0.1 example.org</code> – {t('example_meaning_host_block')}
</li> </li>
<li> <li>
<code>{ t('example_comment') }</code> - { t('example_comment_meaning') } <code>{t('example_comment')}</code> – {t('example_comment_meaning')}
</li> </li>
<li> <li>
<code>{ t('example_comment_hash') }</code> - { t('example_comment_meaning') } <code>{t('example_comment_hash')}</code> –&nbsp;
{t('example_comment_meaning')}
</li> </li>
<li> <li>
<code>/REGEX/</code> - { t('example_regex_meaning') } <code>/REGEX/</code> –&nbsp;
<Trans
components={[
<a
href="https://kb.adguard.com/general/dns-filtering-syntax"
target="_blank"
rel="noopener noreferrer"
key="0"
>
link
</a>,
]}
>
example_regex_meaning
</Trans>
</li> </li>
</ol> </ol>
</div> </div>