You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2020/10/16 08:53:53 UTC
[cloudstack-primate] branch master updated: Fixing hosts listview
labels
This is an automated email from the ASF dual-hosted git repository.
andrijapanic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
The following commit(s) were added to refs/heads/master by this push:
new cc3ed0f Fixing hosts listview labels
new 75003f0 Merge pull request #810 from shapeblue/fix-hosts-cols
cc3ed0f is described below
commit cc3ed0fcd9e8ccca6e33c149f3352cd71e6db2f3
Author: davidjumani <dj...@gmail.com>
AuthorDate: Fri Oct 16 13:19:52 2020 +0530
Fixing hosts listview labels
---
src/components/view/InfoCard.vue | 14 +++++++-------
src/locales/en.json | 12 ++++++------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/components/view/InfoCard.vue b/src/components/view/InfoCard.vue
index a49e710..85e8bc2 100644
--- a/src/components/view/InfoCard.vue
+++ b/src/components/view/InfoCard.vue
@@ -136,7 +136,7 @@
size="small"
status="active"
:percent="parseFloat(resource.cpuused)"
- :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.cpuusedghz')"
+ :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.used')"
/>
</span>
<span v-if="resource.cpuallocated">
@@ -144,7 +144,7 @@
class="progress-bar"
size="small"
:percent="parseFloat(resource.cpuallocated)"
- :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.cpuallocatedghz')"
+ :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.allocated')"
/>
</span>
</div>
@@ -161,7 +161,7 @@
size="small"
status="active"
:percent="Number(parseFloat(100.0 * (resource.memorykbs - resource.memoryintfreekbs) / resource.memorykbs).toFixed(2))"
- :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.memoryusedgb')"
+ :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.used')"
/>
</span>
</div>
@@ -178,7 +178,7 @@
size="small"
status="active"
:percent="Number(parseFloat(100.0 * parseFloat(resource.memoryusedgb) / parseFloat(resource.memorytotalgb)).toFixed(2))"
- :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.memoryusedgb')"
+ :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.used')"
/>
</span>
<span v-if="resource.memoryallocatedgb">
@@ -186,7 +186,7 @@
class="progress-bar"
size="small"
:percent="Number(parseFloat(100.0 * parseFloat(resource.memoryallocatedgb) / parseFloat(resource.memorytotalgb)).toFixed(2))"
- :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.memoryallocatedgb')"
+ :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.allocated')"
/>
</span>
</div>
@@ -207,7 +207,7 @@
size="small"
status="active"
:percent="parseFloat(resource.memoryused)"
- :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.memoryused')" />
+ :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.used')" />
</span>
<span
v-if="resource.memoryallocated">
@@ -215,7 +215,7 @@
class="progress-bar"
size="small"
:percent="parseFloat(resource.memoryallocated)"
- :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.memoryallocatedgb')" />
+ :format="(percent, successPercent) => parseFloat(percent).toFixed(2) + '% ' + $t('label.allocated')" />
</span>
</div>
</div>
diff --git a/src/locales/en.json b/src/locales/en.json
index 1fdbb35..64a7058 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -599,16 +599,16 @@
"label.cpu.allocated": "CPU Allocated",
"label.cpu.sockets": "CPU Sockets",
"label.cpuallocated": "CPU Allocated for VMs",
-"label.cpuallocatedghz": "Allocated",
+"label.cpuallocatedghz": "CPU Allocated",
"label.cpulimit": "CPU limits",
"label.cpumaxdeviation": "Deviation",
"label.cpunumber": "CPU Cores",
"label.cpusockets": "The Number of CPU Sockets",
"label.cpuspeed": "CPU (in MHz)",
"label.cputotal": "Total CPU",
-"label.cputotalghz": "Total",
+"label.cputotalghz": "CPU Total",
"label.cpuused": "CPU Utilized",
-"label.cpuusedghz": "Used CPU",
+"label.cpuusedghz": "CPU Used",
"label.create.account": "Create Account",
"label.create.backup": "Start Backup",
"label.create.network": "Create New Network",
@@ -1303,13 +1303,13 @@
"label.memory.total": "Memory Total",
"label.memory.used": "Memory Used",
"label.memoryallocated": "Memory Allocated",
-"label.memoryallocatedgb": "Allocated",
+"label.memoryallocatedgb": "Memory Allocated",
"label.memorylimit": "Memory limits (MiB)",
"label.memorymaxdeviation": "Deviation",
"label.memorytotal": "Memory Allocated",
-"label.memorytotalgb": "Total",
+"label.memorytotalgb": "Memory Total",
"label.memoryused": "Used Memory",
-"label.memoryusedgb": "Used",
+"label.memoryusedgb": "Memory Used",
"label.memused": "Memory Usage",
"label.menu.all.accounts": "All Accounts",
"label.menu.all.instances": "All Instances",