Merge remote-tracking branch 'origin/AG-28194-plain-dns' into AG-2819…

…4-plain-dns
annguyen0 · Dec 8, 2023 · aa5e6e3 · aa5e6e3
2 parents 5038884 + 2b62901
commit aa5e6e3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json
@@ -423,7 +423,8 @@
     "encryption_hostnames": "Hostnames",
     "encryption_reset": "Are you sure you want to reset encryption settings?",
     "encryption_warning": "Warning",
-    "encryption_serve_plain_dns": "Enable plain DNS",
+    "encryption_plain_dns_enable": "Enable plain DNS",
+    "encryption_plain_dns_desc": "Plain DNS is enabled by default. You can disable it to force all devices to use encrypted DNS. To do this, you must enable at least one encrypted DNS protocol",
     "encryption_plain_dns_error": "To disable plain DNS, enable at least one encrypted DNS protocol",
     "topline_expiring_certificate": "Your SSL certificate is about to expire. Update <0>Encryption settings</0>.",
     "topline_expired_certificate": "Your SSL certificate is expired. Update <0>Encryption settings</0>.",

diff --git a/client/src/components/Settings/Encryption/Form.js b/client/src/components/Settings/Encryption/Form.js
@@ -140,16 +140,19 @@ let Form = (props) => {
                     <div className="form__desc">
                         <Trans>encryption_enable_desc</Trans>
                     </div>
-                    <div className="form__group mb-0 mt-5">
+                    <div className="form__group mb-3 mt-5">
                         <Field
                             name="serve_plain_dns"
                             type="checkbox"
                             component={CheckboxField}
-                            placeholder={t('encryption_serve_plain_dns')}
+                            placeholder={t('encryption_plain_dns_enable')}
                             onChange={handleChange}
                             validate={validatePlainDns}
                         />
                     </div>
+                    <div className="form__desc">
+                        <Trans>encryption_plain_dns_desc</Trans>
+                    </div>
                     <hr />
                 </div>
                 <div className="col-12">