Skip to content

Commit f475244

Browse files
riclolsenriclolsen
committed
I18n of connections tab on Admin UI completed.
1 parent 0493601 commit f475244

File tree

2 files changed

+71
-29
lines changed

2 files changed

+71
-29
lines changed

‎src/htdocs-admin/src/components/ProtocolConnections.vue‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,18 +1618,18 @@
16181618
<v-text-field
16191619
type="text"
16201620
:input-value="active"
1621-
label="Openssl Cypher list"
1621+
:label="msg.connOpensslCypherList"
16221622
hide-details="auto"
16231623
v-model="selected.cipherList"
16241624
@change="updateProtocolConnection"
16251625
></v-text-field>
16261626
</v-list-item-action>
16271627
<v-list-item-content>
16281628
<v-list-item-title
1629-
>Openssl format cipher list [TLS]</v-list-item-title
1629+
>{{msg.connOpensslCypherListTitle}}</v-list-item-title
16301630
>
16311631
<v-list-item-subtitle
1632-
>e.g. 'AES128, AES256, AES, DES'</v-list-item-subtitle
1632+
>{{msg.connOpensslCypherListHint}}</v-list-item-subtitle
16331633
>
16341634
</v-list-item-content>
16351635
</template>
@@ -1646,7 +1646,7 @@
16461646
v-model="selected.allowTLSv10"
16471647
inset
16481648
color="primary"
1649-
:label="`Allow TLS version 1.0`"
1649+
:label="`${msg.connAllowTls10}${selected.allowTLSv10?msg.connAllowTls10True:msg.connAllowTls10False}`"
16501650
@change="updateProtocolConnection"
16511651
></v-switch>
16521652
</v-list-item>
@@ -1662,7 +1662,7 @@
16621662
v-model="selected.allowTLSv11"
16631663
inset
16641664
color="primary"
1665-
:label="`Allow TLS version 1.1`"
1665+
:label="`${msg.connAllowTls11}${selected.allowTLSv11?msg.connAllowTls11True:msg.connAllowTls11False}`"
16661666
@change="updateProtocolConnection"
16671667
></v-switch>
16681668
</v-list-item>
@@ -1678,7 +1678,7 @@
16781678
v-model="selected.allowTLSv12"
16791679
inset
16801680
color="primary"
1681-
:label="`Allow TLS version 1.2`"
1681+
:label="`${msg.connAllowTls12}${selected.allowTLSv12?msg.connAllowTls12True:msg.connAllowTls12False}`"
16821682
@change="updateProtocolConnection"
16831683
></v-switch>
16841684
</v-list-item>
@@ -1694,7 +1694,7 @@
16941694
v-model="selected.allowTLSv13"
16951695
inset
16961696
color="primary"
1697-
:label="`Allow TLS version 1.3`"
1697+
:label="`${msg.connAllowTls13}${selected.allowTLSv13?msg.connAllowTls13True:msg.connAllowTls13False}`"
16981698
@change="updateProtocolConnection"
16991699
></v-switch>
17001700
</v-list-item>
@@ -1710,7 +1710,7 @@
17101710
v-model="selected.allowOnlySpecificCertificates"
17111711
inset
17121712
color="primary"
1713-
:label="`Allow only specific certificates [TLS]`"
1713+
:label="`${msg.connAllowSpecificCerts}${selected.allowOnlySpecificCertificates?msg.connAllowSpecificCertsTrue:msg.connAllowSpecificCertsFalse}`"
17141714
@change="updateProtocolConnection"
17151715
></v-switch>
17161716
</v-list-item>
@@ -1726,7 +1726,7 @@
17261726
v-model="selected.chainValidation"
17271727
inset
17281728
color="primary"
1729-
:label="`Certificate chain validation [TLS]`"
1729+
:label="`${msg.connCertChainValidation}${selected.chainValidation?msg.connCertChainValidationTrue:msg.connCertChainValidationFalse}`"
17301730
@change="updateProtocolConnection"
17311731
></v-switch>
17321732
</v-list-item>
@@ -1760,18 +1760,18 @@
17601760
<v-text-field
17611761
type="text"
17621762
:input-value="active"
1763-
label="Comm port name"
1763+
:label="msg.connCommPortName"
17641764
hide-details="auto"
17651765
v-model="selected.portName"
17661766
@change="updateProtocolConnection"
17671767
></v-text-field>
17681768
</v-list-item-action>
17691769
<v-list-item-content>
17701770
<v-list-item-title
1771-
>Serial port name or IP:address</v-list-item-title
1771+
>{{msg.connCommPortNameTitle}}</v-list-item-title
17721772
>
17731773
<v-list-item-subtitle
1774-
>e.g. "COM3", "/dev/ttyS0", "192.168.0.1:2410"</v-list-item-subtitle
1774+
>{{msg.connCommPortNameHint}}</v-list-item-subtitle
17751775
>
17761776
</v-list-item-content>
17771777
</template>
@@ -1790,18 +1790,18 @@
17901790
type="number"
17911791
min=150
17921792
:input-value="active"
1793-
label="Baud rate"
1793+
:label="msg.connBaudRate"
17941794
hide-details="auto"
17951795
v-model="selected.baudRate"
17961796
@change="updateProtocolConnection"
17971797
></v-text-field>
17981798
</v-list-item-action>
17991799
<v-list-item-content>
18001800
<v-list-item-title
1801-
>Serial baud rate (bps)</v-list-item-title
1801+
>{{msg.connBaudRateTitle}}</v-list-item-title
18021802
>
18031803
<v-list-item-subtitle
1804-
>e.g. "9600", "19200"</v-list-item-subtitle
1804+
>{{msg.connBaudRateHint}}</v-list-item-subtitle
18051805
>
18061806
</v-list-item-content>
18071807
</template>
@@ -1821,15 +1821,15 @@
18211821
:input-value="active"
18221822
hide-details="auto"
18231823
v-model="selected.parity"
1824-
label="Parity"
1824+
:label="msg.connParity"
18251825
></v-select>
18261826
</v-list-item-action>
18271827
<v-list-item-content>
18281828
<v-list-item-title
1829-
>Serial parity</v-list-item-title
1829+
>{{msg.connParityTitle}}</v-list-item-title
18301830
>
18311831
<v-list-item-subtitle
1832-
>e.g. None, Even, Odd, ...</v-list-item-subtitle
1832+
>{{msg.connParityHint}}</v-list-item-subtitle
18331833
>
18341834
</v-list-item-content>
18351835
</template>
@@ -1849,15 +1849,15 @@
18491849
:input-value="active"
18501850
hide-details="auto"
18511851
v-model="selected.stopBits"
1852-
label="Stop bits"
1852+
:label="msg.connStopBits"
18531853
></v-select>
18541854
</v-list-item-action>
18551855
<v-list-item-content>
18561856
<v-list-item-title
1857-
>Serial stop bits</v-list-item-title
1857+
>{{msg.connStopBitsTitle}}</v-list-item-title
18581858
>
18591859
<v-list-item-subtitle
1860-
>e.g. One, One5, Two</v-list-item-subtitle
1860+
>{{msg.connStopBitsHint}}</v-list-item-subtitle
18611861
>
18621862
</v-list-item-content>
18631863
</template>
@@ -1877,15 +1877,15 @@
18771877
:input-value="active"
18781878
hide-details="auto"
18791879
v-model="selected.handshake"
1880-
label="Handshake"
1880+
:label="msg.connHandshake"
18811881
></v-select>
18821882
</v-list-item-action>
18831883
<v-list-item-content>
18841884
<v-list-item-title
1885-
>Type of serial handshake</v-list-item-title
1885+
>{{msg.connHandshakeTitle}}</v-list-item-title
18861886
>
18871887
<v-list-item-subtitle
1888-
>e.g. None, Xon, Rts, ...</v-list-item-subtitle
1888+
>{{msg.connHandshakeHint}}</v-list-item-subtitle
18891889
>
18901890
</v-list-item-content>
18911891
</template>
@@ -1904,18 +1904,18 @@
19041904
type="number"
19051905
min=0
19061906
:input-value="active"
1907-
label="Async open delay"
1907+
:label="msg.connAsyncOpenDelay"
19081908
hide-details="auto"
19091909
v-model="selected.asyncOpenDelay"
19101910
@change="updateProtocolConnection"
19111911
></v-text-field>
19121912
</v-list-item-action>
19131913
<v-list-item-content>
19141914
<v-list-item-title
1915-
>Async open delay (serial)</v-list-item-title
1915+
>{{msg.connAsyncOpenDelayTitle}}</v-list-item-title
19161916
>
19171917
<v-list-item-subtitle
1918-
>In milliseconds</v-list-item-subtitle
1918+
>{{msg.connAsyncOpenDelayHint}}</v-list-item-subtitle
19191919
>
19201920
</v-list-item-content>
19211921
</template>

