Browse Source

Merge branch 'master' into Junit4to5-common

pull/10654/head
Oleksandra Matviienko 2 years ago
committed by GitHub
parent
commit
f6354371d3
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java
  2. 0
      ui-ngx/src/assets/locale/locale.constant-ar_AE.json
  3. 2
      ui-ngx/src/assets/locale/locale.constant-en_US.json

2
common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java

@ -61,7 +61,7 @@ public class TbCoapDtlsSettings {
@Value("${transport.coap.dtls.retransmission_timeout:9000}") @Value("${transport.coap.dtls.retransmission_timeout:9000}")
private int dtlsRetransmissionTimeout; private int dtlsRetransmissionTimeout;
@Value("${transport.coap.dtls.connection_id_length}") @Value("${transport.coap.dtls.connection_id_length:}")
private Integer cIdLength; private Integer cIdLength;
@Bean @Bean

0
ui-ngx/src/assets/locale/locale.constant-ar_AR.json → ui-ngx/src/assets/locale/locale.constant-ar_AE.json

2
ui-ngx/src/assets/locale/locale.constant-en_US.json

@ -7302,7 +7302,7 @@
"language": { "language": {
"language": "Language", "language": "Language",
"locales": { "locales": {
"ar_AR": "اَلْعَرَبِيَّةُ", "ar_AE": "اَلْعَرَبِيَّةُ",
"ca_ES": "Catalan", "ca_ES": "Catalan",
"cs_CZ": "Česky", "cs_CZ": "Česky",
"da_DK": "Dansk", "da_DK": "Dansk",

Loading…
Cancel
Save