Skip to content

polish: Fix some inconsistencies in object names and messages #10856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 11 commits into
base: 4.20
Choose a base branch
from
Draft

polish: Fix some inconsistencies in object names and messages #10856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4334097
Replace ACL list with ACL and related changes to the json files in pu…
abh1sar Apr 30, 2025
afab814
Replace ACL list with ACL and related changes to network.js, VpcTab.v…
abh1sar Apr 30, 2025
41eee1f
Replace Export ACLs with Export ACL rules
abh1sar Apr 30, 2025
0519d76
standardize the term user data everywhere. fix the placeholder in reg…
abh1sar Apr 30, 2025
6c987c8
Convert resource names in main menu and action buttons to Title case
abh1sar May 7, 2025
8252d53
Use special icon for sharedfs instance and prefix for sharedfs volumes
abh1sar May 7, 2025
64462e8
Give custom icon precedence over shared fs icon
abh1sar May 7, 2025
d980cd0
Merge remote-tracking branch 'upstream/4.20' into ui-polish
abh1sar May 13, 2025
ff30b6f
Fixed some issues with public/locale files
abh1sar May 13, 2025
a75802a
Revert sharedfsvm changes
abh1sar May 13, 2025
c55630f
Added label.add.acl.name to en.json which was incorrectly removed
abh1sar May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import com.cloud.user.UserData;