‎src/htdocs-admin/src/i18n/i18n-current.js‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,52 @@ const i18n = {
223223
connPeerCertificateFileTitle: "Peer certificate file path [TLS]",
224224
connPeerCertificateFileHint: "e.g. 'C:\\json-scada\\conf\\peerCert.cer",
225225
connRootCertificateFile: "Root Certificate File",
226-
connRootCertificateFileTitle: "Root certificate file path",
226+
connRootCertificateFileTitle: "Root certificate file path [TLS]",
227227
connRootCertificateFileHint: "e.g. 'C:\\json-scada\\conf\\rootCert.cer'",
228228
connPrivateCertificateFile: "Private Certificate File",
229-
connPrivateCertificateFileTitle: "Private certificate file path",
229+
connPrivateCertificateFileTitle: "Private certificate file path [TLS]",
230230
connPrivateCertificateFileHint: "e.g. 'C:\\json-scada\\conf\\deviceKey.pem'",
231+
connOpensslCypherList: "Openssl Cypher List",
232+
connOpensslCypherListTitle: "Openssl format cipher list [TLS]",
233+
connOpensslCypherListHint: "e.g. 'AES128, AES256, AES, DES'",
234+
connAllowTls10: "Allow TLS version 1.0: ",
235+
connAllowTls10True: "True",
236+
connAllowTls10False: "False",
237+
connAllowTls11: "Allow TLS version 1.1: ",
238+
connAllowTls11True: "True",
239+
connAllowTls11False: "False",
240+
connAllowTls12: "Allow TLS version 1.2: ",
241+
connAllowTls12True: "True",
242+
connAllowTls12False: "False",
243+
connAllowTls13: "Allow TLS version 1.3: ",
244+
connAllowTls13True: "True",
245+
connAllowTls13False: "False",
246+
connAllowSpecificCerts: "Allow only specific certificates [TLS]: ",
247+
connAllowSpecificCertsTrue: "True",
248+
connAllowSpecificCertsFalse: "False",
249+
connCertChainValidation: "Certificate chain validation [TLS]: ",
250+
connCertChainValidationTrue: "True",
251+
connCertChainValidationFalse: "False",
252+
connCommPortName: "Comm Port Name",
253+
connCommPortNameTitle: "Serial port name or IP:address",
254+
connCommPortNameHint: "e.g. 'COM3', '/dev/ttyS0', '192.168.0.1:2410'",
255+
connBaudRate: "Baud Rate",
256+
connBaudRateTitle: "Serial baud rate (bps)",
257+
connBaudRateHint: "Integer number, e.g. 9600, 19200",
258+
connParity: "Parity",
259+
connParityTitle: "Serial parity",
260+
connParityHint: "e.g. None, Even, Odd, ...",
261+
connStopBits: "Stop Bits",
262+
connStopBitsTitle: "Number of serial stop bits",
263+
connStopBitsHint: "e.g. One, One5, Two",
264+
connHandshake: "Handshake",
265+
connHandshakeTitle: "Type of serial handshake",
266+
connHandshakeHint: "e.g. None, Xon, Rts, ...",
267+
connAsyncOpenDelay: "Async Open Delay",
268+
connAsyncOpenDelayTitle: "Serial async open delay",
269+
connAsyncOpenDelayHint: "In milliseconds.",
270+
271+
272+
231273
}
232274
export default i18n

0 commit comments

Comments
 (0)