summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDixsie Wolmers <dixsie@ibm.com>2020-02-11 06:58:55 +0300
committerDerick Montague <derick.montague@ibm.com>2020-02-21 18:49:14 +0300
commit75d3fb7e687979b63f0bb3f64f20e21758e7fffa (patch)
treee4ae9d7cd9e1b6616fca9f191f9113d1c8e53d32 /src
parent74f8687d4ab358c071bd081b0b7709eba5a521c2 (diff)
downloadwebui-vue-75d3fb7e687979b63f0bb3f64f20e21758e7fffa.tar.xz
Translate overview page
- Power cap and power consumption state is translated in the store - Static overview text is translated in the template Signed-off-by: Dixsie Wolmers <dixsie@ibm.com> Change-Id: I9463072e38c82b4660743ba9785a606ef1c69eae
Diffstat (limited to 'src')
-rw-r--r--src/locales/en.json34
-rw-r--r--src/store/modules/Control/PowerCapStore.js12
-rw-r--r--src/store/modules/Control/PowerConsumptionStore.js7
-rw-r--r--src/views/Overview/Overview.vue48
-rw-r--r--src/views/Overview/OverviewEvents.vue2
-rw-r--r--src/views/Overview/OverviewQuickLinks.vue15
6 files changed, 77 insertions, 41 deletions
diff --git a/src/locales/en.json b/src/locales/en.json
index 8464ff43..d8660027 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -2,7 +2,9 @@
"global": {
"formField": {
"validator": "Field required"
- }
+ },
+ "on": "on",
+ "off": "off"
},
"login": {
"language": {
@@ -29,6 +31,36 @@
"validator": "@:global.formField.validator"
}
},
+ "overview": {
+ "events": {
+ "noHighEventsMsg": "There are no high priority events to display at this time."
+ },
+ "firmwareVersion": "Firmware version",
+ "hostname": "Hostname",
+ "ipAddress": "IP address",
+ "macAddress": "MAC address",
+ "manufacturer": "Manufacturer",
+ "model": "Model",
+ "powerCap": "Power cap",
+ "powerConsumption": "Power consumption",
+ "sectionTitle": {
+ "bmcInformation": "BMC information",
+ "highPriorityEvents": "High priority events",
+ "powerConsumption": "@:overview.powerConsumption",
+ "serverInformation": "Server information"
+ },
+ "serialNumber": "Serial number",
+ "state": {
+ "notAvailable": "Not available",
+ "notEnabled": "Not enabled"
+ },
+ "quicklinks": {
+ "bmcTime": "BMC time",
+ "editNetworkSettings": "Edit network settings",
+ "serverLed": "Server LED",
+ "solConsole": "Serial over LAN console"
+ }
+ },
"pageTitle": {
"localUserMgmt": "Local user management",
"login": "Login",
diff --git a/src/store/modules/Control/PowerCapStore.js b/src/store/modules/Control/PowerCapStore.js
index bef9f47b..45a06adb 100644
--- a/src/store/modules/Control/PowerCapStore.js
+++ b/src/store/modules/Control/PowerCapStore.js
@@ -3,18 +3,14 @@ import api from '../../api';
const PowerCapStore = {
namespaced: true,
state: {
- powerCapData: null,
- powerCapValue: 'Not enabled'
+ powerCapData: false
},
getters: {
- powerCapData: state => state.powerCapData,
- powerCapValue: state => state.powerCapValue
+ powerCapData: state => state.powerCapData
},
mutations: {
setPowerCapData: (state, powerCapData) =>
- (state.powerCapData = powerCapData),
- setPowerCapValue: (state, powerCapValue) =>
- (state.powerCapValue = powerCapValue)
+ (state.powerCapData = powerCapData)
},
actions: {
getPowerCapData({ commit }) {
@@ -23,7 +19,7 @@ const PowerCapStore = {
.then(response => {
const powerCapData = response.data.data;
if (powerCapData.PowerCapEnable) {
- commit('setPowerCapValue', powerCapData.PowerCap + ' W');
+ commit('setPowerCapData', powerCapData.PowerCap);
}
})
.catch(error => {
diff --git a/src/store/modules/Control/PowerConsumptionStore.js b/src/store/modules/Control/PowerConsumptionStore.js
index 03ccffce..bdc97518 100644
--- a/src/store/modules/Control/PowerConsumptionStore.js
+++ b/src/store/modules/Control/PowerConsumptionStore.js
@@ -3,15 +3,12 @@ import api from '../../api';
const PowerConsumptionStore = {
namespaced: true,
state: {
- powerData: null,
- powerConsumption: 'Not available'
+ powerConsumption: false
},
getters: {
- powerData: state => state.powerData,
powerConsumption: state => state.powerConsumption
},
mutations: {
- setPowerData: (state, powerData) => (state.powerData = powerData),
setPowerConsumption: (state, powerConsumption) =>
(state.powerConsumption = powerConsumption)
},
@@ -22,7 +19,7 @@ const PowerConsumptionStore = {
.then(response => {
const powerData = response.data.data;
let powerConsumption =
- powerData.Value * Math.pow(10, powerData.Scale) + ' W';
+ powerData.Value * Math.pow(10, powerData.Scale);
commit('setPowerConsumption', powerConsumption);
})
.catch(error => {
diff --git a/src/views/Overview/Overview.vue b/src/views/Overview/Overview.vue
index 245fea6b..9fbc0dd5 100644
--- a/src/views/Overview/Overview.vue
+++ b/src/views/Overview/Overview.vue
@@ -5,82 +5,94 @@
<overview-quick-links />
</div>
<b-row>
- <b-col>
- <page-section section-title="Server information">
+ <b-col lg="8" sm="12">
+ <page-section
+ :section-title="$t('overview.sectionTitle.serverInformation')"
+ >
<b-row>
<b-col sm="6">
<dl>
- <dt>Model</dt>
+ <dt>{{ $t('overview.model') }}</dt>
<dd>{{ serverModel }}</dd>
</dl>
</b-col>
<b-col sm="6">
<dl>
- <dt>Manufacturer</dt>
+ <dt>{{ $t('overview.manufacturer') }}</dt>
<dd>{{ serverManufacturer }}</dd>
</dl>
</b-col>
<b-col sm="6">
<dl>
- <dt>Serial number</dt>
+ <dt>{{ $t('overview.serialNumber') }}</dt>
<dd>{{ serverSerialNumber }}</dd>
</dl>
</b-col>
<b-col sm="6">
<dl>
- <dt>Firmware version</dt>
+ <dt>{{ $t('overview.firmwareVersion') }}</dt>
<dd>{{ hostActiveVersion }}</dd>
</dl>
</b-col>
</b-row>
</page-section>
- <page-section section-title="BMC information">
+ <page-section
+ :section-title="$t('overview.sectionTitle.bmcInformation')"
+ >
<b-row>
<b-col sm="6">
<dl>
- <dt>Hostname</dt>
+ <dt>{{ $t('overview.hostname') }}</dt>
<dd>{{ hostName }}</dd>
</dl>
</b-col>
<b-col sm="6">
<dl>
- <dt>MAC address</dt>
+ <dt>{{ $t('overview.macAddress') }}</dt>
<dd>{{ macAddress }}</dd>
</dl>
</b-col>
<b-col sm="6">
<dl>
- <dt>IP address</dt>
+ <dt>{{ $t('overview.ipAddress') }}</dt>
<dd v-for="ip in ipAddress" :key="ip.id">{{ ip }}</dd>
</dl>
</b-col>
<b-col sm="6">
<dl>
- <dt>Firmware version</dt>
+ <dt>{{ $t('overview.firmwareVersion') }}</dt>
<dd>{{ bmcActiveVersion }}</dd>
</dl>
</b-col>
</b-row>
</page-section>
- <page-section section-title="Power consumption">
+ <page-section
+ :section-title="$t('overview.sectionTitle.powerConsumption')"
+ >
<b-row>
<b-col sm="6">
<dl>
- <dt>Power consumption</dt>
- <dd>{{ powerConsumption }}</dd>
+ <dt>{{ $t('overview.powerConsumption') }}</dt>
+ <dd v-if="!powerConsumption">
+ {{ $t('overview.state.notAvailable') }}
+ </dd>
+ <dd v-else>{{ powerConsumption }} W</dd>
</dl>
</b-col>
<b-col sm="6">
<dl>
- <dt>Power cap</dt>
- <dd>{{ powerCapValue }}</dd>
+ <dt>{{ $t('overview.powerCap') }}</dt>
+ <dd v-if="powerCapData">{{ powerCapData }} W</dd>
+ <dd v-else>{{ $t('overview.state.notEnabled') }}</dd>
</dl>
</b-col>
</b-row>
</page-section>
</b-col>
</b-row>
- <page-section section-title="High priority events">
+ <page-section
+ :section-title="$t('overview.sectionTitle.highPriorityEvents')"
+ >
<overview-events />
</page-section>
</b-container>
@@ -108,7 +120,7 @@ export default {
hostActiveVersion: state => state.firmware.hostActiveVersion,
bmcActiveVersion: state => state.firmware.bmcActiveVersion,
powerConsumption: state => state.powerConsumption.powerConsumption,
- powerCapValue: state => state.powerCap.powerCapValue,
+ powerCapData: state => state.powerCap.powerCapData,
ipAddress: state => state.networkSettings.ipAddress,
macAddress: state => state.networkSettings.macAddress
}),
diff --git a/src/views/Overview/OverviewEvents.vue b/src/views/Overview/OverviewEvents.vue
index d15e158f..a08fb549 100644
--- a/src/views/Overview/OverviewEvents.vue
+++ b/src/views/Overview/OverviewEvents.vue
@@ -14,7 +14,7 @@
</b-list-group-item>
</b-list-group>
<b-list-group v-if="eventLogData.length === 0">
- There are no high priority events to display at this time.
+ {{ $t('overview.events.noHighEventsMsg') }}
</b-list-group>
</div>
</template>
diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue
index 3f52d816..036576da 100644
--- a/src/views/Overview/OverviewQuickLinks.vue
+++ b/src/views/Overview/OverviewQuickLinks.vue
@@ -2,23 +2,22 @@
<div class="quicklinks">
<div>
<dl>
- <!-- TODO: display timezone -->
- <dt>BMC time</dt>
- <dd>{{ bmcTime | date('MMM DD, YYYY HH:MM:SS') }}</dd>
+ <dt>{{ $t('overview.quicklinks.bmcTime') }}</dt>
+ <dd>{{ bmcTime | date('MMM, DD YYYY HH:MM:SS A ZZ') }}</dd>
</dl>
</div>
<div>
<!-- TODO: add toggle LED on/off funtionality -->
<dl>
- <dt>Server LED</dt>
+ <dt>{{ $t('overview.quicklinks.serverLed') }}</dt>
<dd>
<b-form-checkbox
v-model="serverLedChecked"
name="check-button"
switch
>
- <span v-if="!serverLedChecked">On</span>
- <span v-else>Off</span>
+ <span v-if="!serverLedChecked">{{ $t('global.on') }}</span>
+ <span v-else>{{ $t('global.off') }}</span>
</b-form-checkbox>
</dd>
</dl>
@@ -30,7 +29,7 @@
variant="secondary"
class="d-flex justify-content-between align-items-center"
>
- <span>Edit network settings</span>
+ <span>{{ $t('overview.quicklinks.editNetworkSettings') }}</span>
<icon-arrow-right />
</b-button>
</div>
@@ -41,7 +40,7 @@
variant="secondary"
class="d-flex justify-content-between align-items-center"
>
- <span>Serial over LAN console</span>
+ <span>{{ $t('overview.quicklinks.solConsole') }}</span>
<icon-arrow-right />
</b-button>
</div>