From 8d8cbb203e988b008c7770b9e1f856dc07133268 Mon Sep 17 00:00:00 2001 From: Jason Grout Date: Thu, 2 May 2019 00:15:10 -0700 Subject: [PATCH] Replace shutdown with shut down a few more places where it was used as a verb. --- packages/console-extension/src/index.ts | 2 +- packages/mainmenu-extension/src/index.ts | 9 ++++----- packages/notebook-extension/src/index.ts | 6 +++--- packages/running/src/index.tsx | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/console-extension/src/index.ts b/packages/console-extension/src/index.ts index fddc0ecc13a3..07852e9050d1 100644 --- a/packages/console-extension/src/index.ts +++ b/packages/console-extension/src/index.ts @@ -509,7 +509,7 @@ async function activateConsole( name: 'Console', closeAndCleanup: (current: ConsolePanel) => { return showDialog({ - title: 'Shut Down the console?', + title: 'Shut down the console?', body: `Are you sure you want to close "${current.title.label}"?`, buttons: [Dialog.cancelButton(), Dialog.warnButton()] }).then(result => { diff --git a/packages/mainmenu-extension/src/index.ts b/packages/mainmenu-extension/src/index.ts index bf67e661a784..f8dc44a9924a 100644 --- a/packages/mainmenu-extension/src/index.ts +++ b/packages/mainmenu-extension/src/index.ts @@ -211,7 +211,6 @@ const plugin: JupyterFrontEndPlugin = { command: CommandIDs.logout, category: 'Main Area' }); - } palette.addItem({ @@ -511,23 +510,23 @@ export function createKernelMenu(app: JupyterFrontEnd, menu: KernelMenu): void { }); commands.addCommand(CommandIDs.shutdownKernel, { - label: 'Shutdown Kernel', + label: 'Shut Down Kernel', isEnabled: Private.delegateEnabled(app, menu.kernelUsers, 'shutdownKernel'), execute: Private.delegateExecute(app, menu.kernelUsers, 'shutdownKernel') }); commands.addCommand(CommandIDs.shutdownAllKernels, { - label: 'Shutdown All Kernels…', + label: 'Shut Down All Kernels…', isEnabled: () => { return app.serviceManager.sessions.running().next() !== undefined; }, execute: () => { return showDialog({ - title: 'Shutdown All?', + title: 'Shut Down All?', body: 'Shut down all kernels?', buttons: [ Dialog.cancelButton(), - Dialog.warnButton({ label: 'SHUTDOWN' }) + Dialog.warnButton({ label: 'SHUT DOWN ALL' }) ] }).then(result => { if (result.button.accept) { diff --git a/packages/notebook-extension/src/index.ts b/packages/notebook-extension/src/index.ts index 5525a96d130e..fece5ae28614 100644 --- a/packages/notebook-extension/src/index.ts +++ b/packages/notebook-extension/src/index.ts @@ -1089,7 +1089,7 @@ function addCommands( isEnabled }); commands.addCommand(CommandIDs.closeAndShutdown, { - label: 'Close and Shutdown', + label: 'Close and Shut Down', execute: args => { const current = getCurrent(args); @@ -1100,7 +1100,7 @@ function addCommands( const fileName = current.title.label; return showDialog({ - title: 'Shutdown the notebook?', + title: 'Shut down the notebook?', body: `Are you sure you want to close "${fileName}"?`, buttons: [Dialog.cancelButton(), Dialog.warnButton()] }).then(result => { @@ -1927,7 +1927,7 @@ function populateMenus( closeAndCleanup: (current: NotebookPanel) => { const fileName = current.title.label; return showDialog({ - title: 'Shutdown the notebook?', + title: 'Shut down the notebook?', body: `Are you sure you want to close "${fileName}"?`, buttons: [Dialog.cancelButton(), Dialog.warnButton()] }).then(result => { diff --git a/packages/running/src/index.tsx b/packages/running/src/index.tsx index dce792f29018..b059bd5d7611 100644 --- a/packages/running/src/index.tsx +++ b/packages/running/src/index.tsx @@ -173,7 +173,7 @@ function Item(props: SessionProps & { model: M }) { className={`${SHUTDOWN_BUTTON_CLASS} jp-mod-styled`} onClick={() => props.shutdown(model)} > - SHUTDOWN + SHUT DOWN ); @@ -221,7 +221,7 @@ function Section(props: SessionProps) { title: `Shut Down All ${props.name} Sessions?`, buttons: [ Dialog.cancelButton(), - Dialog.warnButton({ label: 'SHUT DOWN' }) + Dialog.warnButton({ label: 'SHUT DOWN ALL' }) ] }).then(result => { if (result.button.accept) {