diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md index 7e0091fa24..6147e60208 100644 --- a/packages/zowe-explorer-api/CHANGELOG.md +++ b/packages/zowe-explorer-api/CHANGELOG.md @@ -6,6 +6,8 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t ### New features and enhancements +- Zowe Explorer now includes support for the [VS Code display languages](https://code.visualstudio.com/docs/getstarted/locales) French, German, Japanese, Portuguese, and Spanish. + ### Bug fixes ## `3.0.1` diff --git a/packages/zowe-explorer-api/src/fs/BaseProvider.ts b/packages/zowe-explorer-api/src/fs/BaseProvider.ts index 3d099f3060..9f1206157c 100644 --- a/packages/zowe-explorer-api/src/fs/BaseProvider.ts +++ b/packages/zowe-explorer-api/src/fs/BaseProvider.ts @@ -52,11 +52,11 @@ export class BaseProvider { } await vscode.workspace.fs.writeFile(uri.with({ query: "forceUpload=true" }), fsEntry.data); Gui.setStatusBarMessage( - vscode.l10n.t({ - message: "$(check) Overwrite applied for {0}", + `$(check) ${vscode.l10n.t({ + message: "Overwrite applied for {0}", args: [fsEntry.name], comment: "File name", - }), + })}`, this.FS_PROVIDER_UI_TIMEOUT ); fsEntry.conflictData = null; diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md index 0a688fc732..f0f6010e65 100644 --- a/packages/zowe-explorer/CHANGELOG.md +++ b/packages/zowe-explorer/CHANGELOG.md @@ -6,6 +6,8 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen ### New features and enhancements +- Zowe Explorer now includes support for the [VS Code display languages](https://code.visualstudio.com/docs/getstarted/locales) French, German, Japanese, Portuguese, and Spanish. Download the respective language pack and switch. + ### Bug fixes ## `3.0.1` diff --git a/packages/zowe-explorer/l10n/bundle.l10n.json b/packages/zowe-explorer/l10n/bundle.l10n.json index 69f6380b85..475c9aff0e 100644 --- a/packages/zowe-explorer/l10n/bundle.l10n.json +++ b/packages/zowe-explorer/l10n/bundle.l10n.json @@ -174,7 +174,7 @@ "The 'move' function is not implemented for this USS API.": "The 'move' function is not implemented for this USS API.", "Could not list USS files: Empty path provided in URI": "Could not list USS files: Empty path provided in URI", "Profile does not exist for this file.": "Profile does not exist for this file.", - "$(sync~spin) Saving USS file...": "$(sync~spin) Saving USS file...", + "Saving USS file...": "Saving USS file...", "Renaming {0} failed due to API error: {1}/File pathError message": { "message": "Renaming {0} failed due to API error: {1}", "comment": [ @@ -210,11 +210,11 @@ ] }, "Binary": "Binary", - "$(plus) Create a new filter": "$(plus) Create a new filter", + "Create a new filter": "Create a new filter", "Failed to move file {0}: {1}": "Failed to move file {0}: {1}", "Confirm": "Confirm", "One or more items may be overwritten from this drop operation. Confirm or cancel?": "One or more items may be overwritten from this drop operation. Confirm or cancel?", - "$(sync~spin) Moving USS files...": "$(sync~spin) Moving USS files...", + "Moving USS files...": "Moving USS files...", "Unable to rename {0} because you have unsaved changes in this {1}. Please save your work before renaming the {1}./Node pathNode type": { "message": "Unable to rename {0} because you have unsaved changes in this {1}. Please save your work before renaming the {1}.", "comment": [ @@ -266,7 +266,7 @@ }, "initializeUSSFavorites.error.buttonRemove": "initializeUSSFavorites.error.buttonRemove", "File does not exist. It may have been deleted.": "File does not exist. It may have been deleted.", - "$(sync~spin) Pulling from Mainframe...": "$(sync~spin) Pulling from Mainframe...", + "Pulling from Mainframe...": "Pulling from Mainframe...", "{0} location/Node type": { "message": "{0} location", "comment": [ @@ -353,21 +353,21 @@ "No spool files found": "No spool files found", "No jobs found": "No jobs found", "Retrieving response from JES list API": "Retrieving response from JES list API", - "$(list-ordered) Job ID (default)": "$(list-ordered) Job ID (default)", - "$(calendar) Date Submitted": "$(calendar) Date Submitted", - "$(calendar) Date Completed": "$(calendar) Date Completed", - "$(case-sensitive) Job Name": "$(case-sensitive) Job Name", - "$(symbol-numeric) Return Code": "$(symbol-numeric) Return Code", - "$(fold) Sort Direction": "$(fold) Sort Direction", + "Job ID (default)": "Job ID (default)", + "Date Submitted": "Date Submitted", + "Date Completed": "Date Completed", + "Job Name": "Job Name", + "Return Code": "Return Code", + "Sort Direction": "Sort Direction", "Go to Local Filtering": "Go to Local Filtering", - "$(clear-all) Clear filter for profile": "$(clear-all) Clear filter for profile", + "Clear filter for profile": "Clear filter for profile", "Create new...": "Create new...", - "$(check) Submit this query": "$(check) Submit this query", + "Submit this query": "Submit this query", "Enter job owner ID": "Enter job owner ID", "Enter job prefix": "Enter job prefix", "Enter job status": "Enter job status", - "$(plus) Create job search filter": "$(plus) Create job search filter", - "$(search) Search by job ID": "$(search) Search by job ID", + "Create job search filter": "Create job search filter", + "Search by job ID": "Search by job ID", "Initializing profiles with jobs favorites.": "Initializing profiles with jobs favorites.", "No jobs favorites found.": "No jobs favorites found.", "Loading profile: {0} for jobs favorites/Profile name": { @@ -399,8 +399,8 @@ "URI path" ] }, - "$(sync~spin) Polling: {0}.../Unique Spool name": { - "message": "$(sync~spin) Polling: {0}...", + "Polling: {0}.../Unique Spool name": { + "message": "Polling: {0}...", "comment": [ "Unique Spool name" ] @@ -412,15 +412,15 @@ ] }, "Set a filter...": "Set a filter...", - "$(check) Filter cleared for {0}/Job label": { - "message": "$(check) Filter cleared for {0}", + "Filter cleared for {0}/Job label": { + "message": "Filter cleared for {0}", "comment": [ "Job label" ] }, "Enter local filter...": "Enter local filter...", - "$(check) Filter updated for {0}/Job label": { - "message": "$(check) Filter updated for {0}", + "Filter updated for {0}/Job label": { + "message": "Filter updated for {0}", "comment": [ "Job label" ] @@ -448,7 +448,6 @@ "Class": "Class", "Owner": "Owner", "ID": "ID", - "Return Code": "Return Code", "Status": "Status", "Subsystem": "Subsystem", "Type": "Type", @@ -456,7 +455,7 @@ "Phase": "Phase", "Phase Name": "Phase Name", "Error Details": "Error Details", - "$(sync~spin) Fetching spool file...": "$(sync~spin) Fetching spool file...", + "Fetching spool file...": "Fetching spool file...", "Failed to fetch jobs: getJobsByParameters is not implemented for this session's JES API.": "Failed to fetch jobs: getJobsByParameters is not implemented for this session's JES API.", "Are you sure you want to delete the following item?\nThis will permanently remove the following job from your system.\n\n{0}/Job name": { "message": "Are you sure you want to delete the following item?\nThis will permanently remove the following job from your system.\n\n{0}", @@ -490,8 +489,8 @@ "Spool node label" ] }, - "$(sync~spin) Polling: {0}.../Document file name": { - "message": "$(sync~spin) Polling: {0}...", + "Polling: {0}.../Document file name": { + "message": "Polling: {0}...", "comment": [ "Document file name" ] @@ -528,8 +527,8 @@ ] }, "Select a sorting direction": "Select a sorting direction", - "$(check) Sorting updated for {0}/Session label": { - "message": "$(check) Sorting updated for {0}", + "Sorting updated for {0}/Session label": { + "message": "Sorting updated for {0}", "comment": [ "Session label" ] @@ -540,11 +539,11 @@ "No data sets found": "No data sets found", "Retrieving response from MVS list API": "Retrieving response from MVS list API", "Cannot download, item invalid.": "Cannot download, item invalid.", - "$(case-sensitive) Name (default)": "$(case-sensitive) Name (default)", - "$(calendar) Date Created": "$(calendar) Date Created", - "$(calendar) Date Modified": "$(calendar) Date Modified", - "$(account) User ID": "$(account) User ID", - "$(plus) Create a new filter. For example: HLQ.*, HLQ.aaa.bbb, HLQ.ccc.ddd(member)": "$(plus) Create a new filter. For example: HLQ.*, HLQ.aaa.bbb, HLQ.ccc.ddd(member)", + "Name (default)": "Name (default)", + "Date Created": "Date Created", + "Date Modified": "Date Modified", + "User ID": "User ID", + "Create a new filter. For example: HLQ.*, HLQ.aaa.bbb, HLQ.ccc.ddd(member)": "Create a new filter. For example: HLQ.*, HLQ.aaa.bbb, HLQ.ccc.ddd(member)", "Initializing profiles with data set favorites.": "Initializing profiles with data set favorites.", "No data set favorites found.": "No data set favorites found.", "Error creating data set favorite node: {0} for profile {1}./LabelProfile name": { @@ -604,8 +603,8 @@ "Specifier" ] }, - "$(check) Sorting updated for {0}/Node label": { - "message": "$(check) Sorting updated for {0}", + "Sorting updated for {0}/Node label": { + "message": "Sorting updated for {0}", "comment": [ "Node label" ] @@ -616,15 +615,15 @@ "Filter value" ] }, - "$(clear-all) Clear filter for PDS": "$(clear-all) Clear filter for PDS", + "Clear filter for PDS": "Clear filter for PDS", "Set a filter for {0}/Specifier": { "message": "Set a filter for {0}", "comment": [ "Specifier" ] }, - "$(check) Filter cleared for {0}/Node label": { - "message": "$(check) Filter cleared for {0}", + "Filter cleared for {0}/Node label": { + "message": "Filter cleared for {0}", "comment": [ "Node label" ] @@ -632,8 +631,8 @@ "Invalid date format specified": "Invalid date format specified", "Enter a value to filter by": "Enter a value to filter by", "Invalid filter specified": "Invalid filter specified", - "$(check) Filter updated for {0}/Node label": { - "message": "$(check) Filter updated for {0}", + "Filter updated for {0}/Node label": { + "message": "Filter updated for {0}", "comment": [ "Node label" ] @@ -646,7 +645,7 @@ "Choose the setting location to save the data set template...": "Choose the setting location to save the data set template...", "Save as User setting": "Save as User setting", "Save as Workspace setting": "Save as Workspace setting", - "$(sync~spin) Saving data set...": "$(sync~spin) Saving data set...", + "Saving data set...": "Saving data set...", "Deleting {0} failed due to API error: {1}/File pathError message": { "message": "Deleting {0} failed due to API error: {1}", "comment": [ @@ -795,7 +794,7 @@ ] }, "Item invalid.": "Item invalid.", - "$(sync~spin) Fetching data set...": "$(sync~spin) Fetching data set...", + "Fetching data set...": "Fetching data set...", "Error encountered when refreshing data set view. {0}/Stringified JSON error": { "message": "Error encountered when refreshing data set view. {0}", "comment": [ @@ -832,24 +831,23 @@ ] }, "Error encountered while activating and initializing logger": "Error encountered while activating and initializing logger", - "$(plus) Add Credentials": "$(plus) Add Credentials", + "Add Credentials": "Add Credentials", "Add username and password for basic authentication": "Add username and password for basic authentication", - "$(refresh) Update Credentials": "$(refresh) Update Credentials", "Update stored username and password": "Update stored username and password", - "$(trash) Delete Profile": "$(trash) Delete Profile", - "$(workspace-untrusted) Disable Profile Validation": "$(workspace-untrusted) Disable Profile Validation", + "Delete Profile": "Delete Profile", + "Disable Profile Validation": "Disable Profile Validation", "Disable validation of server check for profile": "Disable validation of server check for profile", - "$(workspace-trusted) Enable Profile Validation": "$(workspace-trusted) Enable Profile Validation", + "Enable Profile Validation": "Enable Profile Validation", "Enable validation of server check for profile": "Enable validation of server check for profile", - "$(pencil) Edit Profile": "$(pencil) Edit Profile", + "Edit Profile": "Edit Profile", "Update profile connection information": "Update profile connection information", - "$(eye-closed) Hide Profile": "$(eye-closed) Hide Profile", + "Hide Profile": "Hide Profile", "Hide profile name from tree view": "Hide profile name from tree view", - "$(key) Change the Authentication Method": "$(key) Change the Authentication Method", + "Change the Authentication Method": "Change the Authentication Method", "Change the authentication method": "Change the authentication method", - "$(arrow-right) Log in to authentication service": "$(arrow-right) Log in to authentication service", + "Log in to authentication service": "Log in to authentication service", "Log in to obtain a new token value": "Log in to obtain a new token value", - "$(arrow-left) Log out of authentication service": "$(arrow-left) Log out of authentication service", + "Log out of authentication service": "Log out of authentication service", "Log out to invalidate and remove stored token value": "Log out to invalidate and remove stored token value", "Profile {0} is using basic authentication. Choose a profile action./Profile name": { "message": "Profile {0} is using basic authentication. Choose a profile action.", @@ -1034,7 +1032,7 @@ "All jobs": "All jobs", "Ascending": "Ascending", "Descending": "Descending", - "$(plus) Create a new Unix command": "$(plus) Create a new Unix command", + "Create a new Unix command": "Create a new Unix command", "Issuing commands is not supported for this profile type, {0}./Profile type": { "message": "Issuing commands is not supported for this profile type, {0}.", "comment": [ @@ -1047,14 +1045,14 @@ "Profile type" ] }, - "Error preparring SSH connection for issueing UNIX commands, please check SSH profile for correctness.": "Error preparring SSH connection for issueing UNIX commands, please check SSH profile for correctness.", + "Error preparing SSH connection for issuing UNIX commands, please check SSH profile for correctness.": "Error preparing SSH connection for issuing UNIX commands, please check SSH profile for correctness.", "No SSH profile found. Please create an SSH profile.": "No SSH profile found. Please create an SSH profile.", "SSH profile missing connection details. Please update.": "SSH profile missing connection details. Please update.", "No profiles available.": "No profiles available.", "Redirecting to Home Directory": "Redirecting to Home Directory", "Zowe Unix Command": "Zowe Unix Command", "An SSH profile will be used for issuing UNIX commands with the profile {0}.": "An SSH profile will be used for issuing UNIX commands with the profile {0}.", - "Error checking if SSH profile type required for issueing UNIX commands, setting requirement to false for profile {0}.": "Error checking if SSH profile type required for issueing UNIX commands, setting requirement to false for profile {0}.", + "Error checking if SSH profile type required for issuing UNIX commands, setting requirement to false for profile {0}.": "Error checking if SSH profile type required for issuing UNIX commands, setting requirement to false for profile {0}.", "Enter the path of the directory in order to execute the command": "Enter the path of the directory in order to execute the command", "Not implemented yet for profile of type: {0}/Profile type": { "message": "Not implemented yet for profile of type: {0}", @@ -1078,7 +1076,7 @@ }, "Enter or update the Unix command": "Enter or update the Unix command", "Unix command submitted.": "Unix command submitted.", - "$(plus) Create a new TSO command": "$(plus) Create a new TSO command", + "Create a new TSO command": "Create a new TSO command", "Zowe TSO Command": "Zowe TSO Command", "Select the Profile to use to submit the TSO command": "Select the Profile to use to submit the TSO command", "Profile is invalid": "Profile is invalid", @@ -1102,7 +1100,7 @@ "Account Number": "Account Number", "Enter the account number for the TSO connection.": "Enter the account number for the TSO connection.", "Operation Cancelled.": "Operation Cancelled.", - "$(plus) Create a new MVS command": "$(plus) Create a new MVS command", + "Create a new MVS command": "Create a new MVS command", "Zowe MVS Command": "Zowe MVS Command", "Select the Profile to use to submit the command": "Select the Profile to use to submit the command", "Select an MVS command to run against {0} (An option to edit will follow)/Host name": { diff --git a/packages/zowe-explorer/l10n/poeditor.json b/packages/zowe-explorer/l10n/poeditor.json index 6e38e9d54b..cb29088079 100644 --- a/packages/zowe-explorer/l10n/poeditor.json +++ b/packages/zowe-explorer/l10n/poeditor.json @@ -494,7 +494,7 @@ "The 'move' function is not implemented for this USS API.": "", "Could not list USS files: Empty path provided in URI": "", "Profile does not exist for this file.": "", - "$(sync~spin) Saving USS file...": "", + "Saving USS file...": "", "Renaming {0} failed due to API error: {1}": "", "Deleting {0} failed due to API error: {1}": "", "No error details given": "", @@ -502,11 +502,11 @@ "Downloaded: {0}": "", "Encoding: {0}": "", "Binary": "", - "$(plus) Create a new filter": "", + "Create a new filter": "", "Failed to move file {0}: {1}": "", "Confirm": "", "One or more items may be overwritten from this drop operation. Confirm or cancel?": "", - "$(sync~spin) Moving USS files...": "", + "Moving USS files...": "", "Unable to rename {0} because you have unsaved changes in this {1}. Please save your work before renaming the {1}.": "", "Enter a new name for the {0}": "", "Unable to rename node:": "", @@ -526,7 +526,7 @@ "Error: You have Zowe USS favorites that refer to a non-existent CLI profile named: {0}.\n To resolve this, you can remove {0} from the Favorites section of Zowe Explorer's USS view.\n Would you like to do this now? {1}": "", "initializeUSSFavorites.error.buttonRemove": "", "File does not exist. It may have been deleted.": "", - "$(sync~spin) Pulling from Mainframe...": "", + "Pulling from Mainframe...": "", "{0} location": "", "Choose a location to create the {0}": "", "Name of file or directory": "", @@ -573,21 +573,21 @@ "No spool files found": "", "No jobs found": "", "Retrieving response from JES list API": "", - "$(list-ordered) Job ID (default)": "", - "$(calendar) Date Submitted": "", - "$(calendar) Date Completed": "", - "$(case-sensitive) Job Name": "", - "$(symbol-numeric) Return Code": "", - "$(fold) Sort Direction": "", + "Job ID (default)": "", + "Date Submitted": "", + "Date Completed": "", + "Job Name": "", + "Return Code": "", + "Sort Direction": "", "Go to Local Filtering": "", - "$(clear-all) Clear filter for profile": "", + "Clear filter for profile": "", "Create new...": "", - "$(check) Submit this query": "", + "Submit this query": "", "Enter job owner ID": "", "Enter job prefix": "", "Enter job status": "", - "$(plus) Create job search filter": "", - "$(search) Search by job ID": "", + "Create job search filter": "", + "Search by job ID": "", "Initializing profiles with jobs favorites.": "", "No jobs favorites found.": "", "Loading profile: {0} for jobs favorites": "", @@ -598,12 +598,12 @@ "Job search cancelled.": "", "The polling interval must be greater than or equal to 1000ms.": "", "Poll interval (in ms) for: {0}": "", - "$(sync~spin) Polling: {0}...": "", + "Polling: {0}...": "", "Filter: {0}": "", "Set a filter...": "", - "$(check) Filter cleared for {0}": "", + "Filter cleared for {0}": "", "Enter local filter...": "", - "$(check) Filter updated for {0}": "", + "Filter updated for {0}": "", "Get JCL": "", "Display in Tree": "", "Cancel": "", @@ -615,7 +615,6 @@ "Class": "", "Owner": "", "ID": "", - "Return Code": "", "Status": "", "Subsystem": "", "Type": "", @@ -623,7 +622,7 @@ "Phase": "", "Phase Name": "", "Error Details": "", - "$(sync~spin) Fetching spool file...": "", + "Fetching spool file...": "", "Failed to fetch jobs: getJobsByParameters is not implemented for this session's JES API.": "", "Are you sure you want to delete the following item?\nThis will permanently remove the following job from your system.\n\n{0}": "", "Job {0} was deleted.": "", @@ -643,18 +642,18 @@ "Cancelled selected jobs successfully.": "", "Select a sorting option for jobs in {0}": "", "Select a sorting direction": "", - "$(check) Sorting updated for {0}": "", + "Sorting updated for {0}": "", "Use the search button to display data sets": "", "The response from Zowe CLI was not successful": "", "{0} members failed to load due to invalid name errors for {1}": "", "No data sets found": "", "Retrieving response from MVS list API": "", "Cannot download, item invalid.": "", - "$(case-sensitive) Name (default)": "", - "$(calendar) Date Created": "", - "$(calendar) Date Modified": "", - "$(account) User ID": "", - "$(plus) Create a new filter. For example: HLQ.*, HLQ.aaa.bbb, HLQ.ccc.ddd(member)": "", + "Name (default)": "", + "Date Created": "", + "Date Modified": "", + "User ID": "", + "Create a new filter. For example: HLQ.*, HLQ.aaa.bbb, HLQ.ccc.ddd(member)": "", "Initializing profiles with data set favorites.": "", "No data set favorites found.": "", "Error creating data set favorite node: {0} for profile {1}.": "", @@ -672,7 +671,7 @@ "all PDS members in {0}": "", "the PDS members in {0}": "", "Select a sorting option for {0}": "", - "$(clear-all) Clear filter for PDS": "", + "Clear filter for PDS": "", "Set a filter for {0}": "", "Invalid date format specified": "", "Enter a value to filter by": "", @@ -685,7 +684,7 @@ "Choose the setting location to save the data set template...": "", "Save as User setting": "", "Save as Workspace setting": "", - "$(sync~spin) Saving data set...": "", + "Saving data set...": "", "Partitioned Data Set: Binary": "", "Partitioned Data Set: C": "", "Partitioned Data Set: Classic": "", @@ -739,7 +738,7 @@ "Error encountered when deleting data set. {0}": "", "Unable to find file {0}": "", "Item invalid.": "", - "$(sync~spin) Fetching data set...": "", + "Fetching data set...": "", "Error encountered when refreshing data set view. {0}": "", "Cannot perform the copy operation as the data sets selected have different types": "", "Migration of data set {0} requested.": "", @@ -755,24 +754,23 @@ "Unable to copy data set.": "", "Failed to upload changes for {0}: {1}": "", "Error encountered while activating and initializing logger": "", - "$(plus) Add Credentials": "", + "Add Credentials": "", "Add username and password for basic authentication": "", - "$(refresh) Update Credentials": "", "Update stored username and password": "", - "$(trash) Delete Profile": "", - "$(workspace-untrusted) Disable Profile Validation": "", + "Delete Profile": "", + "Disable Profile Validation": "", "Disable validation of server check for profile": "", - "$(workspace-trusted) Enable Profile Validation": "", + "Enable Profile Validation": "", "Enable validation of server check for profile": "", - "$(pencil) Edit Profile": "", + "Edit Profile": "", "Update profile connection information": "", - "$(eye-closed) Hide Profile": "", + "Hide Profile": "", "Hide profile name from tree view": "", - "$(key) Change the Authentication Method": "", + "Change the Authentication Method": "", "Change the authentication method": "", - "$(arrow-right) Log in to authentication service": "", + "Log in to authentication service": "", "Log in to obtain a new token value": "", - "$(arrow-left) Log out of authentication service": "", + "Log out of authentication service": "", "Log out to invalidate and remove stored token value": "", "Profile {0} is using basic authentication. Choose a profile action.": "", "Profile {0} is using token authentication. Choose a profile action.": "", @@ -854,17 +852,17 @@ "All jobs": "", "Ascending": "", "Descending": "", - "$(plus) Create a new Unix command": "", + "Create a new Unix command": "", "Issuing commands is not supported for this profile type, {0}.": "", "Issuing UNIX commands is not supported for this profile type, {0}.": "", - "Error preparring SSH connection for issueing UNIX commands, please check SSH profile for correctness.": "", + "Error preparing SSH connection for issuing UNIX commands, please check SSH profile for correctness.": "", "No SSH profile found. Please create an SSH profile.": "", "SSH profile missing connection details. Please update.": "", "No profiles available.": "", "Redirecting to Home Directory": "", "Zowe Unix Command": "", "An SSH profile will be used for issuing UNIX commands with the profile {0}.": "", - "Error checking if SSH profile type required for issueing UNIX commands, setting requirement to false for profile {0}.": "", + "Error checking if SSH profile type required for issuing UNIX commands, setting requirement to false for profile {0}.": "", "Enter the path of the directory in order to execute the command": "", "Select the ssh Profile.": "", "Select the Profile to use to submit the Unix command": "", @@ -872,7 +870,7 @@ "Select a Unix command to run immediately against {0}": "", "Enter or update the Unix command": "", "Unix command submitted.": "", - "$(plus) Create a new TSO command": "", + "Create a new TSO command": "", "Zowe TSO Command": "", "Select the Profile to use to submit the TSO command": "", "Profile is invalid": "", @@ -886,7 +884,7 @@ "Account Number": "", "Enter the account number for the TSO connection.": "", "Operation Cancelled.": "", - "$(plus) Create a new MVS command": "", + "Create a new MVS command": "", "Zowe MVS Command": "", "Select the Profile to use to submit the command": "", "Select an MVS command to run against {0} (An option to edit will follow)": "", diff --git a/packages/zowe-explorer/src/commands/MvsCommandHandler.ts b/packages/zowe-explorer/src/commands/MvsCommandHandler.ts index b938233430..d0890f4be9 100644 --- a/packages/zowe-explorer/src/commands/MvsCommandHandler.ts +++ b/packages/zowe-explorer/src/commands/MvsCommandHandler.ts @@ -42,7 +42,7 @@ export class MvsCommandHandler extends ZoweCommandProvider { return this.instance; } - private static readonly defaultDialogText: string = vscode.l10n.t("$(plus) Create a new MVS command"); + private static readonly defaultDialogText: string = `$(plus) ${vscode.l10n.t("Create a new MVS command")}`; private static instance: MvsCommandHandler; public outputChannel: vscode.OutputChannel; diff --git a/packages/zowe-explorer/src/commands/TsoCommandHandler.ts b/packages/zowe-explorer/src/commands/TsoCommandHandler.ts index 2f380f2dfe..a83612f748 100644 --- a/packages/zowe-explorer/src/commands/TsoCommandHandler.ts +++ b/packages/zowe-explorer/src/commands/TsoCommandHandler.ts @@ -43,7 +43,7 @@ export class TsoCommandHandler extends ZoweCommandProvider { return this.instance; } - private static readonly defaultDialogText: string = vscode.l10n.t("$(plus) Create a new TSO command"); + private static readonly defaultDialogText: string = `$(plus) ${vscode.l10n.t("Create a new TSO command")}`; private static instance: TsoCommandHandler; public outputChannel: vscode.OutputChannel; diff --git a/packages/zowe-explorer/src/commands/UnixCommandHandler.ts b/packages/zowe-explorer/src/commands/UnixCommandHandler.ts index f9518df971..6e3fbfa72a 100644 --- a/packages/zowe-explorer/src/commands/UnixCommandHandler.ts +++ b/packages/zowe-explorer/src/commands/UnixCommandHandler.ts @@ -43,7 +43,7 @@ export class UnixCommandHandler extends ZoweCommandProvider { return this.instance; } - private static readonly defaultDialogText: string = vscode.l10n.t("$(plus) Create a new Unix command"); + private static readonly defaultDialogText: string = `$(plus) ${vscode.l10n.t("Create a new Unix command")}`; private static instance: UnixCommandHandler; private serviceProf: imperative.IProfileLoaded = undefined; private unixCmdMsgs = { @@ -58,7 +58,7 @@ export class UnixCommandHandler extends ZoweCommandProvider { args: [this.serviceProf?.type], comment: ["Profile type"], }), - sshSessionErrorMsg: vscode.l10n.t("Error preparring SSH connection for issueing UNIX commands, please check SSH profile for correctness."), + sshSessionErrorMsg: vscode.l10n.t("Error preparing SSH connection for issuing UNIX commands, please check SSH profile for correctness."), sshProfNotFoundMsg: vscode.l10n.t("No SSH profile found. Please create an SSH profile."), sshProfMissingInfoMsg: vscode.l10n.t("SSH profile missing connection details. Please update."), noProfilesAvailableMsg: vscode.l10n.t("No profiles available."), @@ -117,7 +117,7 @@ export class UnixCommandHandler extends ZoweCommandProvider { // error would be due to missing API, assuming SSH profile not required ZoweLogger.warn( vscode.l10n.t( - "Error checking if SSH profile type required for issueing UNIX commands, setting requirement to false for profile {0}.", + "Error checking if SSH profile type required for issuing UNIX commands, setting requirement to false for profile {0}.", [this.serviceProf?.name] ) ); diff --git a/packages/zowe-explorer/src/management/ProfileManagement.ts b/packages/zowe-explorer/src/management/ProfileManagement.ts index 26df74a749..f94e57495f 100644 --- a/packages/zowe-explorer/src/management/ProfileManagement.ts +++ b/packages/zowe-explorer/src/management/ProfileManagement.ts @@ -73,62 +73,62 @@ export class ProfileManagement { logout: "invalidate-token", update: "update-credentials", }; - public static basicAuthAddQpItems: Record = { + public static readonly basicAuthAddQpItems: Record = { [ProfileManagement.AuthQpLabels.add]: { - label: vscode.l10n.t("$(plus) Add Credentials"), + label: `$(plus) ${vscode.l10n.t("Add Credentials")}`, description: vscode.l10n.t("Add username and password for basic authentication"), }, }; - public static basicAuthUpdateQpItems: Record = { + public static readonly basicAuthUpdateQpItems: Record = { [ProfileManagement.AuthQpLabels.update]: { - label: vscode.l10n.t("$(refresh) Update Credentials"), + label: `$(refresh) ${vscode.l10n.t("Update Credentials")}`, description: vscode.l10n.t("Update stored username and password"), }, }; - public static deleteProfileQpItem: Record = { + public static readonly deleteProfileQpItem: Record = { [ProfileManagement.AuthQpLabels.delete]: { - label: vscode.l10n.t("$(trash) Delete Profile"), + label: `$(trash) ${vscode.l10n.t("Delete Profile")}`, }, }; - public static disableProfileValildationQpItem: Record = { + public static readonly disableProfileValildationQpItem: Record = { [ProfileManagement.AuthQpLabels.disable]: { - label: vscode.l10n.t("$(workspace-untrusted) Disable Profile Validation"), + label: `$(workspace-untrusted) ${vscode.l10n.t("Disable Profile Validation")}`, description: vscode.l10n.t("Disable validation of server check for profile"), }, }; - public static enableProfileValildationQpItem: Record = { + public static readonly enableProfileValildationQpItem: Record = { [ProfileManagement.AuthQpLabels.enable]: { - label: vscode.l10n.t("$(workspace-trusted) Enable Profile Validation"), + label: `$(workspace-trusted) ${vscode.l10n.t("Enable Profile Validation")}`, description: vscode.l10n.t("Enable validation of server check for profile"), }, }; - public static editProfileQpItems: Record = { + public static readonly editProfileQpItems: Record = { [ProfileManagement.AuthQpLabels.edit]: { - label: vscode.l10n.t("$(pencil) Edit Profile"), + label: `$(pencil) ${vscode.l10n.t("Edit Profile")}`, description: vscode.l10n.t("Update profile connection information"), }, }; - public static hideProfileQpItems: Record = { + public static readonly hideProfileQpItems: Record = { [ProfileManagement.AuthQpLabels.hide]: { - label: vscode.l10n.t("$(eye-closed) Hide Profile"), + label: `$(eye-closed) ${vscode.l10n.t("Hide Profile")}`, description: vscode.l10n.t("Hide profile name from tree view"), }, }; - public static switchAuthenticationQpItems: Record = { + public static readonly switchAuthenticationQpItems: Record = { [ProfileManagement.AuthQpLabels.switch]: { - label: vscode.l10n.t("$(key) Change the Authentication Method"), + label: `$(key) ${vscode.l10n.t("Change the Authentication Method")}`, description: vscode.l10n.t("Change the authentication method"), }, }; - public static tokenAuthLoginQpItem: Record = { + public static readonly tokenAuthLoginQpItem: Record = { [ProfileManagement.AuthQpLabels.login]: { - label: vscode.l10n.t("$(arrow-right) Log in to authentication service"), + label: `$(arrow-right) ${vscode.l10n.t("Log in to authentication service")}`, description: vscode.l10n.t("Log in to obtain a new token value"), }, }; - public static tokenAuthLogoutQpItem: Record = { + public static readonly tokenAuthLogoutQpItem: Record = { [ProfileManagement.AuthQpLabels.logout]: { - label: vscode.l10n.t("$(arrow-left) Log out of authentication service"), + label: `$(arrow-left) ${vscode.l10n.t("Log out of authentication service")}`, description: vscode.l10n.t("Log out to invalidate and remove stored token value"), }, }; diff --git a/packages/zowe-explorer/src/trees/dataset/DatasetActions.ts b/packages/zowe-explorer/src/trees/dataset/DatasetActions.ts index ab8919fdd8..6b469cd61e 100644 --- a/packages/zowe-explorer/src/trees/dataset/DatasetActions.ts +++ b/packages/zowe-explorer/src/trees/dataset/DatasetActions.ts @@ -1254,7 +1254,7 @@ export class DatasetActions { } ZoweLogger.info(`Refreshing data set ${label}`); - const statusMsg = Gui.setStatusBarMessage(vscode.l10n.t("$(sync~spin) Fetching data set...")); + const statusMsg = Gui.setStatusBarMessage(`$(sync~spin) ${vscode.l10n.t("Fetching data set...")}`); await DatasetFSProvider.instance.fetchDatasetAtUri(node.resourceUri, { editor: vscode.window.visibleTextEditors.find((v) => v.document.uri.path === node.resourceUri.path), }); diff --git a/packages/zowe-explorer/src/trees/dataset/DatasetFSProvider.ts b/packages/zowe-explorer/src/trees/dataset/DatasetFSProvider.ts index bf6ddc1455..fc9512b336 100644 --- a/packages/zowe-explorer/src/trees/dataset/DatasetFSProvider.ts +++ b/packages/zowe-explorer/src/trees/dataset/DatasetFSProvider.ts @@ -427,7 +427,7 @@ export class DatasetFSProvider extends BaseProvider implements vscode.FileSystem } private async uploadEntry(parent: DirEntry, entry: DsEntry, content: Uint8Array, forceUpload?: boolean): Promise { - const statusMsg = Gui.setStatusBarMessage(vscode.l10n.t("$(sync~spin) Saving data set...")); + const statusMsg = Gui.setStatusBarMessage(`$(sync~spin) ${vscode.l10n.t("Saving data set...")}`); let resp: IZosFilesResponse; try { const mvsApi = ZoweExplorerApiRegister.getMvsApi(entry.metadata.profile); diff --git a/packages/zowe-explorer/src/trees/dataset/DatasetInit.ts b/packages/zowe-explorer/src/trees/dataset/DatasetInit.ts index 8a7a60d428..309aa722c2 100644 --- a/packages/zowe-explorer/src/trees/dataset/DatasetInit.ts +++ b/packages/zowe-explorer/src/trees/dataset/DatasetInit.ts @@ -53,7 +53,7 @@ export class DatasetInit { ); context.subscriptions.push( vscode.commands.registerCommand("zowe.ds.refreshNode", async (node, nodeList) => { - const statusMsg = Gui.setStatusBarMessage(vscode.l10n.t("$(sync~spin) Pulling from Mainframe...")); + const statusMsg = Gui.setStatusBarMessage(`$(sync~spin) ${vscode.l10n.t("Pulling from Mainframe...")}`); let selectedNodes = SharedUtils.getSelectedNodeList(node, nodeList); selectedNodes = selectedNodes.filter((element) => SharedContext.isDs(element) || SharedContext.isDsMember(element)); for (const item of selectedNodes) { diff --git a/packages/zowe-explorer/src/trees/dataset/DatasetTree.ts b/packages/zowe-explorer/src/trees/dataset/DatasetTree.ts index b99db6fd30..2369002022 100644 --- a/packages/zowe-explorer/src/trees/dataset/DatasetTree.ts +++ b/packages/zowe-explorer/src/trees/dataset/DatasetTree.ts @@ -52,9 +52,9 @@ import { DataSetTemplates } from "./DatasetTemplates"; */ export class DatasetTree extends ZoweTreeProvider implements Types.IZoweDatasetTreeType { private static readonly persistenceSchema: PersistenceSchemaEnum = PersistenceSchemaEnum.Dataset; - private static readonly defaultDialogText: string = vscode.l10n.t( - "$(plus) Create a new filter. For example: HLQ.*, HLQ.aaa.bbb, HLQ.ccc.ddd(member)" - ); + private static readonly defaultDialogText: string = `$(plus) ${vscode.l10n.t( + "Create a new filter. For example: HLQ.*, HLQ.aaa.bbb, HLQ.ccc.ddd(member)" + )}`; public mFavoriteSession: ZoweDatasetNode; public mSessionNodes: IZoweDatasetTreeNode[] = []; @@ -1319,7 +1319,7 @@ export class DatasetTree extends ZoweTreeProvider implemen return; } - if (selection.label === vscode.l10n.t("$(fold) Sort Direction")) { + if (selection.label === DatasetUtils.DATASET_SORT_OPTS[4]) { // Update sort direction (if a new one was provided) const dir = await Gui.showQuickPick(Constants.SORT_DIRS, { placeHolder: vscode.l10n.t("Select a sorting direction"), @@ -1343,11 +1343,11 @@ export class DatasetTree extends ZoweTreeProvider implemen // Update sort for node based on selections this.updateSortForNode(node, { ...sortOpts, method: sortMethod }, isSession); Gui.setStatusBarMessage( - vscode.l10n.t({ - message: "$(check) Sorting updated for {0}", + `$(check) ${vscode.l10n.t({ + message: "Sorting updated for {0}", args: [node.label as string], comment: ["Node label"], - }), + })}`, Constants.MS_PER_SEC * 4 ); } @@ -1436,7 +1436,9 @@ export class DatasetTree extends ZoweTreeProvider implemen args: [node.label as string], comment: ["Node label"], }); - const clearFilter = isSession ? vscode.l10n.t("$(clear-all) Clear filter for profile") : vscode.l10n.t("$(clear-all) Clear filter for PDS"); + const clearFilter = isSession + ? `$(clear-all) ${vscode.l10n.t("Clear filter for profile")}` + : `$(clear-all) ${vscode.l10n.t("Clear filter for PDS")}`; const selection = ( await Gui.showQuickPick( [...DatasetUtils.DATASET_FILTER_OPTS.map((sortOpt, i) => (node.filter?.method === i ? `${sortOpt} $(check)` : sortOpt)), clearFilter], @@ -1457,11 +1459,11 @@ export class DatasetTree extends ZoweTreeProvider implemen if (selection === clearFilter) { this.updateFilterForNode(node, null, isSession); Gui.setStatusBarMessage( - vscode.l10n.t({ - message: "$(check) Filter cleared for {0}", + `$(check) ${vscode.l10n.t({ + message: "Filter cleared for {0}", args: [node.label as string], comment: ["Node label"], - }), + })}`, Constants.MS_PER_SEC * 4 ); } @@ -1497,11 +1499,11 @@ export class DatasetTree extends ZoweTreeProvider implemen isSession ); Gui.setStatusBarMessage( - vscode.l10n.t({ - message: "$(check) Filter updated for {0}", + `$(check) ${vscode.l10n.t({ + message: "Filter updated for {0}", args: [node.label as string], comment: ["Node label"], - }), + })}`, Constants.MS_PER_SEC * 4 ); } diff --git a/packages/zowe-explorer/src/trees/dataset/DatasetUtils.ts b/packages/zowe-explorer/src/trees/dataset/DatasetUtils.ts index 73444e3628..7c04fefab7 100644 --- a/packages/zowe-explorer/src/trees/dataset/DatasetUtils.ts +++ b/packages/zowe-explorer/src/trees/dataset/DatasetUtils.ts @@ -15,15 +15,16 @@ import { Constants } from "../../configuration/Constants"; import { ZoweLogger } from "../../tools/ZoweLogger"; export class DatasetUtils { - public static DATASET_SORT_OPTS = [ - vscode.l10n.t("$(case-sensitive) Name (default)"), - vscode.l10n.t("$(calendar) Date Created"), - vscode.l10n.t("$(calendar) Date Modified"), - vscode.l10n.t("$(account) User ID"), - vscode.l10n.t("$(fold) Sort Direction"), + public static readonly DATASET_SORT_OPTS = [ + `$(case-sensitive) ${vscode.l10n.t("Name (default)")}`, + `$(calendar) ${vscode.l10n.t("Date Created")}`, + `$(calendar) ${vscode.l10n.t("Date Modified")}`, + `$(account) ${vscode.l10n.t("User ID")}`, + `$(fold) ${vscode.l10n.t("Sort Direction")}`, ]; - public static DATASET_FILTER_OPTS = [vscode.l10n.t("$(calendar) Date Modified"), vscode.l10n.t("$(account) User ID")]; + // eslint-disable-next-line no-magic-numbers + public static readonly DATASET_FILTER_OPTS = [this.DATASET_SORT_OPTS[2], this.DATASET_SORT_OPTS[3]]; public static getProfileAndDataSetName(node: Types.IZoweNodeType): { profileName: string; diff --git a/packages/zowe-explorer/src/trees/job/JobActions.ts b/packages/zowe-explorer/src/trees/job/JobActions.ts index 920f21d80d..7f01135a1d 100644 --- a/packages/zowe-explorer/src/trees/job/JobActions.ts +++ b/packages/zowe-explorer/src/trees/job/JobActions.ts @@ -237,11 +237,11 @@ export class JobActions { */ public static async spoolFilePollEvent(doc: vscode.TextDocument): Promise { const statusMsg = Gui.setStatusBarMessage( - vscode.l10n.t({ - message: `$(sync~spin) Polling: {0}...`, + `$(sync~spin) ${vscode.l10n.t({ + message: `Polling: {0}...`, args: [doc.fileName], comment: ["Document file name"], - }) + })}` ); await JobFSProvider.instance.fetchSpoolAtUri(doc.uri); statusMsg.dispose(); @@ -499,7 +499,8 @@ export class JobActions { if (selection == null) { return; } - if (selection.label === vscode.l10n.t("$(fold) Sort Direction")) { + // eslint-disable-next-line no-magic-numbers + if (selection.label === JobUtils.JOB_SORT_OPTS[5]) { const dir = await Gui.showQuickPick(Constants.SORT_DIRS, { placeHolder: vscode.l10n.t("Select a sorting direction"), }); @@ -516,11 +517,11 @@ export class JobActions { session.sort.method = JobUtils.JOB_SORT_OPTS.indexOf(selection.label.replace(" $(check)", "")); jobsProvider.sortBy(session); Gui.setStatusBarMessage( - vscode.l10n.t({ - message: "$(check) Sorting updated for {0}", + `$(check) ${vscode.l10n.t({ + message: "Sorting updated for {0}", args: [session.label as string], comment: ["Session label"], - }), + })}`, Constants.MS_PER_SEC * 4 ); } diff --git a/packages/zowe-explorer/src/trees/job/JobFSProvider.ts b/packages/zowe-explorer/src/trees/job/JobFSProvider.ts index 3228c65f14..db1a7eaf24 100644 --- a/packages/zowe-explorer/src/trees/job/JobFSProvider.ts +++ b/packages/zowe-explorer/src/trees/job/JobFSProvider.ts @@ -56,7 +56,7 @@ export class JobFSProvider extends BaseProvider implements vscode.FileSystemProv if (!SharedContext.isSpoolFile(node)) { return; } - const statusBarMsg = Gui.setStatusBarMessage(vscode.l10n.t("$(sync~spin) Fetching spool file...")); + const statusBarMsg = Gui.setStatusBarMessage(`$(sync~spin) ${vscode.l10n.t("Fetching spool file...")}`); await JobFSProvider.instance.fetchSpoolAtUri(node.resourceUri); statusBarMsg.dispose(); } diff --git a/packages/zowe-explorer/src/trees/job/JobInit.ts b/packages/zowe-explorer/src/trees/job/JobInit.ts index 2f4516ba08..93a13ad490 100644 --- a/packages/zowe-explorer/src/trees/job/JobInit.ts +++ b/packages/zowe-explorer/src/trees/job/JobInit.ts @@ -72,7 +72,7 @@ export class JobInit { ); context.subscriptions.push( vscode.commands.registerCommand("zowe.jobs.refreshSpool", async (node) => { - const statusMsg = Gui.setStatusBarMessage(vscode.l10n.t("$(sync~spin) Pulling from Mainframe...")); + const statusMsg = Gui.setStatusBarMessage(`$(sync~spin) ${vscode.l10n.t("Pulling from Mainframe...")}`); await JobFSProvider.refreshSpool(node); statusMsg.dispose(); }) diff --git a/packages/zowe-explorer/src/trees/job/JobTree.ts b/packages/zowe-explorer/src/trees/job/JobTree.ts index 0262ab49ec..3fa17e221f 100644 --- a/packages/zowe-explorer/src/trees/job/JobTree.ts +++ b/packages/zowe-explorer/src/trees/job/JobTree.ts @@ -39,7 +39,7 @@ export class JobTree extends ZoweTreeProvider implements Types public static readonly Status = "Status: "; public static readonly defaultDialogText: string = vscode.l10n.t("Create new..."); private static readonly persistenceSchema: PersistenceSchemaEnum = PersistenceSchemaEnum.Job; - private static readonly submitJobQueryLabel = vscode.l10n.t("$(check) Submit this query"); + private static readonly submitJobQueryLabel = `$(check) ${vscode.l10n.t("Submit this query")}`; private static readonly chooseJobStatusLabel = "Job Status"; public dragMimeTypes: string[] = ["application/vnd.code.tree.zowe.jobs.explorer"]; public dropMimeTypes: string[] = ["application/vnd.code.tree.zowe.jobs.explorer"]; @@ -74,11 +74,11 @@ export class JobTree extends ZoweTreeProvider implements Types public mFavorites: IZoweJobTreeNode[] = []; public lastOpened: Types.ZoweNodeInteraction = {}; public searchByQuery = new FilterItem({ - text: vscode.l10n.t("$(plus) Create job search filter"), + text: `$(plus) ${vscode.l10n.t("Create job search filter")}`, menuType: Definitions.JobPickerTypes.QuerySearch, }); public searchById = new FilterItem({ - text: vscode.l10n.t("$(search) Search by job ID"), + text: `$(search) ${vscode.l10n.t("Search by job ID")}`, menuType: Definitions.JobPickerTypes.IdSearch, }); private treeView: vscode.TreeView; @@ -1052,11 +1052,11 @@ export class JobTree extends ZoweTreeProvider implements Types msInterval: pollInterval, request: async () => { const statusMsg = Gui.setStatusBarMessage( - vscode.l10n.t({ - message: `$(sync~spin) Polling: {0}...`, + `$(sync~spin) ${vscode.l10n.t({ + message: "Polling: {0}...", args: [path.posix.basename(node.resourceUri.path)], comment: ["Unique Spool name"], - }), + })}`, Constants.STATUS_BAR_TIMEOUT_MS ); await JobFSProvider.instance.fetchSpoolAtUri(node.resourceUri); @@ -1110,16 +1110,16 @@ export class JobTree extends ZoweTreeProvider implements Types const filterMethod = JobUtils.JOB_FILTER_OPTS.indexOf(selection); const userDismissed = filterMethod < 0; - const clearFilterOpt = vscode.l10n.t("$(clear-all) Clear filter for profile"); + const clearFilterOpt = `$(clear-all) ${vscode.l10n.t("Clear filter for profile")}`; if (userDismissed || selection === clearFilterOpt) { if (selection === clearFilterOpt) { this.updateFilterForJob(job, null); Gui.setStatusBarMessage( - vscode.l10n.t({ - message: "$(check) Filter cleared for {0}", + `$(check) ${vscode.l10n.t({ + message: "Filter cleared for {0}", args: [job.label as string], comment: ["Job label"], - }), + })}`, Constants.MS_PER_SEC * 4 ); } @@ -1146,11 +1146,11 @@ export class JobTree extends ZoweTreeProvider implements Types SharedTreeProviders.job.refresh(); this.updateFilterForJob(job, query); Gui.setStatusBarMessage( - vscode.l10n.t({ - message: "$(check) Filter updated for {0}", + `$(check) ${vscode.l10n.t({ + message: "Filter updated for {0}", args: [job.label as string], comment: ["Job label"], - }), + })}`, Constants.MS_PER_SEC * 4 ); }); diff --git a/packages/zowe-explorer/src/trees/job/JobUtils.ts b/packages/zowe-explorer/src/trees/job/JobUtils.ts index f0bfb007bd..02611e2db5 100644 --- a/packages/zowe-explorer/src/trees/job/JobUtils.ts +++ b/packages/zowe-explorer/src/trees/job/JobUtils.ts @@ -13,16 +13,16 @@ import * as vscode from "vscode"; import * as zosjobs from "@zowe/zos-jobs-for-zowe-sdk"; import { Sorting } from "@zowe/zowe-explorer-api"; export class JobUtils { - public static JOB_SORT_OPTS = [ - vscode.l10n.t("$(list-ordered) Job ID (default)"), - vscode.l10n.t("$(calendar) Date Submitted"), - vscode.l10n.t("$(calendar) Date Completed"), - vscode.l10n.t("$(case-sensitive) Job Name"), - vscode.l10n.t("$(symbol-numeric) Return Code"), - vscode.l10n.t("$(fold) Sort Direction"), + public static readonly JOB_SORT_OPTS = [ + `$(list-ordered) ${vscode.l10n.t("Job ID (default)")}`, + `$(calendar) ${vscode.l10n.t("Date Submitted")}`, + `$(calendar) ${vscode.l10n.t("Date Completed")}`, + `$(case-sensitive) ${vscode.l10n.t("Job Name")}`, + `$(symbol-numeric) ${vscode.l10n.t("Return Code")}`, + `$(fold) ${vscode.l10n.t("Sort Direction")}`, ]; - public static JOB_SORT_KEYS: Record = { + public static readonly JOB_SORT_KEYS: Record = { [Sorting.JobSortOpts.Id]: "jobid", [Sorting.JobSortOpts.DateSubmitted]: "exec-submitted", [Sorting.JobSortOpts.DateCompleted]: "exec-ended", @@ -30,5 +30,5 @@ export class JobUtils { [Sorting.JobSortOpts.ReturnCode]: "retcode", }; - public static JOB_FILTER_OPTS = [vscode.l10n.t("Go to Local Filtering"), vscode.l10n.t("$(clear-all) Clear filter for profile")]; + public static readonly JOB_FILTER_OPTS = [vscode.l10n.t("Go to Local Filtering"), `$(clear-all) ${vscode.l10n.t("Clear filter for profile")}`]; } diff --git a/packages/zowe-explorer/src/trees/uss/USSInit.ts b/packages/zowe-explorer/src/trees/uss/USSInit.ts index 91bba48005..ac38f9273e 100644 --- a/packages/zowe-explorer/src/trees/uss/USSInit.ts +++ b/packages/zowe-explorer/src/trees/uss/USSInit.ts @@ -53,7 +53,7 @@ export class USSInit { ); context.subscriptions.push( vscode.commands.registerCommand("zowe.uss.refreshUSS", async (node, nodeList) => { - const statusMsg = Gui.setStatusBarMessage(vscode.l10n.t("$(sync~spin) Pulling from Mainframe...")); + const statusMsg = Gui.setStatusBarMessage(`$(sync~spin) ${vscode.l10n.t("Pulling from Mainframe...")}`); let selectedNodes = SharedUtils.getSelectedNodeList(node, nodeList) as IZoweUSSTreeNode[]; selectedNodes = selectedNodes.filter((x) => SharedContext.isDocument(x)); for (const item of selectedNodes) { @@ -64,7 +64,7 @@ export class USSInit { if (!(await FsAbstractUtils.confirmForUnsavedDoc(node.resourceUri))) { return; } - const statusMsg2 = Gui.setStatusBarMessage("$(sync~spin) Fetching USS file..."); + const statusMsg2 = Gui.setStatusBarMessage(`$(sync~spin) ${"Fetching USS file..."}`); // need to pull content for file and apply to FS entry await UssFSProvider.instance.fetchFileAtUri(item.resourceUri, { editor: vscode.window.visibleTextEditors.find((v) => v.document.uri.path === item.resourceUri.path), diff --git a/packages/zowe-explorer/src/trees/uss/USSTree.ts b/packages/zowe-explorer/src/trees/uss/USSTree.ts index f0098ac766..3e574829fc 100644 --- a/packages/zowe-explorer/src/trees/uss/USSTree.ts +++ b/packages/zowe-explorer/src/trees/uss/USSTree.ts @@ -45,7 +45,7 @@ import { AuthUtils } from "../../utils/AuthUtils"; * @implements {vscode.TreeDataProvider} */ export class USSTree extends ZoweTreeProvider implements Types.IZoweUSSTreeType { - public static readonly defaultDialogText: string = vscode.l10n.t("$(plus) Create a new filter"); + public static readonly defaultDialogText: string = `$(plus) ${vscode.l10n.t("Create a new filter")}`; private static readonly persistenceSchema: PersistenceSchemaEnum = PersistenceSchemaEnum.USS; public mFavoriteSession: ZoweUSSNode; public mSessionNodes: IZoweUSSTreeNode[] = []; @@ -207,7 +207,7 @@ export class USSTree extends ZoweTreeProvider implements Types } } - const movingMsg = Gui.setStatusBarMessage(vscode.l10n.t("$(sync~spin) Moving USS files...")); + const movingMsg = Gui.setStatusBarMessage(`$(sync~spin) ${vscode.l10n.t("Moving USS files...")}`); const parentsToUpdate = new Set(); for (const item of droppedItems.value) { diff --git a/packages/zowe-explorer/src/trees/uss/UssFSProvider.ts b/packages/zowe-explorer/src/trees/uss/UssFSProvider.ts index d2a830f85d..10b34cd551 100644 --- a/packages/zowe-explorer/src/trees/uss/UssFSProvider.ts +++ b/packages/zowe-explorer/src/trees/uss/UssFSProvider.ts @@ -375,7 +375,7 @@ export class UssFSProvider extends BaseProvider implements vscode.FileSystemProv // or if the entry does not exist and the new contents are empty (new placeholder entry) options?.noStatusMsg || (!entry && content.byteLength === 0) ? new vscode.Disposable(() => {}) - : Gui.setStatusBarMessage(vscode.l10n.t("$(sync~spin) Saving USS file...")); + : Gui.setStatusBarMessage(`$(sync~spin) ${vscode.l10n.t("Saving USS file...")}`); let resp: IZosFilesResponse; try {