From 90e4316cfc152323257f092c7002b29252a2339b Mon Sep 17 00:00:00 2001
From: Andrey Meshkov <am@adguard.com>
Date: Wed, 9 Sep 2020 14:50:21 +0300
Subject: [PATCH] * (ui): fix strings
---
client/src/__locales/en.json | 3 +--
client/src/components/Settings/Dns/Upstream/Form.js | 9 +++------
client/src/components/Settings/Dns/Upstream/index.js | 1 -
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json
index 2fe1e760..001b7a09 100644
--- a/client/src/__locales/en.json
+++ b/client/src/__locales/en.json
@@ -132,7 +132,7 @@
"encryption_settings": "Encryption settings",
"dhcp_settings": "DHCP settings",
"upstream_dns": "Upstream DNS servers",
- "upstream_dns_hint": "If you keep this field empty, AdGuard Home will use <a href='https://www.quad9.net/' target='_blank'>Quad9</a> as an upstream.",
+ "upstream_dns_help": "Enter servers addresses one per line. <0>Learn more</0> about configuring upstream DNS servers.",
"upstream_dns_configured_in_file": "Configured in {{path}}",
"test_upstream_btn": "Test upstreams",
"upstreams": "Upstreams",
@@ -579,6 +579,5 @@
"click_to_view_queries": "Click to view queries",
"port_53_faq_link": "Port 53 is often occupied by \"DNSStubListener\" or \"systemd-resolved\" services. Please read <0>this instruction</0> on how to resolve this.",
"adg_will_drop_dns_queries": "AdGuard Home will be dropping all DNS queries from this client.",
- "please_read_wiki": "Please read the wiki",
"experimental": "Experimental"
}
diff --git a/client/src/components/Settings/Dns/Upstream/Form.js b/client/src/components/Settings/Dns/Upstream/Form.js
index 65a41c9f..0ebb6605 100644
--- a/client/src/components/Settings/Dns/Upstream/Form.js
+++ b/client/src/components/Settings/Dns/Upstream/Form.js
@@ -5,7 +5,6 @@ import { Field, reduxForm } from 'redux-form';
import { Trans, useTranslation } from 'react-i18next';
import classnames from 'classnames';
-import i18next from 'i18next';
import Examples from './Examples';
import { renderRadioField, renderTextareaField } from '../../../../helpers/form';
import { DNS_REQUEST_OPTIONS, FORM_NAME, UPSTREAM_CONFIGURATION_WIKI_LINK } from '../../../../helpers/constants';
@@ -13,11 +12,9 @@ import { testUpstream } from '../../../../actions';
import { removeEmptyLines } from '../../../../helpers/helpers';
const Title = () => <label className="form__label" htmlFor="upstream_dns">
- {i18next.t('upstream_dns')}
- <div>
- <a href={UPSTREAM_CONFIGURATION_WIKI_LINK} target="_blank"
- rel="noopener noreferrer">{i18next.t('please_read_wiki')}</a>
- </div>
+ <Trans components={[<a href={UPSTREAM_CONFIGURATION_WIKI_LINK} key="0">link</a>]}>
+ upstream_dns_help
+ </Trans>
</label>;
const getInputFields = (upstream_dns_file) => [
diff --git a/client/src/components/Settings/Dns/Upstream/index.js b/client/src/components/Settings/Dns/Upstream/index.js
index 315a8aea..0342713e 100644
--- a/client/src/components/Settings/Dns/Upstream/index.js
+++ b/client/src/components/Settings/Dns/Upstream/index.js
@@ -36,7 +36,6 @@ const Upstream = () => {
return <Card
title={t('upstream_dns')}
- subtitle={t('upstream_dns_hint')}
bodyType="card-body box-body--settings"
>
<div className="row">