Skip to content

Commit eeb4d55

Browse files
abh1sarsureshanaparti
abh1sar
and
sureshanaparti
authored
polish: Fix some inconsistencies in object names and messages (#10856)
* Replace ACL list with ACL and related changes to the json files in public/locales * Replace ACL list with ACL and related changes to network.js, VpcTab.vue and AclRulesTab.vue * Replace Export ACLs with Export ACL rules * standardize the term user data everywhere. fix the placeholder in register user data form. * Convert resource names in main menu and action buttons to Title case * Use special icon for sharedfs instance and prefix for sharedfs volumes * Give custom icon precedence over shared fs icon * Fixed some issues with public/locale files * Revert sharedfsvm changes * Added label.add.acl.name to en.json which was incorrectly removed * replace all *userdata* labels to *user.data* in public json files. * remove redundant labels label.user.data.l2 and label.replace.acl.list * Update ui/src/views/offering/AddNetworkOffering.vue Co-authored-by: Suresh Kumar Anaparti <[email protected]> * user data -> User Data in cmd and response * fix more Title case on action buttons and labels. --------- Co-authored-by: Suresh Kumar Anaparti <[email protected]>
1 parent 111d87b commit eeb4d55

39 files changed

+674
-709
lines changed

‎api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import com.cloud.user.UserData;
4444

4545
@APICommand(name = "registerUserData",
46-
description = "Register a new userdata.",
46+
description = "Register a new User Data.",
4747
since = "4.18",
4848
responseObject = SuccessResponse.class,
4949
requestHasSensitiveInfo = false,
@@ -56,33 +56,33 @@ public class RegisterUserDataCmd extends BaseCmd {
5656
//////////////// API parameters /////////////////////
5757
/////////////////////////////////////////////////////
5858

59-
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of the userdata")
59+
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of the User Data")
6060
private String name;
6161

6262
//Owner information
63-
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an optional account for the userdata. Must be used with domainId.")
63+
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an optional account for the User Data. Must be used with domainId.")
6464
private String accountName;
6565

6666
@Parameter(name = ApiConstants.DOMAIN_ID,
6767
type = CommandType.UUID,
6868
entityType = DomainResponse.class,
69-
description = "an optional domainId for the userdata. If the account parameter is used, domainId must also be used.")
69+
description = "an optional domainId for the User Data. If the account parameter is used, domainId must also be used.")
7070
private Long domainId;
7171

72-
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the userdata")
72+
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the User Data")
7373
private Long projectId;
7474

7575
@Parameter(name = ApiConstants.USER_DATA,
7676
type = CommandType.STRING,
7777
required = true,
78-
description = "Base64 encoded userdata content. " +
78+
description = "Base64 encoded User Data content. " +
7979
"Using HTTP GET (via querystring), you can send up to 4KB of data after base64 encoding. " +
80-
"Using HTTP POST (via POST body), you can send up to 1MB of data after base64 encoding. " +
81-
"You also need to change vm.userdata.max.length value",
80+
"Using HTTP POST (via POST body), you can send up to 32KB of data after base64 encoding, " +
81+
"which can be increased upto 1MB using the vm.userdata.max.length setting",
8282
length = 1048576)
8383
private String userData;
8484

85-
@Parameter(name = ApiConstants.PARAMS, type = CommandType.STRING, description = "comma separated list of variables declared in userdata content")
85+
@Parameter(name = ApiConstants.PARAMS, type = CommandType.STRING, description = "comma separated list of variables declared in the User Data content")
8686
private String params;
8787

8888

‎api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,41 @@
2727
public class UserDataResponse extends BaseResponseWithAnnotations implements ControlledEntityResponse {
2828

2929
@SerializedName(ApiConstants.ID)
30-
@Param(description = "ID of the ssh keypair")
30+
@Param(description = "ID of the User Data")
3131
private String id;
3232

3333
@SerializedName(ApiConstants.NAME)
34-
@Param(description = "Name of the userdata")
34+
@Param(description = "Name of the User Data")
3535
private String name;
3636

37-
@SerializedName(ApiConstants.ACCOUNT_ID) @Param(description="the owner id of the userdata")
37+
@SerializedName(ApiConstants.ACCOUNT_ID) @Param(description="the owner id of the User Data")
3838
private String accountId;
3939

40-
@SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the userdata")
40+
@SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the User Data")
4141
private String accountName;
4242

4343
@SerializedName(ApiConstants.PROJECT_ID)
44-
@Param(description = "the project id of the userdata", since = "4.19.1")
44+
@Param(description = "the project id of the User Data", since = "4.19.1")
4545
private String projectId;
4646

4747
@SerializedName(ApiConstants.PROJECT)
48-
@Param(description = "the project name of the userdata", since = "4.19.1")
48+
@Param(description = "the project name of the User Data", since = "4.19.1")
4949
private String projectName;
5050

51-
@SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the userdata owner")
51+
@SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the User Data owner")
5252
private String domainId;
5353

54-
@SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the userdata owner")
54+
@SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the User Data owner")
5555
private String domain;
5656

5757
@SerializedName(ApiConstants.DOMAIN_PATH)
58-
@Param(description = "path of the domain to which the userdata owner belongs", since = "4.19.2.0")
58+
@Param(description = "path of the domain to which the User Data owner belongs", since = "4.19.2.0")
5959
private String domainPath;
6060

61-
@SerializedName(ApiConstants.USER_DATA) @Param(description="base64 encoded userdata content")
61+
@SerializedName(ApiConstants.USER_DATA) @Param(description="base64 encoded User Data content")
6262
private String userData;
6363

64-
@SerializedName(ApiConstants.PARAMS) @Param(description="list of parameters which contains the list of keys or string parameters that are needed to be passed for any variables declared in userdata")
64+
@SerializedName(ApiConstants.PARAMS) @Param(description="list of parameters which contains the list of keys or string parameters that are needed to be passed for any variables declared in the User Data")
6565
private String params;
6666

6767
public UserDataResponse() {

‎ui/public/locales/ar.json

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
"label.account.specific": "Account-Specific",
1515
"label.accounts": "Accounts",
1616
"label.accounttype": "Account Type",
17-
"label.acl.export": "Export ACLs",
17+
"label.acl.export": "Export ACL rules",
1818
"label.acl.id": "ACL ID",
19-
"label.acl.list.rules": "ACL List Rules",
19+
"label.acl.rules": "ACL Rules",
2020
"label.acl.reason.description": "Enter the reason behind an ACL rule.",
2121
"label.aclid": "ACL",
22-
"label.aclname": "ACL Name",
22+
"label.acl.rule.name": "ACL Name",
2323
"label.acquire.new.ip": "Acquire New IP",
2424
"label.acquire.new.secondary.ip": "Acquire new secondary IP",
2525
"label.action": "Action",
@@ -119,8 +119,8 @@
119119
"label.activeviewersessions": "Active Sessions",
120120
"label.add": "Add",
121121
"label.add.account": "Add Account",
122-
"label.add.acl": "\u0625\u0636\u0627\u0641\u0629 ACL",
123-
"label.add.acl.list": "Add ACL List",
122+
"label.add.acl.rule": "\u0625\u0636\u0627\u0641\u0629 ACL",
123+
"label.add.acl": "Add ACL",
124124
"label.add.affinity.group": "Add new affinity group",
125125
"label.add.baremetal.dhcp.device": "Add Baremetal DHCP Device",
126126
"label.add.bigswitchbcf.device": "Add BigSwitch BCF Controller",
@@ -142,12 +142,12 @@
142142
"label.add.ip.range": "Add IP Range",
143143
"label.add.isolated.network": "Add Isolated Network",
144144
"label.add.ldap.account": "Add LDAP account",
145-
"label.add.list.name": "ACL List Name",
145+
"label.add.acl.name": "ACL Name",
146146
"label.add.more": "Add More",
147147
"label.add.netscaler.device": "Add Netscaler device",
148148
"label.add.network": "Add Network",
149149
"label.add.network.acl": "\u0625\u0636\u0627\u0641\u0629 \u0634\u0628\u0643\u0629 ACL",
150-
"label.add.network.acl.list": "Add Network ACL List",
150+
"label.add.network.acl": "Add Network ACL",
151151
"label.add.network.offering": "Add network offering",
152152
"label.add.new.gateway": "\u0623\u0636\u0641 \u0628\u0648\u0627\u0628\u0629 \u062c\u062f\u064a\u062f\u0629",
153153
"label.add.new.tier": "\u0625\u0636\u0627\u0641\u0629 \u0637\u0628\u0642\u0629 \u062c\u062f\u064a\u062f\u0629",
@@ -334,7 +334,7 @@
334334
"label.default.use": "Default Use",
335335
"label.default.view": "\u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u0639\u0631\u0636 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629",
336336
"label.delete": "Delete",
337-
"label.delete.acl.list": "Delete ACL List",
337+
"label.delete.acl": "Delete ACL",
338338
"label.delete.affinity.group": "Delete Affinity Group",
339339
"label.delete.alerts": "Delete alerts",
340340
"label.delete.bigswitchbcf": "Remove BigSwitch BCF Controller",
@@ -419,7 +419,7 @@
419419
"label.dpd": "\u0643\u0634\u0641 \u0627\u0644\u0642\u0631\u064a\u0646 \u0627\u0644\u0645\u0641\u0642\u0648\u062f",
420420
"label.driver": "Driver",
421421
"label.edit": "Edit",
422-
"label.edit.acl.list": "Edit ACL List",
422+
"label.edit.acl": "Edit ACL",
423423
"label.edit.acl.rule": "Edit ACL rule",
424424
"label.edit.project.details": "\u0627\u0636\u0627\u0641\u0629 \u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0645\u0634\u0631\u0648\u0639",
425425
"label.edit.role": "Edit Role",
@@ -924,7 +924,6 @@
924924
"label.remove.vpc.offering": "Remove VPC offering",
925925
"label.removing": "Removing",
926926
"label.replace.acl": "Replace ACL",
927-
"label.replace.acl.list": "Replace ACL List",
928927
"label.required": "Required",
929928
"label.requireshvm": "HVM",
930929
"label.requiresupgrade": "Requires Upgrade",
@@ -1150,8 +1149,7 @@
11501149
"label.usehttps": "\u0627\u0633\u062a\u062e\u062f\u0645 HTTPS",
11511150
"label.usenewdiskoffering": "Replace disk offering?",
11521151
"label.user": "User",
1153-
"label.userdata": "Userdata",
1154-
"label.userdatal2": "User Data",
1152+
"label.user.data": "User Data",
11551153
"label.username": "Username",
11561154
"label.users": "Users",
11571155
"label.utilization": "Utilisation",
@@ -1329,7 +1327,7 @@
13291327
"message.confirm.archive.selected.alerts": "Please confirm you would like to archive the selected alerts",
13301328
"message.confirm.archive.selected.events": "Please confirm you would like to archive the selected events",
13311329
"message.confirm.attach.disk": "Are you sure you want to attach disk?",
1332-
"message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?",
1330+
"message.confirm.delete.acl": "Are you sure you want to delete this ACL?",
13331331
"message.confirm.delete.bigswitchbcf": "Please confirm that you would like to delete this BigSwitch BCF Controller",
13341332
"message.confirm.delete.brocadevcs": "Please confirm that you would like to delete Brocade Vcs Switch",
13351333
"message.confirm.delete.ciscoasa1000v": "Please confirm you want to delete CiscoASA1000v",

‎ui/public/locales/ca.json

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
"label.account.specific": "Account-Specific",
1515
"label.accounts": "Accounts",
1616
"label.accounttype": "Account Type",
17-
"label.acl.export": "Export ACLs",
17+
"label.acl.export": "Export ACL rules",
1818
"label.acl.id": "ACL ID",
19-
"label.acl.list.rules": "ACL List Rules",
19+
"label.acl.rules": "ACL Rules",
2020
"label.acl.reason.description": "Enter the reason behind an ACL rule.",
2121
"label.aclid": "ACL",
22-
"label.aclname": "ACL Name",
22+
"label.acl.rule.name": "ACL Name",
2323
"label.acquire.new.ip": "Acquire New IP",
2424
"label.acquire.new.secondary.ip": "Acquire new secondary IP",
2525
"label.action": "Action",
@@ -119,8 +119,8 @@
119119
"label.activeviewersessions": "Active Sessions",
120120
"label.add": "Add",
121121
"label.add.account": "Add Account",
122+
"label.add.acl.rule": "Add ACL rule",
122123
"label.add.acl": "Add ACL",
123-
"label.add.acl.list": "Add ACL List",
124124
"label.add.affinity.group": "Add new affinity group",
125125
"label.add.baremetal.dhcp.device": "Add Baremetal DHCP Device",
126126
"label.add.bigswitchbcf.device": "Add BigSwitch BCF Controller",
@@ -142,12 +142,12 @@
142142
"label.add.ip.range": "Add IP Range",
143143
"label.add.isolated.network": "Add Isolated Network",
144144
"label.add.ldap.account": "Add LDAP account",
145-
"label.add.list.name": "ACL List Name",
145+
"label.add.acl.name": "ACL Name",
146146
"label.add.more": "Add More",
147147
"label.add.netscaler.device": "Add Netscaler device",
148148
"label.add.network": "Add Network",
149149
"label.add.network.acl": "Add network ACL",
150-
"label.add.network.acl.list": "Add Network ACL List",
150+
"label.add.network.acl": "Add Network ACL",
151151
"label.add.network.offering": "Add network offering",
152152
"label.add.new.gateway": "Add new gateway",
153153
"label.add.new.tier": "Add new tier",
@@ -334,7 +334,7 @@
334334
"label.default.use": "Default Use",
335335
"label.default.view": "Default View",
336336
"label.delete": "Delete",
337-
"label.delete.acl.list": "Delete ACL List",
337+
"label.delete.acl": "Delete ACL",
338338
"label.delete.affinity.group": "Delete Affinity Group",
339339
"label.delete.alerts": "Delete alerts",
340340
"label.delete.bigswitchbcf": "Remove BigSwitch BCF Controller",
@@ -419,7 +419,7 @@
419419
"label.dpd": "Dead Peer Detection",
420420
"label.driver": "Driver",
421421
"label.edit": "Edit",
422-
"label.edit.acl.list": "Edit ACL List",
422+
"label.edit.acl": "Edit ACL",
423423
"label.edit.acl.rule": "Edit ACL rule",
424424
"label.edit.project.details": "Editar detalls del projecte",
425425
"label.edit.role": "Edit Role",
@@ -924,7 +924,6 @@
924924
"label.remove.vpc.offering": "Remove VPC offering",
925925
"label.removing": "Esborrant",
926926
"label.replace.acl": "Replace ACL",
927-
"label.replace.acl.list": "Replace ACL List",
928927
"label.required": "Required",
929928
"label.requireshvm": "HVM",
930929
"label.requiresupgrade": "Requires Upgrade",
@@ -1150,8 +1149,7 @@
11501149
"label.usehttps": "Use HTTPS",
11511150
"label.usenewdiskoffering": "Replace disk offering?",
11521151
"label.user": "User",
1153-
"label.userdata": "Userdata",
1154-
"label.userdatal2": "User Data",
1152+
"label.user.data": "User Data",
11551153
"label.username": "Username",
11561154
"label.users": "Users",
11571155
"label.utilization": "Utilisation",
@@ -1329,7 +1327,7 @@
13291327
"message.confirm.archive.selected.alerts": "Please confirm you would like to archive the selected alerts",
13301328
"message.confirm.archive.selected.events": "Please confirm you would like to archive the selected events",
13311329
"message.confirm.attach.disk": "Are you sure you want to attach disk?",
1332-
"message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?",
1330+
"message.confirm.delete.acl": "Are you sure you want to delete this ACL?",
13331331
"message.confirm.delete.bigswitchbcf": "Please confirm that you would like to delete this BigSwitch BCF Controller",
13341332
"message.confirm.delete.brocadevcs": "Please confirm that you would like to delete Brocade Vcs Switch",
13351333
"message.confirm.delete.ciscoasa1000v": "Please confirm you want to delete CiscoASA1000v",

‎ui/public/locales/de_DE.json

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
"label.account.specific": "Besonderheiten des Benutzerkontos",
2727
"label.accounts": "Benutzerkonten",
2828
"label.accounttype": "Benutzerkontotyp",
29-
"label.acl.export": "Export ACLs",
29+
"label.acl.export": "Export ACL rules",
3030
"label.acl.id": "ACL-Kennung",
31-
"label.acl.list.rules": "ACL-Listenregeln",
31+
"label.acl.rules": "ACL-Listenregeln",
3232
"label.acl.reason.description": "Enter the reason behind an ACL rule.",
3333
"label.aclid": "ACL",
34-
"label.aclname": "ACL-Name",
34+
"label.acl.rule.name": "ACL-Name",
3535
"label.acquire.new.ip": "Neue IP erwerben",
3636
"label.acquire.new.secondary.ip": "Neue sekundäre IP anfordern",
3737
"label.acquiring.ip": "IP anfordern",
@@ -144,8 +144,8 @@
144144
"label.activeviewersessions": "Aktive Sitzungen",
145145
"label.add": "Hinzufügen",
146146
"label.add.account": "Konto hinzufügen",
147-
"label.add.acl": "ACL hinzufügen",
148-
"label.add.acl.list": "ACL-Liste hinzufügen",
147+
"label.add.acl.rule": "ACL hinzufügen",
148+
"label.add.acl": "ACL-Liste hinzufügen",
149149
"label.add.affinity.group": "Neue Affinitätsgruppe hinzufügen",
150150
"label.add.baremetal.dhcp.device": "Baremetal DHCP-Gerät hinzufügen",
151151
"label.add.bigswitchbcf.device": "Füge BigSwitch BCF Controller hinzu",
@@ -169,12 +169,12 @@
169169
"label.add.isolated.network": "Isoliertes Netzwerk hinzufügen",
170170
"label.add.kubernetes.cluster": "Kubernetes Cluster hinzufügen",
171171
"label.add.ldap.account": "LDAP-Konto hinzufügen",
172-
"label.add.list.name": "ACL-Listename",
172+
"label.add.acl.name": "ACL-Listename",
173173
"label.add.more": "Mehr hinzufügen",
174174
"label.add.netscaler.device": "Netscaler-Gerät hinzufügen",
175175
"label.add.network": "Netzwerk hinzufügen",
176176
"label.add.network.acl": "Netzwerk-ACL hinzufügen",
177-
"label.add.network.acl.list": "Netzwerk-ACL-Liste hinzufügen",
177+
"label.add.network.acl": "Netzwerk-ACL-Liste hinzufügen",
178178
"label.add.network.offering": "Netzwerkangebot hinzufügen",
179179
"label.add.new.gateway": "Neues Gateway hinzufügen",
180180
"label.add.new.tier": "Neue Ebene hinzufügen",
@@ -417,7 +417,7 @@
417417
"label.default.view": "Standardansicht",
418418
"label.defaultnetwork": "Standard-Netzwerk",
419419
"label.delete": "Löschen",
420-
"label.delete.acl.list": "ACL-Liste ersetzen",
420+
"label.delete.acl": "ACL-Liste ersetzen",
421421
"label.delete.affinity.group": "Affinitätsgruppe entfernen",
422422
"label.delete.alerts": "Alarme löschen",
423423
"label.delete.backup": "Backup löschen",
@@ -525,7 +525,7 @@
525525
"label.driver": "Treiber",
526526
"label.dynamicscalingenabled": "Dynamische Skalierung aktiviert",
527527
"label.edit": "Bearbeiten",
528-
"label.edit.acl.list": "Edit ACL List",
528+
"label.edit.acl": "Edit ACL",
529529
"label.edit.acl.rule": "ACL-Regel bearbeiten",
530530
"label.edit.project.details": "Projektdetails bearbeiten",
531531
"label.edit.role": "Rolle bearbeiten",
@@ -948,7 +948,7 @@
948948
"label.netscaler.vpx": "NetScaler VPX LoadBalancer",
949949
"label.network": "Netzwerk",
950950
"label.network.acl": "Netzwerk-ACL",
951-
"label.network.acl.lists": "Netzwerk ACL Listen",
951+
"label.network.acls": "Netzwerk ACL Listen",
952952
"label.network.addvm": "Netzwerk zur VM hinzufügen",
953953
"label.network.desc": "Netzwerkbeschreibung",
954954
"label.network.domain": "Netzwerk-Domain",
@@ -1198,7 +1198,6 @@
11981198
"label.remove.vpc.offering": "VPC-Angebot entfernen",
11991199
"label.removing": "am Entfernen",
12001200
"label.replace.acl": "ACL ersetzen",
1201-
"label.replace.acl.list": "ACL-Liste ersetzen",
12021201
"label.report.bug": "Fehler melden",
12031202
"label.required": "Erforderlich",
12041203
"label.requireshvm": "HVM",
@@ -1492,8 +1491,7 @@
14921491
"label.usenewdiskoffering": "Replace disk offering?",
14931492
"label.user": "Benutzer",
14941493
"label.user.conflict": "Konflikt",
1495-
"label.userdata": "Benutzerdaten",
1496-
"label.userdatal2": "Benutzerdaten",
1494+
"label.user.data": "Benutzerdaten",
14971495
"label.username": "Benutzername",
14981496
"label.users": "Benutzer",
14991497
"label.usersource": "Benutzertyp",
@@ -1733,7 +1731,7 @@
17331731
"message.confirm.archive.selected.alerts": "Bitte bestätigen Sie, dass Sie die ausgewählten Alarme archivieren möchten",
17341732
"message.confirm.archive.selected.events": "Bitte bestätigen Sie, dass Sie die ausgewählten Vorgänge archivieren möchten",
17351733
"message.confirm.attach.disk": "Sind Sie sicher, dass Sie eine Platte hinzufügen möchten?",
1736-
"message.confirm.delete.acl.list": "Sind Sie sicher, dass Sie diese ACL-Liste löschen möchten?",
1734+
"message.confirm.delete.acl": "Sind Sie sicher, dass Sie diese ACL-Liste löschen möchten?",
17371735
"message.confirm.delete.bigswitchbcf": "Bitte bestätigen Sie, dass Sie diesen BigSwitch BCF Controller löschen möchten",
17381736
"message.confirm.delete.brocadevcs": "Bitte bestätigen Sie, dass Sie Brocade Vcs Switch löschen möchten",
17391737
"message.confirm.delete.ciscoasa1000v": "Bitte bestätigen Sie, dass Sie CiscoASA1000v löschen möchten",

0 commit comments

Comments
 (0)