summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksim Zakharov <m.zakharov@IBS.RU>2022-09-05 10:43:46 +0300
committerMaksim Zakharov <m.zakharov@IBS.RU>2022-09-05 10:43:46 +0300
commit4fcf87196c0bfe34019f1a397feae01d6e815083 (patch)
tree421362b0d4f9e2be622d53c67a2db1f026a057d6
parentfec1602b12c66e7675f4020d544886871cf5f5c9 (diff)
downloadwebui-vue-4fcf87196c0bfe34019f1a397feae01d6e815083.tar.xz
fix network page local
-rw-r--r--src/assets/styles/bmc/_sila/_modal.scss2
-rw-r--r--src/locales/en-US.json6
-rw-r--r--src/locales/ru-RU.json10
-rw-r--r--src/store/modules/Settings/NetworkStore.js20
-rw-r--r--src/views/_sila/Overview/Network/ModalHostname.vue4
-rw-r--r--src/views/_sila/Overview/Network/ModalMacAddress.vue2
6 files changed, 27 insertions, 17 deletions
diff --git a/src/assets/styles/bmc/_sila/_modal.scss b/src/assets/styles/bmc/_sila/_modal.scss
index f0fc764f..c4428cdc 100644
--- a/src/assets/styles/bmc/_sila/_modal.scss
+++ b/src/assets/styles/bmc/_sila/_modal.scss
@@ -66,6 +66,8 @@
}
#modal-dns,
+#modal-hostname,
+#modal-mac-address,
#configure-connection {
.modal-body {
> form {
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index 318a8e6c..21dda691 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -758,7 +758,11 @@
},
"toast": {
"errorSaveNetworkSettings": "Error updating %{setting} settings.",
- "successSaveNetworkSettings": "Successfully updated %{setting} settings."
+ "successSaveNetworkSettings": "Successfully updated %{setting} settings.",
+ "domainName": "domain name",
+ "network": "network",
+ "dns": "DNS server",
+ "ntp": "NTP server"
}
},
"pagePageNotFound": {
diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json
index c33dacb6..85b780ec 100644
--- a/src/locales/ru-RU.json
+++ b/src/locales/ru-RU.json
@@ -757,9 +757,13 @@
"subnet": "Маска подсети"
},
"toast": {
- "errorSaveNetworkSettings": "Ошибка обновления %{setting} настроек.",
- "successSaveNetworkSettings": "Успешно обновлено %{setting} настроек."
- }
+ "errorSaveNetworkSettings": "Ошибка обновления настроек %{setting} .",
+ "successSaveNetworkSettings": "Настройки %{setting} успешно обновлены.",
+ "domainName": "имени домена",
+ "network": "сети",
+ "dns": "DNS сервера",
+ "ntp": "NTP сервера"
+ }
},
"pagePageNotFound": {
"description": "Запрашиваемый ресурс не найден."
diff --git a/src/store/modules/Settings/NetworkStore.js b/src/store/modules/Settings/NetworkStore.js
index 14338e1d..5905e5d8 100644
--- a/src/store/modules/Settings/NetworkStore.js
+++ b/src/store/modules/Settings/NetworkStore.js
@@ -103,7 +103,7 @@ const NetworkStore = {
)
.then(() => {
return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.domainName'),
+ setting: i18n.t('pageNetwork.toast.domainName'),
});
})
.catch((error) => {
@@ -111,7 +111,7 @@ const NetworkStore = {
commit('setDomainNameState', !domainState);
throw new Error(
i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.domainName'),
+ setting: i18n.t('pageNetwork.toast.domainName'),
})
);
});
@@ -132,7 +132,7 @@ const NetworkStore = {
)
.then(() => {
return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.dns'),
+ setting: i18n.t('pageNetwork.toast.dns'),
});
})
.catch((error) => {
@@ -140,7 +140,7 @@ const NetworkStore = {
commit('setDnsState', !dnsState);
throw new Error(
i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.dns'),
+ setting: i18n.t('pageNetwork.tosat.dns'),
})
);
});
@@ -161,7 +161,7 @@ const NetworkStore = {
)
.then(() => {
return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.ntp'),
+ setting: i18n.t('pageNetwork.toast.ntp'),
});
})
.catch((error) => {
@@ -169,7 +169,7 @@ const NetworkStore = {
commit('setNtpState', !ntpState);
throw new Error(
i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.ntp'),
+ setting: i18n.t('pageNetwork.toast.ntp'),
})
);
});
@@ -244,14 +244,14 @@ const NetworkStore = {
.then(dispatch('getEthernetData'))
.then(() => {
return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.network'),
+ setting: i18n.t('pageNetwork.toast.network'),
});
})
.catch((error) => {
console.log(error);
throw new Error(
i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.network'),
+ setting: i18n.t('pageNetwork.toast.network'),
})
);
});
@@ -269,14 +269,14 @@ const NetworkStore = {
.then(dispatch('getEthernetData'))
.then(() => {
return i18n.t('pageNetwork.toast.successSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.dns'),
+ setting: i18n.t('pageNetwork.toast.dns'),
});
})
.catch((error) => {
console.log(error);
throw new Error(
i18n.t('pageNetwork.toast.errorSaveNetworkSettings', {
- setting: i18n.t('pageNetwork.dns'),
+ setting: i18n.t('pageNetwork.toast.dns'),
})
);
});
diff --git a/src/views/_sila/Overview/Network/ModalHostname.vue b/src/views/_sila/Overview/Network/ModalHostname.vue
index 3ad152c1..841f2ddd 100644
--- a/src/views/_sila/Overview/Network/ModalHostname.vue
+++ b/src/views/_sila/Overview/Network/ModalHostname.vue
@@ -7,7 +7,7 @@
>
<b-form id="hostname-settings" @submit.prevent="handleSubmit">
<b-row>
- <b-col sm="6">
+ <b-col>
<b-form-group
:label="$t('pageNetwork.hostname')"
label-for="hostname"
@@ -41,7 +41,7 @@
variant="primary"
@click="onOk"
>
- {{ $t('global.action.add') }}
+ {{ $t('global.action.save') }}
</b-button>
</template>
</b-modal>
diff --git a/src/views/_sila/Overview/Network/ModalMacAddress.vue b/src/views/_sila/Overview/Network/ModalMacAddress.vue
index 98f4b019..e051efc6 100644
--- a/src/views/_sila/Overview/Network/ModalMacAddress.vue
+++ b/src/views/_sila/Overview/Network/ModalMacAddress.vue
@@ -7,7 +7,7 @@
>
<b-form id="mac-settings" @submit.prevent="handleSubmit">
<b-row>
- <b-col sm="6">
+ <b-col>
<b-form-group
:label="$t('pageNetwork.macAddress')"
label-for="macAddress"