daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: all: use "ClientID" consistently

Browse Source 
Closes #4242.
Updates #4244.

Squashed commit of the following:

commit 3a2296a7a70006cf6777e54ce1e2fc3559aec5be
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Feb 9 21:23:43 2022 +0300

    client: imp more

commit 3aacc8696ac694ff459fd33ba7beeeabd2569a55
Merge: b28a120f 2a5b5f19
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Feb 9 21:21:59 2022 +0300

    Merge branch 'master' into 4244-imp-i18n

commit b28a120fe9aa68507b173717059b7b259097d6a4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Feb 9 14:49:49 2022 +0300

    client: imp texts more

commit c1fa6ca336f2d5bdcc67836f348be4843a0a8f79
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Feb 8 21:12:15 2022 +0300

    all: use "ClientID" consistently
This commit is contained in:
Ainar Garipov
2022-02-10 15:42:59 +03:00
parent 2a5b5f1927
commit f53f48cc33
21 changed files with 142 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/components/Filters/Examples.js
View File

@@ -7,27 +7,27 @@ const Examples = () => (
<Trans>examples_title</Trans>:
<ol className="leading-loose">
<li>
<code>||example.org^</code> –&nbsp;
<code>||example.org^</code>:
<Trans>example_meaning_filter_block</Trans>
</li>
<li>
<code> @@||example.org^</code> –&nbsp;
<code> @@||example.org^</code>:
<Trans>example_meaning_filter_whitelist</Trans>
</li>
<li>
<code>127.0.0.1 example.org</code> –&nbsp;
<code>127.0.0.1 example.org</code>:
<Trans>example_meaning_host_block</Trans>
</li>
<li>
<code><Trans>example_comment</Trans></code> –&nbsp;
<code><Trans>example_comment</Trans></code>:
<Trans>example_comment_meaning</Trans>
</li>
<li>
<code><Trans>example_comment_hash</Trans></code> –&nbsp;
<code><Trans>example_comment_hash</Trans></code>:
<Trans>example_comment_meaning</Trans>
</li>
<li>
<code>/REGEX/</code> –&nbsp;
<code>/REGEX/</code>:
<Trans>example_regex_meaning</Trans>
</li>
</ol>

10
client/src/components/Settings/Clients/Form.js
View File

@@ -19,7 +19,7 @@ import {
renderServiceField,
} from '../../../helpers/form';
import { validateClientId, validateRequiredValue } from '../../../helpers/validators';
import { FORM_NAME, SERVICES } from '../../../helpers/constants';
import { CLIENT_ID_LINK, FORM_NAME, SERVICES } from '../../../helpers/constants';
import './Service.css';
const settingsCheckboxes = [
@@ -281,11 +281,11 @@ let Form = (props) => {
</div>
<div className="form__desc mt-0">
<Trans
components={[
<a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Clients#idclient" key="0" target="_blank" rel="noopener noreferrer">
link
components={{
a: <a href={CLIENT_ID_LINK} target="_blank" rel="noopener noreferrer">
text
</a>,
]}
}}
>
client_identifier_desc
</Trans>

4
client/src/components/Settings/Dns/Access/Form.js
View File

@@ -9,7 +9,7 @@ import {
trimMultilineString,
removeEmptyLines,
} from '../../../../helpers/helpers';
import { FORM_NAME } from '../../../../helpers/constants';
import { CLIENT_ID_LINK, FORM_NAME } from '../../../../helpers/constants';
const fields = [
{
@@ -48,7 +48,7 @@ let Form = (props) => {
</>}
</label>
<div className="form__desc form__desc--top">
<Trans>{subtitle}</Trans>
<Trans components={{ a: <a href={CLIENT_ID_LINK} target="_blank" rel="noopener noreferrer">text</a> }}>{subtitle}</Trans>
</div>
<Field
id={id}

18
client/src/components/Settings/Dns/Upstream/Examples.js
View File

@@ -8,10 +8,10 @@ const Examples = (props) => (
<Trans>examples_title</Trans>:
<ol className="leading-loose">
<li>
<code>94.140.14.140</code> - {props.t('example_upstream_regular')}
<code>94.140.14.140</code>: {props.t('example_upstream_regular')}
</li>
<li>
<code>tls://dns-unfiltered.adguard.com</code> –&nbsp;
<code>tls://dns-unfiltered.adguard.com</code>:
<span>
<Trans
components={[
@@ -30,7 +30,7 @@ const Examples = (props) => (
</span>
</li>
<li>
<code>https://dns-unfiltered.adguard.com/dns-query</code> –&nbsp;
<code>https://dns-unfiltered.adguard.com/dns-query</code>:
<span>
<Trans
components={[
@@ -49,7 +49,7 @@ const Examples = (props) => (
</span>
</li>
<li>
<code>quic://dns-unfiltered.adguard.com:784</code> –&nbsp;
<code>quic://dns-unfiltered.adguard.com:784</code>:
<span>
<Trans
components={[
@@ -65,15 +65,13 @@ const Examples = (props) => (
>
example_upstream_doq
</Trans>
&nbsp;
<span className="text-lowercase">(<Trans>experimental</Trans>)</span>
</span>
</li>
<li>
<code>tcp://94.140.14.140</code> – <Trans>example_upstream_tcp</Trans>
<code>tcp://94.140.14.140</code>: <Trans>example_upstream_tcp</Trans>
</li>
<li>
<code>sdns://...</code> –&nbsp;
<code>sdns://...</code>:
<span>
<Trans
components={[
@@ -108,7 +106,7 @@ const Examples = (props) => (
</span>
</li>
<li>
<code>[/example.local/]94.140.14.140</code> –&nbsp;
<code>[/example.local/]94.140.14.140</code>:
<span>
<Trans
components={[
@@ -127,7 +125,7 @@ const Examples = (props) => (
</span>
</li>
<li>
<code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code> –&nbsp;
<code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>:
<span>
<Trans>example_upstream_comment</Trans>
</span>

2
client/src/components/Settings/Encryption/Form.js
View File

@@ -201,8 +201,6 @@ let Form = (props) => {
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="port_dns_over_quic">
<Trans>encryption_doq</Trans>
&nbsp;
<span className="text-lowercase">(<Trans>experimental</Trans>)</span>
</label>
<Field
id="port_dns_over_quic"

9
client/src/components/ui/Guide/MobileConfigForm.js
View File

@@ -7,7 +7,12 @@ import i18next from 'i18next';
import cn from 'classnames';
import { getPathWithQueryString } from '../../../helpers/helpers';
import { FORM_NAME, MOBILE_CONFIG_LINKS, STANDARD_HTTPS_PORT } from '../../../helpers/constants';
import {
CLIENT_ID_LINK,
FORM_NAME,
MOBILE_CONFIG_LINKS,
STANDARD_HTTPS_PORT,
} from '../../../helpers/constants';
import {
renderInputField,
renderSelectField,
@@ -62,7 +67,7 @@ const MobileConfigForm = ({ invalid }) => {
const githubLink = (
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/Clients#idclient"
href={CLIENT_ID_LINK}
target="_blank"
rel="noopener noreferrer"
>