Skip to content

Commit

Permalink
Harmonize the use of ellipses in command and menu items (#16237)
Browse files Browse the repository at this point in the history
* Update browser.json

Adjusted wording to satisfy issue #16321

Use "Folder", not "Directory", in file browser settings #16231

* -Removed elipses from:
 File>Save and Export Notebook As

-Added elipses to:
 File>Close and Shut Down Notebook
 Help>Show Keyboard Shortcuts

 There remain some dual nature menu items that may or may not pop up a prompt depending on save history of current open files. I did not change these elipse situations Examples: File > Save and File > Close All Tabs

IAW standards mentioned in issue #16025

* -Removed elipses from:
 File>Save and Export Notebook As

-Added elipses to:
 File>Close and Shut Down Notebook
 Help>Show Keyboard Shortcuts

 There remain some dual nature menu items that may or may not pop up a prompt depending on save history of current open files. I did not change these elipse situations Examples: File > Save and File > Close All Tabs

IAW standards mentioned in issue #16025

* Delete Untitled.ipynb

* Delete Untitled1.ipynb

* Update Playwright Snapshots

* Update Playwright Snapshots

* Corrections Applied per JasonWeill's feedback.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update Playwright Snapshots

* Update Playwright Snapshots

* Revert unrelated changes

* Fix test

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: krassowski <5832902+krassowski@users.noreply.github.com>
  • Loading branch information
4 people committed Apr 26, 2024
1 parent 28e8b3e commit d84e8e0
Show file tree
Hide file tree
Showing 14 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
},
{
"id": "apputils:display-shortcuts",
"label": "Show Keyboard Shortcuts",
"label": "Show Keyboard Shortcuts",
"caption": "Show relevant keyboard shortcuts for the current active widget",
"shortcuts": [
"Ctrl Shift H"
Expand Down Expand Up @@ -1586,7 +1586,7 @@
},
{
"id": "notebook:close-and-shutdown",
"label": "Close and Shut Down Notebook",
"label": "Close and Shut Down Notebook",
"caption": "",
"shortcuts": []
},
Expand Down Expand Up @@ -2515,7 +2515,7 @@
},
{
"id": "workspace-ui:save",
"label": "Save Current Workspace",
"label": "Save Current Workspace",
"caption": "",
"shortcuts": []
},
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion galata/test/jupyterlab/kernel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ test.describe('Kernel', () => {
.soft(page.getByTitle('Switch kernel'))
.toHaveText('Python 3 (ipykernel)');

await page.menu.clickMenuItem('File>Close and Shut Down Notebook');
await page.menu.clickMenuItem('File>Close and Shut Down Notebook');

await Promise.all([
page
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/apputils-extension/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ const utilityCommands: JupyterFrontEndPlugin<void> = {
});

commands.addCommand(CommandIDs.displayShortcuts, {
label: trans.__('Show Keyboard Shortcuts'),
label: trans.__('Show Keyboard Shortcuts'),
caption: trans.__(
'Show relevant keyboard shortcuts for the current active widget'
),
Expand Down
2 changes: 1 addition & 1 deletion packages/notebook-extension/schema/export.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"rank": 10,
"submenu": {
"id": "jp-mainmenu-file-notebookexport",
"label": "Save and Export Notebook As"
"label": "Save and Export Notebook As"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/notebook-extension/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2417,7 +2417,7 @@ function addCommands(
isEnabled
});
commands.addCommand(CommandIDs.closeAndShutdown, {
label: trans.__('Close and Shut Down Notebook'),
label: trans.__('Close and Shut Down Notebook'),
execute: args => {
const current = getCurrent(tracker, shell, args);

Expand Down
2 changes: 1 addition & 1 deletion packages/workspaces-extension/src/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ export const commandsPlugin: JupyterFrontEndPlugin<IWorkspaceCommands> = {
});

app.commands.addCommand(CommandIDs.save, {
label: trans.__('Save Current Workspace'),
label: trans.__('Save Current Workspace'),
execute: async () => {
const { contents } = app.serviceManager;
const data = app.serviceManager.workspaces.fetch(resolver.name);
Expand Down

0 comments on commit d84e8e0

Please sign in to comment.