@APICommand(name = "registerUserData",
description = "Register a new userdata.",
description = "Register a new user data.",
since = "4.18",
responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false,
Expand All @@ -56,33 +56,33 @@ public class RegisterUserDataCmd extends BaseCmd {
//////////////// API parameters /////////////////////
/////////////////////////////////////////////////////

@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of the userdata")
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of the user data")
private String name;

//Owner information
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an optional account for the userdata. Must be used with domainId.")
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an optional account for the user data. Must be used with domainId.")
private String accountName;

@Parameter(name = ApiConstants.DOMAIN_ID,
type = CommandType.UUID,
entityType = DomainResponse.class,
description = "an optional domainId for the userdata. If the account parameter is used, domainId must also be used.")
description = "an optional domainId for the user data. If the account parameter is used, domainId must also be used.")
private Long domainId;

@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the userdata")
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the user data")
private Long projectId;

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

@Parameter(name = ApiConstants.PARAMS, type = CommandType.STRING, description = "comma separated list of variables declared in userdata content")
@Parameter(name = ApiConstants.PARAMS, type = CommandType.STRING, description = "comma separated list of variables declared in the user data content")
private String params;


Expand Down
22 changes: 11 additions & 11 deletions api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,41 +27,41 @@
public class UserDataResponse extends BaseResponseWithAnnotations implements ControlledEntityResponse {

@SerializedName(ApiConstants.ID)
@Param(description = "ID of the ssh keypair")
@Param(description = "ID of the user data")
private String id;

@SerializedName(ApiConstants.NAME)
@Param(description = "Name of the userdata")
@Param(description = "Name of the user data")
private String name;

@SerializedName(ApiConstants.ACCOUNT_ID) @Param(description="the owner id of the userdata")
@SerializedName(ApiConstants.ACCOUNT_ID) @Param(description="the owner id of the user data")
private String accountId;

@SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the userdata")
@SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the user data")
private String accountName;

@SerializedName(ApiConstants.PROJECT_ID)
@Param(description = "the project id of the userdata", since = "4.19.1")
@Param(description = "the project id of the user data", since = "4.19.1")
private String projectId;

@SerializedName(ApiConstants.PROJECT)
@Param(description = "the project name of the userdata", since = "4.19.1")
@Param(description = "the project name of the user data", since = "4.19.1")
private String projectName;

@SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the userdata owner")
@SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the user data owner")
private String domainId;

@SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the userdata owner")
@SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the user data owner")
private String domain;

@SerializedName(ApiConstants.DOMAIN_PATH)
@Param(description = "path of the domain to which the userdata owner belongs", since = "4.19.2.0")
@Param(description = "path of the domain to which the user data owner belongs", since = "4.19.2.0")
private String domainPath;

@SerializedName(ApiConstants.USER_DATA) @Param(description="base64 encoded userdata content")
@SerializedName(ApiConstants.USER_DATA) @Param(description="base64 encoded user data content")
private String userData;

@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")
@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")
private String params;

public UserDataResponse() {
Expand Down
22 changes: 11 additions & 11 deletions ui/public/locales/ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"label.account.specific": "Account-Specific",
"label.accounts": "Accounts",
"label.accounttype": "Account Type",
"label.acl.export": "Export ACLs",
"label.acl.export": "Export ACL rules",
"label.acl.id": "ACL ID",
"label.acl.list.rules": "ACL List Rules",
"label.acl.rules": "ACL Rules",
"label.acl.reason.description": "Enter the reason behind an ACL rule.",
"label.aclid": "ACL",
"label.aclname": "ACL Name",
"label.acl.rule.name": "ACL Name",
"label.acquire.new.ip": "Acquire New IP",
"label.acquire.new.secondary.ip": "Acquire new secondary IP",
"label.action": "Action",
Expand Down Expand Up @@ -119,8 +119,8 @@
"label.activeviewersessions": "Active Sessions",
"label.add": "Add",
"label.add.account": "Add Account",
"label.add.acl": "\u0625\u0636\u0627\u0641\u0629 ACL",
"label.add.acl.list": "Add ACL List",
"label.add.acl.rule": "\u0625\u0636\u0627\u0641\u0629 ACL",
"label.add.acl": "Add ACL",
"label.add.affinity.group": "Add new affinity group",
"label.add.baremetal.dhcp.device": "Add Baremetal DHCP Device",
"label.add.bigswitchbcf.device": "Add BigSwitch BCF Controller",
Expand All @@ -142,12 +142,12 @@
"label.add.ip.range": "Add IP Range",
"label.add.isolated.network": "Add Isolated Network",
"label.add.ldap.account": "Add LDAP account",
"label.add.list.name": "ACL List Name",
"label.add.acl.name": "ACL Name",
"label.add.more": "Add More",
"label.add.netscaler.device": "Add Netscaler device",
"label.add.network": "Add Network",
"label.add.network.acl": "\u0625\u0636\u0627\u0641\u0629 \u0634\u0628\u0643\u0629 ACL",
"label.add.network.acl.list": "Add Network ACL List",
"label.add.network.acl": "Add Network ACL",
"label.add.network.offering": "Add network offering",
"label.add.new.gateway": "\u0623\u0636\u0641 \u0628\u0648\u0627\u0628\u0629 \u062c\u062f\u064a\u062f\u0629",
"label.add.new.tier": "\u0625\u0636\u0627\u0641\u0629 \u0637\u0628\u0642\u0629 \u062c\u062f\u064a\u062f\u0629",
Expand Down Expand Up @@ -334,7 +334,7 @@
"label.default.use": "Default Use",
"label.default.view": "\u0637\u0631\u064a\u0642\u0629 \u0627\u0644\u0639\u0631\u0636 \u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a\u0629",
"label.delete": "Delete",
"label.delete.acl.list": "Delete ACL List",
"label.delete.acl": "Delete ACL",
"label.delete.affinity.group": "Delete Affinity Group",
"label.delete.alerts": "Delete alerts",
"label.delete.bigswitchbcf": "Remove BigSwitch BCF Controller",
Expand Down Expand Up @@ -419,7 +419,7 @@
"label.dpd": "\u0643\u0634\u0641 \u0627\u0644\u0642\u0631\u064a\u0646 \u0627\u0644\u0645\u0641\u0642\u0648\u062f",
"label.driver": "Driver",
"label.edit": "Edit",
"label.edit.acl.list": "Edit ACL List",
"label.edit.acl": "Edit ACL",
"label.edit.acl.rule": "Edit ACL rule",
"label.edit.project.details": "\u0627\u0636\u0627\u0641\u0629 \u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0645\u0634\u0631\u0648\u0639",
"label.edit.role": "Edit Role",
Expand Down Expand Up @@ -924,7 +924,7 @@
"label.remove.vpc.offering": "Remove VPC offering",
"label.removing": "Removing",
"label.replace.acl": "Replace ACL",
"label.replace.acl.list": "Replace ACL List",
"label.replace.acl.list": "Replace ACL",
"label.required": "Required",
"label.requireshvm": "HVM",
"label.requiresupgrade": "Requires Upgrade",
Expand Down Expand Up @@ -1329,7 +1329,7 @@
"message.confirm.archive.selected.alerts": "Please confirm you would like to archive the selected alerts",
"message.confirm.archive.selected.events": "Please confirm you would like to archive the selected events",
"message.confirm.attach.disk": "Are you sure you want to attach disk?",
"message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?",
"message.confirm.delete.acl": "Are you sure you want to delete this ACL?",
"message.confirm.delete.bigswitchbcf": "Please confirm that you would like to delete this BigSwitch BCF Controller",
"message.confirm.delete.brocadevcs": "Please confirm that you would like to delete Brocade Vcs Switch",
"message.confirm.delete.ciscoasa1000v": "Please confirm you want to delete CiscoASA1000v",
Expand Down
20 changes: 10 additions & 10 deletions ui/public/locales/ca.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"label.account.specific": "Account-Specific",
"label.accounts": "Accounts",
"label.accounttype": "Account Type",
"label.acl.export": "Export ACLs",
"label.acl.export": "Export ACL rules",
"label.acl.id": "ACL ID",
"label.acl.list.rules": "ACL List Rules",
"label.acl.rules": "ACL Rules",
"label.acl.reason.description": "Enter the reason behind an ACL rule.",
"label.aclid": "ACL",
"label.aclname": "ACL Name",
"label.acl.rule.name": "ACL Name",
"label.acquire.new.ip": "Acquire New IP",
"label.acquire.new.secondary.ip": "Acquire new secondary IP",
"label.action": "Action",
Expand Down Expand Up @@ -119,8 +119,8 @@
"label.activeviewersessions": "Active Sessions",
"label.add": "Add",
"label.add.account": "Add Account",
"label.add.acl.rule": "Add ACL rule",
"label.add.acl": "Add ACL",
"label.add.acl.list": "Add ACL List",
"label.add.affinity.group": "Add new affinity group",
"label.add.baremetal.dhcp.device": "Add Baremetal DHCP Device",
"label.add.bigswitchbcf.device": "Add BigSwitch BCF Controller",
Expand All @@ -142,12 +142,12 @@
"label.add.ip.range": "Add IP Range",
"label.add.isolated.network": "Add Isolated Network",
"label.add.ldap.account": "Add LDAP account",
"label.add.list.name": "ACL List Name",
"label.add.acl.name": "ACL Name",
"label.add.more": "Add More",
"label.add.netscaler.device": "Add Netscaler device",
"label.add.network": "Add Network",
"label.add.network.acl": "Add network ACL",
"label.add.network.acl.list": "Add Network ACL List",
"label.add.network.acl": "Add Network ACL",
"label.add.network.offering": "Add network offering",
"label.add.new.gateway": "Add new gateway",
"label.add.new.tier": "Add new tier",
Expand Down Expand Up @@ -334,7 +334,7 @@
"label.default.use": "Default Use",
"label.default.view": "Default View",
"label.delete": "Delete",
"label.delete.acl.list": "Delete ACL List",
"label.delete.acl": "Delete ACL",
"label.delete.affinity.group": "Delete Affinity Group",
"label.delete.alerts": "Delete alerts",
"label.delete.bigswitchbcf": "Remove BigSwitch BCF Controller",
Expand Down Expand Up @@ -419,7 +419,7 @@
"label.dpd": "Dead Peer Detection",
"label.driver": "Driver",
"label.edit": "Edit",
"label.edit.acl.list": "Edit ACL List",
"label.edit.acl": "Edit ACL",
"label.edit.acl.rule": "Edit ACL rule",
"label.edit.project.details": "Editar detalls del projecte",
"label.edit.role": "Edit Role",
Expand Down Expand Up @@ -924,7 +924,7 @@
"label.remove.vpc.offering": "Remove VPC offering",
"label.removing": "Esborrant",
"label.replace.acl": "Replace ACL",
"label.replace.acl.list": "Replace ACL List",
"label.replace.acl.list": "Replace ACL",
"label.required": "Required",
"label.requireshvm": "HVM",
"label.requiresupgrade": "Requires Upgrade",
Expand Down Expand Up @@ -1329,7 +1329,7 @@
"message.confirm.archive.selected.alerts": "Please confirm you would like to archive the selected alerts",
"message.confirm.archive.selected.events": "Please confirm you would like to archive the selected events",
"message.confirm.attach.disk": "Are you sure you want to attach disk?",
"message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?",
"message.confirm.delete.acl": "Are you sure you want to delete this ACL?",
"message.confirm.delete.bigswitchbcf": "Please confirm that you would like to delete this BigSwitch BCF Controller",
"message.confirm.delete.brocadevcs": "Please confirm that you would like to delete Brocade Vcs Switch",
"message.confirm.delete.ciscoasa1000v": "Please confirm you want to delete CiscoASA1000v",
Expand Down
22 changes: 11 additions & 11 deletions ui/public/locales/de_DE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"label.account.specific": "Besonderheiten des Benutzerkontos",
"label.accounts": "Benutzerkonten",
"label.accounttype": "Benutzerkontotyp",
"label.acl.export": "Export ACLs",
"label.acl.export": "Export ACL rules",
"label.acl.id": "ACL-Kennung",
"label.acl.list.rules": "ACL-Listenregeln",
"label.acl.rules": "ACL-Listenregeln",
"label.acl.reason.description": "Enter the reason behind an ACL rule.",
"label.aclid": "ACL",
"label.aclname": "ACL-Name",
"label.acl.rule.name": "ACL-Name",
"label.acquire.new.ip": "Neue IP erwerben",
"label.acquire.new.secondary.ip": "Neue sekundäre IP anfordern",
"label.acquiring.ip": "IP anfordern",
Expand Down Expand Up @@ -144,8 +144,8 @@
"label.activeviewersessions": "Aktive Sitzungen",
"label.add": "Hinzufügen",
"label.add.account": "Konto hinzufügen",
"label.add.acl": "ACL hinzufügen",
"label.add.acl.list": "ACL-Liste hinzufügen",
"label.add.acl.rule": "ACL hinzufügen",
"label.add.acl": "ACL-Liste hinzufügen",
"label.add.affinity.group": "Neue Affinitätsgruppe hinzufügen",
"label.add.baremetal.dhcp.device": "Baremetal DHCP-Gerät hinzufügen",
"label.add.bigswitchbcf.device": "Füge BigSwitch BCF Controller hinzu",
Expand All @@ -169,12 +169,12 @@
"label.add.isolated.network": "Isoliertes Netzwerk hinzufügen",
"label.add.kubernetes.cluster": "Kubernetes Cluster hinzufügen",
"label.add.ldap.account": "LDAP-Konto hinzufügen",
"label.add.list.name": "ACL-Listename",
"label.add.acl.name": "ACL-Listename",
"label.add.more": "Mehr hinzufügen",
"label.add.netscaler.device": "Netscaler-Gerät hinzufügen",
"label.add.network": "Netzwerk hinzufügen",
"label.add.network.acl": "Netzwerk-ACL hinzufügen",
"label.add.network.acl.list": "Netzwerk-ACL-Liste hinzufügen",
"label.add.network.acl": "Netzwerk-ACL-Liste hinzufügen",
"label.add.network.offering": "Netzwerkangebot hinzufügen",
"label.add.new.gateway": "Neues Gateway hinzufügen",
"label.add.new.tier": "Neue Ebene hinzufügen",
Expand Down Expand Up @@ -417,7 +417,7 @@
"label.default.view": "Standardansicht",
"label.defaultnetwork": "Standard-Netzwerk",
"label.delete": "Löschen",
"label.delete.acl.list": "ACL-Liste ersetzen",
"label.delete.acl": "ACL-Liste ersetzen",
"label.delete.affinity.group": "Affinitätsgruppe entfernen",
"label.delete.alerts": "Alarme löschen",
"label.delete.backup": "Backup löschen",
Expand Down Expand Up @@ -525,7 +525,7 @@
"label.driver": "Treiber",
"label.dynamicscalingenabled": "Dynamische Skalierung aktiviert",
"label.edit": "Bearbeiten",
"label.edit.acl.list": "Edit ACL List",
"label.edit.acl": "Edit ACL",
"label.edit.acl.rule": "ACL-Regel bearbeiten",
"label.edit.project.details": "Projektdetails bearbeiten",
"label.edit.role": "Rolle bearbeiten",
Expand Down Expand Up @@ -948,7 +948,7 @@
"label.netscaler.vpx": "NetScaler VPX LoadBalancer",
"label.network": "Netzwerk",
"label.network.acl": "Netzwerk-ACL",
"label.network.acl.lists": "Netzwerk ACL Listen",
"label.network.acls": "Netzwerk ACL Listen",
"label.network.addvm": "Netzwerk zur VM hinzufügen",
"label.network.desc": "Netzwerkbeschreibung",
"label.network.domain": "Netzwerk-Domain",
Expand Down Expand Up @@ -1733,7 +1733,7 @@
"message.confirm.archive.selected.alerts": "Bitte bestätigen Sie, dass Sie die ausgewählten Alarme archivieren möchten",
"message.confirm.archive.selected.events": "Bitte bestätigen Sie, dass Sie die ausgewählten Vorgänge archivieren möchten",
"message.confirm.attach.disk": "Sind Sie sicher, dass Sie eine Platte hinzufügen möchten?",
"message.confirm.delete.acl.list": "Sind Sie sicher, dass Sie diese ACL-Liste löschen möchten?",
"message.confirm.delete.acl": "Sind Sie sicher, dass Sie diese ACL-Liste löschen möchten?",
"message.confirm.delete.bigswitchbcf": "Bitte bestätigen Sie, dass Sie diesen BigSwitch BCF Controller löschen möchten",
"message.confirm.delete.brocadevcs": "Bitte bestätigen Sie, dass Sie Brocade Vcs Switch löschen möchten",
"message.confirm.delete.ciscoasa1000v": "Bitte bestätigen Sie, dass Sie CiscoASA1000v löschen möchten",
Expand Down
Loading
Loading