Skip to content

Commit

Permalink
Replace URI with URL, latter is more user friendly (#12295)
Browse files Browse the repository at this point in the history
  • Loading branch information
@DonJayamanne
DonJayamanne authored Dec 4, 2022
1 parent b00b9a0 commit ee6449e
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
20 changes: 10 additions & 10 deletions package.nls.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,12 +596,12 @@
"DataScience.libraryRequiredToLaunchJupyterNotInstalledInterpreter": "Running cells with '{0}' requires {1} package.",
"DataScience.librariesRequiredToLaunchJupyterNotInstalledInterpreter": "Running cells with '{0}' requires {1} package.",
"DataScience.jupyterInstall": "Install",
"DataScience.jupyterSelectURIPrompt": "Enter the URI of the running Jupyter server",
"DataScience.jupyterSelectURIInvalidURI": "Invalid URI specified",
"DataScience.jupyterSelectURIPrompt": "Enter the URL of the running Jupyter server",
"DataScience.jupyterSelectURIInvalidURI": "Invalid URL specified",
"DataScience.jupyterSelectUserAndPasswordTitle": "Enter your user name and password to connect to Jupyter Hub",
"DataScience.jupyterSelectUserPrompt": "Enter your user name",
"DataScience.jupyterSelectPasswordPrompt": "Enter your password",
"DataScience.jupyterRenameServer": "Change Server Display Name (Leave Blank To Use URI)",
"DataScience.jupyterRenameServer": "Change Server Display Name (Leave Blank To Use URL)",
"DataScience.removeRemoteJupyterServerEntryInQuickPick": "Remove",
"DataScience.jupyterNotebookFailure": "Jupyter notebook failed to launch. \r\n{0}",
"DataScience.remoteJupyterServerProvidedBy3rdPartyExtensionNoLongerValid": "The remote Jupyter Server contributed by the extension '{0}' is no longer available.",
Expand All @@ -610,7 +610,7 @@
"DataScience.remoteJupyterConnectionFailedWithoutServerWithError": "Connection failure. Verify the server is running and reachable. ({0}).",
"DataScience.remoteJupyterConnectionFailedWithoutServerWithErrorWeb": "Connection failure. Verify the server is running and reachable from a browser. ({0}). When connecting from vscode.dev Jupyter servers must be started with specific options to connect. See [here](https://aka.ms/vscjremoteweb) for more information.",
"DataScience.remoteJupyterConnectionFailedWebExtension": "When connecting from vscode.dev Jupyter servers must be started with specific options to connect. See [here](https://aka.ms/vscjremoteweb) for more information.",
"DataScience.jupyterNotebookRemoteConnectFailedWeb": "Failed to connect to remote Jupyter server.\r\nCheck that the Jupyter Server URI can be reached from a browser.\r\n{0}. Click [here](https://aka.ms/vscjremoteweb) for more information.",
"DataScience.jupyterNotebookRemoteConnectFailedWeb": "Failed to connect to remote Jupyter server.\r\nCheck that the Jupyter Server URL can be reached from a browser.\r\n{0}. Click [here](https://aka.ms/vscjremoteweb) for more information.",
"DataScience.jupyterNotebookRemoteConnectSelfCertsFailed": "Failed to connect to remote Jupyter notebook.\r\nSpecified server is using self signed certs. Enable Allow Unauthorized Remote Connection setting to connect anyways\r\n{0}\r\n{1}",
"DataScience.changeJupyterRemoteConnection": "Change Jupyter Server connection.",
"DataScience.notebookVersionFormat": {
Expand All @@ -626,7 +626,7 @@
"comment": ["{Locked='Kernelspec'}"]
},
"DataScience.jupyterGetVariablesBadResults": "Failed to fetch variable info from the Jupyter server.",
"DataScience.liveShareConnectFailure": "Cannot connect to host Jupyter session. URI not found.",
"DataScience.liveShareConnectFailure": "Cannot connect to host Jupyter session. URL not found.",
"DataScience.liveShareCannotSpawnNotebooks": "Spawning Jupyter notebooks is not supported over a live share connection",
"DataScience.liveShareCannotImportNotebooks": "Importing notebooks is not currently supported over a live share connection",
"DataScience.liveShareHostFormat": "{0} Jupyter Server",
Expand Down Expand Up @@ -656,7 +656,7 @@
"message": "Keyboard interrupt crashed the kernel. Kernel restarted.",
"comment": ["{Locked='Kernel'}"]
},
"DataScience.sysInfoURILabel": "Jupyter Server URI: ",
"DataScience.sysInfoURILabel": "Jupyter Server URL: ",
"DataScience.jupyterStartTimedout": "Starting Jupyter has timed out. Please check the 'Jupyter' output panel for further details.",
"DataScience.startingJupyterLogMessage": "Starting Jupyter from {0} with command line {1}",
"DataScience.jupyterCommandLineDefaultLabel": "Default (recommended)",
Expand Down Expand Up @@ -796,14 +796,14 @@
"comment": ["{Locked='python -m jupyter notebook --version'}"]
},
"DataScience.savePngTitle": "Save Image",
"DataScience.jupyterSelectURIQuickPickTitle": "Enter the URI of the running Jupyter server",
"DataScience.jupyterSelectURIQuickPickTitle": "Enter the URL of the running Jupyter server",
"DataScience.jupyterSelectURIQuickPickTitleOld": "Pick how to connect to Jupyter",
"DataScience.jupyterSelectURIQuickPickPlaceholder": "Choose an option",
"DataScience.jupyterSelectURIQuickPickCurrent": "Current: {0}",
"DataScience.jupyterSelectURINoneLabel": "None",
"DataScience.jupyterSelectURINoneDetail": "Do not connect to any remote Jupyter server",
"DataScience.jupyterSelectURINewLabel": "Existing",
"DataScience.jupyterSelectURINewDetail": "Specify the URI of an existing server",
"DataScience.jupyterSelectURINewDetail": "Specify the URL of an existing server",
"DataScience.jupyterSelectURIMRUDetail": "Last Connection: {0}",
"DataScience.jupyterSelectURIRunningDetailFormat": "Last connection {0}. {1} existing connections.",
"DataScience.jupyterSelectURINotRunningDetail": "Cannot connect at this time. Status unknown.",
Expand Down Expand Up @@ -968,7 +968,7 @@
"DataScience.selectNewServer": "Pick Running Server",
"DataScience.jupyterSelectURIRemoteLabel": "Existing",
"DataScience.jupyterSelectURIQuickPickTitleRemoteOnly": "Pick an already running Jupyter server",
"DataScience.jupyterSelectURIRemoteDetail": "Specify the URI of an existing server",
"DataScience.jupyterSelectURIRemoteDetail": "Specify the URL of an existing server",
"DataScience.latestExtension": "Download the latest version of the Jupyter Extension",
"DataScience.loadClassFailedWithNoInternet": "Error loading {0}:{1}. Internet connection required for loading 3rd party widgets.",
"DataScience.useCDNForWidgets": "Widgets require us to download supporting files from a 3rd party website. Click [here](https://aka.ms/PVSCIPyWidgets) for more information.",
Expand Down Expand Up @@ -1015,7 +1015,7 @@
"message": "Opening the same file in the Preview Notebook Editor and stable Notebook Editor is not recommended. Doing so could result in data loss or corruption of notebooks.",
"comment": ["{Locked='Notebook'}"]
},
"DataScience.unknownServerUri": "Server URI cannot be used. Did you uninstall an extension that provided a Jupyter server connection?",
"DataScience.unknownServerUri": "Server URL cannot be used. Did you uninstall an extension that provided a Jupyter server connection?",
"DataScienceRendererExtension.installingExtension": {
"message": "Installing Notebook Renderers extension...",
"comment": ["{Locked='Notebook'}"]
Expand Down
20 changes: 10 additions & 10 deletions src/platform/common/utils/localize.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ export namespace DataScience {
export const unknownServerUri = () =>
localize(
'DataScience.unknownServerUri',
'Server URI cannot be used. Did you uninstall an extension that provided a Jupyter server connection?'
'Server URL cannot be used. Did you uninstall an extension that provided a Jupyter server connection?'
);
export const uriProviderDescriptionFormat = () =>
localize('DataScience.uriProviderDescriptionFormat', '{0} (From {1} extension)');
Expand Down Expand Up @@ -617,9 +617,9 @@ export namespace DataScience {
export const connectKernelHeader = () => localize('DataScience.connectKernelHeader', 'Connected to {0}');

export const jupyterSelectURIPrompt = () =>
localize('DataScience.jupyterSelectURIPrompt', 'Enter the URI of the running Jupyter server');
localize('DataScience.jupyterSelectURIPrompt', 'Enter the URL of the running Jupyter server');
export const jupyterSelectURIQuickPickTitle = () =>
localize('DataScience.jupyterSelectURIQuickPickTitle', 'Enter the URI of the running Jupyter server');
localize('DataScience.jupyterSelectURIQuickPickTitle', 'Enter the URL of the running Jupyter server');
export const jupyterSelectURIQuickPickTitleOld = () =>
localize('DataScience.jupyterSelectURIQuickPickTitleOld', 'Pick how to connect to Jupyter');
export const jupyterSelectURIQuickPickPlaceholder = () =>
Expand All @@ -633,9 +633,9 @@ export namespace DataScience {
localize('DataScience.jupyterSelectURIMRUDetail', 'Last Connection: {0}');
export const jupyterSelectURINewLabel = () => localize('DataScience.jupyterSelectURINewLabel', 'Existing');
export const jupyterSelectURINewDetail = () =>
localize('DataScience.jupyterSelectURINewDetail', 'Specify the URI of an existing server');
localize('DataScience.jupyterSelectURINewDetail', 'Specify the URL of an existing server');
export const jupyterSelectURIInvalidURI = () =>
localize('DataScience.jupyterSelectURIInvalidURI', 'Invalid URI specified');
localize('DataScience.jupyterSelectURIInvalidURI', 'Invalid URL specified');
export const jupyterSelectURIRunningDetailFormat = () =>
localize('DataScience.jupyterSelectURIRunningDetailFormat', 'Last connection {0}. {1} existing connections.');
export const jupyterSelectURINotRunningDetail = () =>
Expand All @@ -646,7 +646,7 @@ export namespace DataScience {
'Enter your user name and password to connect to Jupyter Hub'
);
export const jupyterRenameServer = () =>
localize('DataScience.jupyterRenameServer', 'Change Server Display Name (Leave Blank To Use URI)');
localize('DataScience.jupyterRenameServer', 'Change Server Display Name (Leave Blank To Use URL)');
export const jupyterSelectUserPrompt = () =>
localize('DataScience.jupyterSelectUserPrompt', 'Enter your user name');
export const jupyterSelectPasswordPrompt = () =>
Expand Down Expand Up @@ -698,7 +698,7 @@ export namespace DataScience {
export const jupyterNotebookRemoteConnectFailedWeb = () =>
localize(
'DataScience.jupyterNotebookRemoteConnectFailedWeb',
'Failed to connect to remote Jupyter server.\r\nCheck that the Jupyter Server URI can be reached from a browser.\r\n{0}. Click [here](https://aka.ms/vscjremoteweb) for more information.'
'Failed to connect to remote Jupyter server.\r\nCheck that the Jupyter Server URL can be reached from a browser.\r\n{0}. Click [here](https://aka.ms/vscjremoteweb) for more information.'
);
export const changeRemoteJupyterConnectionButtonText = () =>
localize('DataScience.changeRemoteJupyterConnectionButtonText', 'Manage Connections');
Expand Down Expand Up @@ -758,13 +758,13 @@ export namespace DataScience {
{ key: 'DataScience.pythonInterruptFailedHeader', comment: ['{Locked="kernel"}'] },
'Keyboard interrupt crashed the kernel. Kernel restarted.'
);
export const sysInfoURILabel = () => localize('DataScience.sysInfoURILabel', 'Jupyter Server URI: ');
export const sysInfoURILabel = () => localize('DataScience.sysInfoURILabel', 'Jupyter Server URL: ');
export const executingCodeFailure = () =>
localize('DataScience.executingCodeFailure', 'Executing code failed : {0}');
export const inputWatermark = () =>
localize('DataScience.inputWatermark', 'Type code here and press shift-enter to run');
export const liveShareConnectFailure = () =>
localize('DataScience.liveShareConnectFailure', 'Cannot connect to host Jupyter session. URI not found.');
localize('DataScience.liveShareConnectFailure', 'Cannot connect to host Jupyter session. URL not found.');
export const liveShareCannotSpawnNotebooks = () =>
localize(
'DataScience.liveShareCannotSpawnNotebooks',
Expand Down Expand Up @@ -1123,7 +1123,7 @@ export namespace DataScience {
export const jupyterSelectURIQuickPickTitleRemoteOnly = () =>
localize('DataScience.jupyterSelectURIQuickPickTitleRemoteOnly', 'Pick an already running Jupyter server');
export const jupyterSelectURIRemoteDetail = () =>
localize('DataScience.jupyterSelectURIRemoteDetail', 'Specify the URI of an existing server');
localize('DataScience.jupyterSelectURIRemoteDetail', 'Specify the URL of an existing server');
export const removeRemoteJupyterServerEntryInQuickPick = () =>
localize('DataScience.removeRemoteJupyterServerEntryInQuickPick', 'Remove');
export const specifyLocalOrRemoteJupyterServerForConnections = () =>
Expand Down

0 comments on commit ee6449e

Please sign in to comment.