Skip to content

Commit a87f24c

Browse files
jc21jc21
authored
Merge pull request #4940 from vsc55/issues_4939
Fix issues #4939, #4938
2 parents 32ab3fa + fce569c commit a87f24c

File tree

7 files changed

+90
-18
lines changed

7 files changed

+90
-18
lines changed

‎frontend/src/components/Form/AccessClientFields.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import cn from "classnames";
33
import { useFormikContext } from "formik";
44
import { useState } from "react";
55
import type { AccessListClient } from "src/api/backend";
6-
import { T } from "src/locale";
6+
import { intl, T } from "src/locale";
77

88
interface Props {
99
initialValues: AccessListClient[];
@@ -65,8 +65,8 @@ export function AccessClientFields({ initialValues, name = "clients" }: Props) {
6565
value={client.directive}
6666
onChange={(e) => handleChange(idx, "directive", e.target.value)}
6767
>
68-
<option value="allow">Allow</option>
69-
<option value="deny">Deny</option>
68+
<option value="allow"><T id="action.allow" /></option>
69+
<option value="deny"><T id="action.deny" /></option>
7070
</select>
7171
</span>
7272
<input
@@ -76,7 +76,7 @@ export function AccessClientFields({ initialValues, name = "clients" }: Props) {
7676
autoComplete="off"
7777
value={client.address}
7878
onChange={(e) => handleChange(idx, "address", e.target.value)}
79-
placeholder="192.168.1.100 or 192.168.1.0/24 or 2001:0db8::/32"
79+
placeholder={intl.formatMessage({ id: "access-list.rule-source.placeholder" })}
8080
/>
8181
</div>
8282
</div>
@@ -112,7 +112,7 @@ export function AccessClientFields({ initialValues, name = "clients" }: Props) {
112112
value="deny"
113113
disabled
114114
>
115-
<option value="deny">Deny</option>
115+
<option value="deny"><T id="action.deny" /></option>
116116
</select>
117117
</span>
118118
<input

‎frontend/src/components/Form/DNSProviderFields.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { useState } from "react";
55
import Select, { type ActionMeta } from "react-select";
66
import type { DNSProvider } from "src/api/backend";
77
import { useDnsProviders } from "src/hooks";
8-
import { T } from "src/locale";
8+
import { intl, T } from "src/locale";
99
import styles from "./DNSProviderFields.module.css";
1010

1111
interface DNSProviderOption {
@@ -57,7 +57,7 @@ export function DNSProviderFields({ showBoundaryBox = false }: Props) {
5757
id="dnsProvider"
5858
closeMenuOnSelect={true}
5959
isClearable={false}
60-
placeholder="Select a Provider..."
60+
placeholder={intl.formatMessage({ id: "certificates.dns.provider.placeholder" })}
6161
isLoading={isLoading}
6262
isSearchable
6363
onChange={handleChange}

‎frontend/src/locale/src/en.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
2+
"aaccess-list.rule-source.placeholder": {
3+
"defaultMessage": "192.168.1.100 or 192.168.1.0/24 or 2001:0db8::/32"
4+
},
25
"access-list": {
36
"defaultMessage": "Access List"
47
},
@@ -38,12 +41,18 @@
3841
"action.add-location": {
3942
"defaultMessage": "Add Location"
4043
},
44+
"action.allow": {
45+
"defaultMessage": "Allow"
46+
},
4147
"action.close": {
4248
"defaultMessage": "Close"
4349
},
4450
"action.delete": {
4551
"defaultMessage": "Delete"
4652
},
53+
"action.deny": {
54+
"defaultMessage": "Deny"
55+
},
4756
"action.disable": {
4857
"defaultMessage": "Disable"
4958
},
@@ -68,6 +77,9 @@
6877
"auditlogs": {
6978
"defaultMessage": "Audit Logs"
7079
},
80+
"auto": {
81+
"defaultMessage": "Auto"
82+
},
7183
"cancel": {
7284
"defaultMessage": "Cancel"
7385
},
@@ -128,6 +140,9 @@
128140
"certificates.dns.provider": {
129141
"defaultMessage": "DNS Provider"
130142
},
143+
"certificates.dns.provider.placeholder": {
144+
"defaultMessage": "Select a Provider..."
145+
},
131146
"certificates.dns.warning": {
132147
"defaultMessage": "This section requires some knowledge about Certbot and its DNS plugins. Please consult the respective plugins documentation."
133148
},
@@ -518,6 +533,24 @@
518533
"redirection-hosts.count": {
519534
"defaultMessage": "{count} {count, plural, one {Redirection Host} other {Redirection Hosts}}"
520535
},
536+
"redirection-hosts.http-code.300": {
537+
"defaultMessage": "300 Multiple Choices"
538+
},
539+
"redirection-hosts.http-code.301": {
540+
"defaultMessage": "301 Moved permanently"
541+
},
542+
"redirection-hosts.http-code.302": {
543+
"defaultMessage": "302 Moved temporarily"
544+
},
545+
"redirection-hosts.http-code.303": {
546+
"defaultMessage": "303 See other"
547+
},
548+
"redirection-hosts.http-code.307": {
549+
"defaultMessage": "307 Temporary redirect"
550+
},
551+
"redirection-hosts.http-code.308": {
552+
"defaultMessage": "308 Permanent redirect"
553+
},
521554
"role.admin": {
522555
"defaultMessage": "Administrator"
523556
},
@@ -575,6 +608,9 @@
575608
"stream.forward-host": {
576609
"defaultMessage": "Forward Host"
577610
},
611+
"stream.forward-host.placeholder": {
612+
"defaultMessage": "example.com or 10.0.0.1 or 2001:db8:3333:4444:5555:6666:7777:8888"
613+
},
578614
"stream.incoming-port": {
579615
"defaultMessage": "Incoming Port"
580616
},

‎frontend/src/locale/src/es.json‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
"access-list.public.subtitle": {
2424
"defaultMessage": "No se requiere autenticación básica"
2525
},
26+
"access-list.rule-source.placeholder": {
27+
"defaultMessage": "192.168.1.100 o 192.168.1.0/24 o 2001:0db8::/32"
28+
},
2629
"access-list.satisfy-any": {
2730
"defaultMessage": "Satisfacer Cualquiera"
2831
},
@@ -38,12 +41,18 @@
3841
"action.add-location": {
3942
"defaultMessage": "Añadir Ubicación"
4043
},
44+
"action.allow": {
45+
"defaultMessage": "Permitir"
46+
},
4147
"action.close": {
4248
"defaultMessage": "Cerrar"
4349
},
4450
"action.delete": {
4551
"defaultMessage": "Eliminar"
4652
},
53+
"action.deny": {
54+
"defaultMessage": "Denegar"
55+
},
4756
"action.disable": {
4857
"defaultMessage": "Deshabilitar"
4958
},
@@ -68,6 +77,9 @@
6877
"auditlogs": {
6978
"defaultMessage": "Registros de Auditoría"
7079
},
80+
"auto": {
81+
"defaultMessage": "Auto"
82+
},
7183
"cancel": {
7284
"defaultMessage": "Cancelar"
7385
},
@@ -128,6 +140,9 @@
128140
"certificates.dns.provider": {
129141
"defaultMessage": "Proveedor DNS"
130142
},
143+
"certificates.dns.provider.placeholder": {
144+
"defaultMessage": "Selecciona un Proveedor..."
145+
},
131146
"certificates.dns.warning": {
132147
"defaultMessage": "Esta sección requiere algunos conocimientos sobre Certbot y sus plugins DNS. Consulta la documentación de los plugins respectivos."
133148
},
@@ -348,7 +363,7 @@
348363
"defaultMessage": "Soporte de Websockets"
349364
},
350365
"host.forward-port": {
351-
"defaultMessage": "Puerto de Reenvío"
366+
"defaultMessage": "Puerto"
352367
},
353368
"host.forward-scheme": {
354369
"defaultMessage": "Esquema"
@@ -518,6 +533,24 @@
518533
"redirection-hosts.count": {
519534
"defaultMessage": "{count} {count, plural, one {Host de Redirección} other {Hosts de Redirección}}"
520535
},
536+
"redirection-hosts.http-code.300": {
537+
"defaultMessage": "300 Multiples Opciones"
538+
},
539+
"redirection-hosts.http-code.301": {
540+
"defaultMessage": "301 Movido permanentemente"
541+
},
542+
"redirection-hosts.http-code.302": {
543+
"defaultMessage": "302 Movido temporalmente"
544+
},
545+
"redirection-hosts.http-code.303": {
546+
"defaultMessage": "303 Ver otro"
547+
},
548+
"redirection-hosts.http-code.307": {
549+
"defaultMessage": "307 Redirección temporal"
550+
},
551+
"redirection-hosts.http-code.308": {
552+
"defaultMessage": "308 Redirección permanente"
553+
},
521554
"role.admin": {
522555
"defaultMessage": "Administrador"
523556
},
@@ -575,6 +608,9 @@
575608
"stream.forward-host": {
576609
"defaultMessage": "Host de Reenvío"
577610
},
611+
"stream.forward-host.placeholder": {
612+
"defaultMessage": "example.com o 10.0.0.1 o 2001:db8:3333:4444:5555:6666:7777:8888"
613+
},
578614
"stream.incoming-port": {
579615
"defaultMessage": "Puerto de Entrada"
580616
},

‎frontend/src/modals/RedirectionHostModal.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ const RedirectionHostModal = EasyModal.create(({ id, visible, remove }: Props) =
162162
required
163163
{...field}
164164
>
165-
<option value="auto">Auto</option>
165+
<option value="auto"><T id="auto" /></option>
166166
<option value="http">http</option>
167167
<option value="https">https</option>
168168
</select>
@@ -224,12 +224,12 @@ const RedirectionHostModal = EasyModal.create(({ id, visible, remove }: Props) =
224224
required
225225
{...field}
226226
>
227-
<option value="300">300 Multiple choices</option>
228-
<option value="301">301 Moved permanently</option>
229-
<option value="302">302 Moved temporarily</option>
230-
<option value="303">303 See other</option>
231-
<option value="307">307 Temporary redirect</option>
232-
<option value="308">308 Permanent redirect</option>
227+
<option value="300"><T id="redirection-hosts.http-code.300" /></option>
228+
<option value="301"><T id="redirection-hosts.http-code.301" /></option>
229+
<option value="302"><T id="redirection-hosts.http-code.302" /></option>
230+
<option value="303"><T id="redirection-hosts.http-code.303" /></option>
231+
<option value="307"><T id="redirection-hosts.http-code.307" /></option>
232+
<option value="308"><T id="redirection-hosts.http-code.308" /></option>
233233
</select>
234234
{form.errors.forwardHttpCode ? (
235235
<div className="invalid-feedback">

‎frontend/src/modals/StreamModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Alert } from "react-bootstrap";
55
import Modal from "react-bootstrap/Modal";
66
import { Button, Loading, SSLCertificateField, SSLOptionsFields } from "src/components";
77
import { useSetStream, useStream } from "src/hooks";
8-
import { T } from "src/locale";
8+
import { intl, T } from "src/locale";
99
import { validateNumber, validateString } from "src/modules/Validations";
1010
import { showObjectSuccess } from "src/notifications";
1111

@@ -154,7 +154,7 @@ const StreamModal = EasyModal.create(({ id, visible, remove }: Props) => {
154154
type="text"
155155
className={`form-control ${form.errors.forwardingHost && form.touched.forwardingHost ? "is-invalid" : ""}`}
156156
required
157-
placeholder="example.com or 10.0.0.1 or 2001:db8:3333:4444:5555:6666:7777:8888"
157+
placeholder={intl.formatMessage({ id: "stream.forward-host.placeholder" })}
158158
{...field}
159159
/>
160160
{form.errors.forwardingHost ? (

‎frontend/src/pages/Login/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export default function Login() {
103103
required
104104
maxLength={255}
105105
className={`form-control ${form.errors.password && form.touched.password ? " is-invalid" : ""}`}
106-
placeholder="Password"
106+
placeholder={intl.formatMessage({ id: "password" })}
107107
/>
108108
<div className="invalid-feedback">{form.errors.password}</div>
109109
</label>

0 commit comments

Comments
 (0)