Skip to content

Commit 37a51c9

Browse files
apply suggestions
1 parent c6af367 commit 37a51c9

5 files changed

Lines changed: 12 additions & 14 deletions

File tree

ui/public/locales/en.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@
415415
"label.apikeypairs": "API Key Pairs",
416416
"label.apikeypair.description": "Description of the API key pair",
417417
"label.apikeypair.name": "Name of the API key pair",
418-
"label.apikeypair.startdate": "API key pair starting validation date",
419-
"label.apikeypair.enddate": "API key pair expiration date",
418+
"label.apikeypair.startdate": "API key pair valid from",
419+
"label.apikeypair.enddate": "API key pair valid until",
420420
"label.app.cookie": "AppCookie",
421421
"label.app.name": "CloudStack",
422422
"label.application.policy.set": "Application Policy Set",
@@ -2099,7 +2099,7 @@
20992099
"label.register.user.data": "Register User Data",
21002100
"label.register.cni.config": "Register CNI Configuration",
21012101
"label.register.user.data.details": "Enter the User Data in plain text or in Base64 encoding. Up to 32KB of Base64 encoded User Data can be sent by default. The setting vm.userdata.max.length can be used to increase the limit to upto 1MB.",
2102-
"label.registering.keypair": "Registering API key pair",
2102+
"label.registering.keypair": "Registering API key pair for user \"{user}\"",
21032103
"label.reinstall.vm": "Reinstall Instance",
21042104
"label.reject": "Reject",
21052105
"label.related": "Related",
@@ -2186,7 +2186,6 @@
21862186
"label.restore.volume.attach": "Restore volume and attach",
21872187
"label.use.backup.ip.address": "Use IP Addresses from Backup",
21882188
"label.use.backup.ip.address.tooltip": "Use the same IP/MAC addresses as stored in the backup metadata. The command will error out if the IP/MAC addresses are not available",
2189-
"label.userapikey": "API Key",
21902189
"label.review": "Review",
21912190
"label.role": "Role",
21922191
"label.roleid": "Role",
@@ -4011,7 +4010,7 @@
40114010
"message.success.register.keypair": "Successfully registered SSH key pair",
40124011
"message.success.register.template": "Successfully registered Template",
40134012
"message.success.register.user.data": "Successfully registered User Data",
4014-
"message.success.register.user.keypair": "Success registering API key pair",
4013+
"message.success.register.user.keypair": "Successfully registered API key pair for user \"{user}\"",
40154014
"message.success.release.ip": "Successfully released IP",
40164015
"message.success.release.dedicated.bgp.peer": "Successfully released dedicated BGP peer",
40174016
"message.success.release.dedicated.ipv4.subnet": "Successfully released dedicated IPv4 subnet",

ui/public/locales/pt_BR.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1898,7 +1898,7 @@
18981898
"label.register.oauth": "Registrar OAuth",
18991899
"label.register.user.data": "Registrar dados de usu\u00e1rio",
19001900
"label.register.template": "Registrar template",
1901-
"label.registering.keypair": "Registrando par de chaves de API",
1901+
"label.registering.keypair": "Registrando par de chaves de API para o usu\u00e1rio \"{user}\"",
19021902
"label.reinstall.vm": "Reinstalar VM",
19031903
"label.reject": "Rejeitar",
19041904
"label.related": "Relacionado",
@@ -2475,7 +2475,6 @@
24752475
"label.usenewdiskoffering": "Substituir a oferta de disco?",
24762476
"label.user": "Usu\u00e1rio",
24772477
"label.user.conflict": "Conflito",
2478-
"label.userapikey": "Chave de API",
24792478
"label.usersecretkey": "Chave Secreta de API",
24802479
"label.user.data": "Dados de usu\u00e1rio",
24812480
"label.username": "Nome de usu\u00e1rio",
@@ -3601,7 +3600,7 @@
36013600
"message.success.register.keypair": "Par de chaves SSH registrado com sucesso",
36023601
"message.success.register.template": "Template cadastrado com sucesso",
36033602
"message.success.register.user.data": "Userdata registrado com sucesso",
3604-
"message.success.register.user.keypair": "Novo par de chave de API criado com sucesso",
3603+
"message.success.register.user.keypair": "Novo par de chaves de API registrado com sucesso para o usu\u00e1rio \"{user}\"",
36053604
"message.success.release.dedicated.bgp.peer": "Par BGP dedicado liberado com sucesso",
36063605
"message.success.release.dedicated.ipv4.subnet": "Sub-rede IPv4 dedicada liberada com sucesso",
36073606
"message.success.release.ip": "IP liberado com sucesso",

ui/src/components/view/ApiKeyPairsTab.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@ export default {
268268
title: this.$t('label.operation.status'),
269269
slots: { customRender: 'status' },
270270
filters: [
271-
{ text: 'In Progress', value: 'InProgress' },
272-
{ text: 'Success', value: 'success' },
273-
{ text: 'Failed', value: 'failed' }
271+
{ text: this.$t('state.inprogress'), value: 'InProgress' },
272+
{ text: this.$t('label.success'), value: 'success' },
273+
{ text: this.$t('label.failed'), value: 'failed' }
274274
]
275275
})
276276
if (this.selectedRowKeys.length > 0) {

ui/src/views/iam/ApiKeyPairPermissionTable.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ export default {
229229
}
230230
],
231231
pagination: {
232-
pageSize: 20,
232+
pageSize: this.$store.getters.defaultListViewPageSize,
233233
pageSizeOptions: ['10', '20', '40', '80', '100', '200'],
234234
showSizeChanger: true
235235
},

ui/src/views/iam/GenerateApiKeyPair.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,15 @@ export default {
168168
postAPI('registerUserKeys', params).then(response => {
169169
this.$pollJob({
170170
jobId: response.registeruserkeysresponse.jobid,
171-
successMessage: `${this.$t('message.success.register.user.keypair')} ${this.$t('label.for')} user ${this.resource.id}`,
171+
successMessage: this.$t('message.success.register.user.keypair', { user: this.resource.username }),
172172
successMethod: () => {
173173
this.fetchData()
174174
},
175175
errorMessage: this.$t('message.register.keypair.failed'),
176176
errorMethod: () => {
177177
this.fetchData()
178178
},
179-
loadingMessage: `${this.$t('label.registering.keypair')} ${this.$t('label.for')} user ${this.resource.id} ${this.$t('label.is.in.progress')}`,
179+
loadingMessage: this.$t('label.registering.keypair', { user: this.resource.username }),
180180
catchMessage: this.$t('error.fetching.async.job.result')
181181
})
182182
}).catch(error => {

0 commit comments

Comments
 (0)