diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json index 6ad7e920f5a..4b10163a3b7 100644 --- a/ui/src/locales/en.json +++ b/ui/src/locales/en.json @@ -29,6 +29,7 @@ "inline": "Inline", "label.about": "About", "label.about.app": "About CloudStack", +"label.accept": "Accept", "label.accept.project.invitation": "Accept project invitation", "label.access": "Access", "label.accesskey": "Access Key", @@ -429,9 +430,9 @@ "label.available.public.ips": "Available Public IP Addresses", "label.back": "Back", "label.backup": "Backups", -"label.backup.offerings": "Backup Offerings", "label.backup.offering.assign": "Assign VM to backup offering", "label.backup.offering.remove": "Remove VM from backup offering", +"label.backup.offerings": "Backup Offerings", "label.backup.restore": "Restore VM Backup", "label.backupofferingid": "Backup Offering", "label.balance": "Balance", @@ -705,7 +706,6 @@ "label.dns1": "DNS 1", "label.dns2": "DNS 2", "label.domain": "Domain", -"label.domains": "Domain", "label.domain.details": "Domain details", "label.domain.name": "Domain Name", "label.domain.router": "Domain router", @@ -948,12 +948,12 @@ "label.installwizard.subtitle": "This tour will aid you in setting up your CloudStack™ installation", "label.installwizard.title": "Hello and Welcome to CloudStack™", "label.instance": "Instance", +"label.instance.groups": "Instance Groups", "label.instance.name": "Instance Name", "label.instance.scaled.up": "Instance scaled to the requested offering", "label.instancename": "Internal name", "label.instanceport": "Instance Port", "label.instances": "Instances", -"label.instance.groups": "Instance Groups", "label.instanciate.template.associate.profile.blade": "Instanciate Template and Associate Profile to Blade", "label.intermediate.certificate": "Intermediate certificate {0}", "label.internal.dns.1": "Internal DNS 1", @@ -1020,6 +1020,7 @@ "label.iso.id": "ISO ID", "label.iso.name": "ISO name", "label.isoid": "ISO", +"label.isolated": "Isolated", "label.isolated.networks": "Isolated networks", "label.isolatedpvlanid": "Secondary Isolated VLAN ID", "label.isolatedpvlantype": "Secondary Isolated VLAN Type", @@ -1069,6 +1070,7 @@ "label.kubernetesversionid": "Kubernetes version", "label.kubernetesversionname": "Kubernetes version", "label.kvmnetworklabel": "KVM Traffic Label", +"label.l2": "L2", "label.l2gatewayserviceuuid": "L2 Gateway Service Uuid", "label.l3gatewayserviceuuid": "L3 Gateway Service Uuid", "label.label": "Label", @@ -1393,6 +1395,8 @@ "label.patp": "Palo Alto Threat Profile", "label.pavr": "Virtual Router", "label.pcidevice": "GPU", +"label.per.account": "Per Account", +"label.per.zone": "Per Zone", "label.perfectforwardsecrecy": "Perfect Forward Secrecy", "label.performfreshchecks": "Perform fresh checks", "label.permission": "Permission", @@ -1427,6 +1431,7 @@ "label.portableipaddress": "Portable IPs", "label.portforwarding": "Port Forwarding", "label.powerstate": "Power State", +"label.preferred": "Prefered", "label.presetup": "PreSetup", "label.prev": "Prev", "label.previous": "Previous", @@ -1470,6 +1475,9 @@ "label.providers": "Providers", "label.provisioning": "Provisioning", "label.provisioningtype": "Provisioning Type", +"label.provisioningtype.fat": "Fat Provisioning", +"label.provisioningtype.sparse": "Sparse Provisioning", +"label.provisioningtype.thin": "Thin Provisioning", "label.public.interface": "Public Interface", "label.public.ip": "Public IP Address", "label.public.ip.addresses": "Public IP Addresses", @@ -1491,7 +1499,6 @@ "label.quiescevm": "Quiesce VM", "label.quiettime": "Quiet Time (in sec)", "label.quota": "Quota", -"label.quota.value": "Quota Value", "label.quota.add.credits": "Add Credits", "label.quota.configuration": "Quota Configuration", "label.quota.configure": "Configure Quota", @@ -1515,6 +1522,7 @@ "label.quota.tariff.effectivedate": "Effective Date", "label.quota.totalusage": "Total Usage", "label.quota.usage": "Quota Consumption", +"label.quota.value": "Quota Value", "label.rados.monitor": "RADOS Monitor", "label.rados.pool": "RADOS Pool", "label.rados.secret": "RADOS Secret", @@ -1540,6 +1548,7 @@ "label.region": "Region", "label.region.details": "Region details", "label.reinstall.vm": "Reinstall VM", +"label.reject": "Reject", "label.related": "Related", "label.relationaloperator": "Operator", "label.release.account": "Release from Account", @@ -1668,6 +1677,7 @@ "label.secondaryips": "Secondary IPs", "label.secondarystoragelimit": "Secondary Storage limits (GiB)", "label.secretkey": "Secret Key", +"label.secured": "Secured", "label.security.group.name": "Security Group Name", "label.security.groups": "Security Groups", "label.security.groups.enabled": "Security Groups Enabled", @@ -1817,6 +1827,7 @@ "label.storagepool": "Storage Pool", "label.storagetags": "Storage Tags", "label.storagetype": "Storage Type", +"label.strict": "Strict", "label.subdomainaccess": "Subdomain Access", "label.submit": "Submit", "label.submitted.by": "[Submitted by: ]", diff --git a/ui/src/views/compute/InstanceHardware.vue b/ui/src/views/compute/InstanceHardware.vue index 37b755b509e..b0a44eb47e2 100644 --- a/ui/src/views/compute/InstanceHardware.vue +++ b/ui/src/views/compute/InstanceHardware.vue @@ -177,11 +177,11 @@
{{ item.macaddress }}
-
{{ $t('label.ip.address') }}
+
{{ $t('label.ipaddress') }}
{{ item.ipaddress }}
-
{{ $t('label.secondary.ips') }}
+
{{ $t('label.secondaryips') }}
{{ item.secondaryip.map(x => x.ipaddress).join(', ') }}
diff --git a/ui/src/views/compute/KubernetesServiceTab.vue b/ui/src/views/compute/KubernetesServiceTab.vue index 66b5ba9208d..bd9681a9cbc 100644 --- a/ui/src/views/compute/KubernetesServiceTab.vue +++ b/ui/src/views/compute/KubernetesServiceTab.vue @@ -30,7 +30,7 @@
- {{ this.$t('label.download') }} + {{ this.$t('label.download.kubernetes.cluster.config') }}
diff --git a/ui/src/views/iam/SSLCertificateTab.vue b/ui/src/views/iam/SSLCertificateTab.vue index 9f8d413324b..d6012cf6309 100644 --- a/ui/src/views/iam/SSLCertificateTab.vue +++ b/ui/src/views/iam/SSLCertificateTab.vue @@ -37,7 +37,7 @@ + :placeholder="apiParams.url.description" /> + :placeholder="apiParams.name.description" /> @@ -64,7 +64,7 @@ v-decorator="['displaytext', { rules: [{ required: true, message: 'Please enter input' }] }]" - :placeholder="$t('label.iso.displaytext.description')" /> + :placeholder="apiParams.displaytext.description" /> @@ -88,7 +88,7 @@ return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 }" :loading="zoneLoading" - :placeholder="$t('label.iso.zoneid.description')"> + :placeholder="apiParams.zoneid.description">
@@ -123,7 +123,7 @@ return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 }" :loading="osTypeLoading" - :placeholder="$t('label.iso.ostypeid.description')"> + :placeholder="apiParams.ostypeid.description"> {{ opt.name || opt.description }} @@ -196,6 +196,11 @@ export default { }, beforeCreate () { this.form = this.$form.createForm(this) + this.apiConfig = this.$store.getters.apis.registerIso || {} + this.apiParams = {} + this.apiConfig.params.forEach(param => { + this.apiParams[param.name] = param + }) }, created () { this.zones = [ diff --git a/ui/src/views/image/RegisterOrUploadTemplate.vue b/ui/src/views/image/RegisterOrUploadTemplate.vue index c06885e14e8..2a7dab1362c 100644 --- a/ui/src/views/image/RegisterOrUploadTemplate.vue +++ b/ui/src/views/image/RegisterOrUploadTemplate.vue @@ -205,7 +205,7 @@ ] }]" :loading="rootDisk.loading" - :placeholder="$t('label.rootdiskcontroller')"> + :placeholder="$t('label.rootdiskcontrollertype')"> {{ opt.name || opt.description }} @@ -224,7 +224,7 @@ ] }]" :loading="rootDisk.loading" - :placeholder="$t('label.rootdiskcontroller')"> + :placeholder="$t('label.rootdiskcontrollertype')"> {{ opt.name || opt.description }} diff --git a/ui/src/views/image/UpdateKubernetesSupportedVersion.vue b/ui/src/views/image/UpdateKubernetesSupportedVersion.vue index c7edec3bed1..6ac5d651f56 100644 --- a/ui/src/views/image/UpdateKubernetesSupportedVersion.vue +++ b/ui/src/views/image/UpdateKubernetesSupportedVersion.vue @@ -80,11 +80,11 @@ export default { this.states = [ { id: 'Enabled', - name: this.$t('label.enabled') + name: this.$t('state.enabled') }, { id: 'Disabled', - name: this.$t('label.disabled') + name: this.$t('state.disabled') } ] }, diff --git a/ui/src/views/infra/AddPrimaryStorage.vue b/ui/src/views/infra/AddPrimaryStorage.vue index b3b18b09364..f8014ccce08 100644 --- a/ui/src/views/infra/AddPrimaryStorage.vue +++ b/ui/src/views/infra/AddPrimaryStorage.vue @@ -152,15 +152,15 @@
- + - + - - + + - +
diff --git a/ui/src/views/infra/HostAdd.vue b/ui/src/views/infra/HostAdd.vue index 0551549395b..6d9e7fe3137 100644 --- a/ui/src/views/infra/HostAdd.vue +++ b/ui/src/views/infra/HostAdd.vue @@ -75,11 +75,11 @@ - {{ $t('label.add.instance') }} + {{ $t('label.vm.add') }} - {{ $t('label.thin') }} + {{ $t('label.provisioningtype.thin') }} - {{ $t('label.sparse') }} + {{ $t('label.provisioningtype.sparse') }} - {{ $t('label.fat') }} + {{ $t('label.provisioningtype.fat') }} diff --git a/ui/src/views/offering/AddDiskOffering.vue b/ui/src/views/offering/AddDiskOffering.vue index 2655c819af5..021b9670810 100644 --- a/ui/src/views/offering/AddDiskOffering.vue +++ b/ui/src/views/offering/AddDiskOffering.vue @@ -59,13 +59,13 @@ buttonStyle="solid" @change="selected => { this.handleProvisioningTypeChange(selected.target.value) }"> - {{ $t('label.thin') }} + {{ $t('label.provisioningtype.thin') }} - {{ $t('label.sparse') }} + {{ $t('label.provisioningtype.sparse') }} - {{ $t('label.fat') }} + {{ $t('label.provisioningtype.fat') }} diff --git a/ui/src/views/offering/AddNetworkOffering.vue b/ui/src/views/offering/AddNetworkOffering.vue index 68f08396271..4003116b23d 100644 --- a/ui/src/views/offering/AddNetworkOffering.vue +++ b/ui/src/views/offering/AddNetworkOffering.vue @@ -197,31 +197,31 @@ }]" buttonStyle="solid"> - {{ $t('label.peraccount') }} + {{ $t('label.per.account') }} - {{ $t('label.perzone') }} + {{ $t('label.per.zone') }} - + - + - {{ $t('label.side.by.side') }} + {{ $t('side.by.side') }} - {{ $t('label.inline') }} + {{ $t('inline') }} - + = 0 }" :loading="registeredServicePackageLoading" - :placeholder="this.$t('label.netscaler.service.packages')"> + :placeholder="this.$t('label.service.lb.netscaler.servicepackages')"> {{ opt.name || opt.description }} - + + :placeholder="this.$t('label.service.lb.netscaler.servicepackages.description')"/> - + + - + - + @@ -273,7 +273,7 @@ + :placeholder="this.$t('label.tags')"/>
- + - + diff --git a/ui/src/views/project/InvitationTokenTemplate.vue b/ui/src/views/project/InvitationTokenTemplate.vue index 75a10846f64..bffc9982cc0 100644 --- a/ui/src/views/project/InvitationTokenTemplate.vue +++ b/ui/src/views/project/InvitationTokenTemplate.vue @@ -27,7 +27,7 @@ v-decorator="['projectid', { rules: [{ required: true, message: 'Please enter input' }] }]" - :placeholder="$t('label.project.projectid.description')" + :placeholder="apiParams.projectid.description" /> @@ -35,7 +35,7 @@ v-decorator="['token', { rules: [{ required: true, message: 'Please enter input' }] }]" - :placeholder="$t('label.project.token.description')" + :placeholder="apiParams.token.description" />
@@ -55,6 +55,11 @@ export default { name: 'InvitationTokenTemplate', beforeCreate () { this.form = this.$form.createForm(this) + this.apiConfig = this.$store.getters.apis.updateProjectInvitation || {} + this.apiParams = {} + this.apiConfig.params.forEach(param => { + this.apiParams[param.name] = param + }) }, data () { return { diff --git a/ui/src/views/project/InvitationsTemplate.vue b/ui/src/views/project/InvitationsTemplate.vue index 21b246eae82..6fc6335c455 100644 --- a/ui/src/views/project/InvitationsTemplate.vue +++ b/ui/src/views/project/InvitationsTemplate.vue @@ -123,15 +123,15 @@ export default { scopedSlots: { customRender: 'state' }, filters: [ { - text: this.$t('label.pending'), + text: this.$t('state.pending'), value: 'Pending' }, { - text: this.$t('label.completed'), + text: this.$t('state.completed'), value: 'Completed' }, { - text: this.$t('label.declined'), + text: this.$t('state.declined'), value: 'Declined' } ], diff --git a/ui/src/views/storage/CreateVolume.vue b/ui/src/views/storage/CreateVolume.vue index 394a48666b8..6f79d981958 100644 --- a/ui/src/views/storage/CreateVolume.vue +++ b/ui/src/views/storage/CreateVolume.vue @@ -61,7 +61,7 @@ + :placeholder="$t('label.disksize')"/>
diff --git a/ui/src/views/storage/ResizeVolume.vue b/ui/src/views/storage/ResizeVolume.vue index 4c67e36e6f7..369797bea01 100644 --- a/ui/src/views/storage/ResizeVolume.vue +++ b/ui/src/views/storage/ResizeVolume.vue @@ -24,7 +24,7 @@ initialValue: selectedDiskOfferingId, rules: [{ required: true, message: 'Please select an option' }]}]" :loading="loading" - :placeholder="$t('label.offering.type')" + :placeholder="$t('label.diskoffering')" @change="id => (customDiskOffering = offerings.filter(x => x.id === id)[0].iscustomized || false)" > + :placeholder="$t('label.disksize')"/>
diff --git a/ui/src/views/storage/ScheduledSnapshots.vue b/ui/src/views/storage/ScheduledSnapshots.vue index 2a206c7421c..d1d6f69206b 100644 --- a/ui/src/views/storage/ScheduledSnapshots.vue +++ b/ui/src/views/storage/ScheduledSnapshots.vue @@ -63,7 +63,7 @@