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

Merge pull request #139 in DNS/adguard-dns from fix/559 to master 

* commit '297a1c7fa53910e38c041ed2c430ff27b0509213':
  Added regex example to the "Custom filtering rules" settings
This commit is contained in:
Andrey Meshkov 2019-01-25 18:43:47 +03:00
parent f1c3fecfb2 297a1c7fa5
commit c9d627ea71
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,6 +115,7 @@
"example_comment": "! Here goes a comment",
"example_comment_meaning": "just a comment",
"example_comment_hash": "# Also a comment",
"example_regex_meaning": "block access to the domains matching the specified regular expression",
"example_upstream_regular": "regular DNS (over UDP)",
"example_upstream_dot": "encrypted <a href='https:\/\/en.wikipedia.org\/wiki\/DNS_over_TLS' target='_blank'>DNS-over-TLS<\/a>",
"example_upstream_doh": "encrypted <a href='https:\/\/en.wikipedia.org\/wiki\/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS<\/a>",

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

@ -52,6 +52,9 @@ class UserRules extends Component {
<li>
<code>{ t('example_comment_hash') }</code> - { t('example_comment_meaning') }
</li>
<li>
<code>/REGEX/</code> - { t('example_regex_meaning') }
</li>
</ol>
</div>
</Card>