Skip to content

Fix toolbar and content panel sentence case and IPython stylization #6567

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

Merged
Joyce Er (joyceerhl) merged 1 commit into from
Jul 13, 2019
Merged

Fix toolbar and content panel sentence case and IPython stylization #6567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions package.nls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"python.command.python.runLinting.title": "Run Linting",
"python.command.python.datascience.runFileInteractive.title": "Run Current File in Python Interactive Window",
"python.command.python.datascience.runallcells.title": "Run All Cells",
"python.command.python.datascience.runallcellsabove.title": "Run Above",
"python.command.python.datascience.runallcellsabove.title": "Run above",
"python.command.python.datascience.runcellandallbelow.title": "Run Below",
"python.command.python.datascience.runallcellsabove.palette.title": "Run Cells Above Current Cell",
"python.command.python.datascience.runcurrentcellandallbelow.palette.title": "Run Current Cell and Below",
Expand All @@ -43,7 +43,7 @@
"python.command.python.datascience.runcurrentcell.title": "Run Current Cell",
"python.command.python.datascience.runcurrentcelladvance.title": "Run Current Cell And Advance",
"python.command.python.datascience.execSelectionInteractive.title": "Run Selection/Line in Python Interactive window",
"python.command.python.datascience.runcell.title": "Run Cell",
"python.command.python.datascience.runcell.title": "Run cell",
"python.command.python.datascience.showhistorypane.title": "Show Python Interactive window",
"python.command.python.datascience.selectjupyteruri.title": "Specify Jupyter server URI",
"python.command.python.datascience.importnotebook.title": "Import Jupyter Notebook",
Expand All @@ -55,8 +55,8 @@
"python.command.python.datascience.undocells.title": "Undo last Python Interactive action",
"python.command.python.datascience.redocells.title": "Redo last Python Interactive action",
"python.command.python.datascience.removeallcells.title": "Delete all Python Interactive cells",
"python.command.python.datascience.interruptkernel.title": "Interrupt IPython Kernel",
"python.command.python.datascience.restartkernel.title": "Restart IPython Kernel",
"python.command.python.datascience.interruptkernel.title": "Interrupt IPython kernel",
"python.command.python.datascience.restartkernel.title": "Restart IPython kernel",
"python.command.python.datascience.expandallcells.title": "Expand all Python Interactive cells",
"python.command.python.datascience.collapseallcells.title": "Collapse all Python Interactive cells",
"python.command.python.datascience.addcellbelow.title": "Add empty cell to file",
Expand Down Expand Up @@ -138,11 +138,11 @@
"DataScience.executingCode": "Executing Cell",
"DataScience.collapseAll": "Collapse all cell inputs",
"DataScience.expandAll": "Expand all cell inputs",
"DataScience.export": "Export as Jupyter Notebook",
"DataScience.restartServer": "Restart IPython Kernel",
"DataScience.export": "Export as Jupyter notebook",
"DataScience.restartServer": "Restart IPython kernel",
"DataScience.undo": "Undo",
"DataScience.redo": "Redo",
"DataScience.clearAll": "Remove All Cells",
"DataScience.clearAll": "Remove all cells",
"DataScience.pythonVersionHeader": "Python version:",
"DataScience.pythonVersionHeaderNoPyKernel": "Python version may not match, no ipykernel found:",
"DataScience.pythonRestartHeader": "Restarted kernel:",
Expand Down Expand Up @@ -192,7 +192,7 @@
"diagnostics.yesUpdateLaunch": "Yes, update launch.json",
"diagnostics.bannerLabelNo": "No, I will do it later",
"diagnostics.invalidTestSettings": "Your settings needs to be updated to change the setting \"python.unitTest.\" to \"python.testing.\", otherwise testing Python code using the extension may not work. Would you like to automatically update your settings now?",
"DataScience.interruptKernel": "Interrupt IPython Kernel",
"DataScience.interruptKernel": "Interrupt IPython kernel",
"DataScience.exportingFormat": "Exporting {0}",
"DataScience.exportCancel": "Cancel",
"Common.canceled": "Canceled",
Expand Down
14 changes: 7 additions & 7 deletions package.nls.nl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"python.command.python.datascience.undocells.title": "Laatste interactieve Python-actie ongedaan maken",
"python.command.python.datascience.redocells.title": "Laatste interactieve Python-actie opnieuw uitvoeren",
"python.command.python.datascience.removeallcells.title": "Alle interactieve Python-cellen verwijderen",
"python.command.python.datascience.interruptkernel.title": "iPython-kernel onderbreken",
"python.command.python.datascience.restartkernel.title": "iPython-kernel herstarten",
"python.command.python.datascience.interruptkernel.title": "IPython-kernel onderbreken",
"python.command.python.datascience.restartkernel.title": "IPython-kernel herstarten",
"python.command.python.datascience.expandallcells.title": "Alle interactieve Python-vensters openen",
"python.command.python.datascience.collapseallcells.title": "Alle interactieve Python-vensters sluiten",
"python.snippet.launch.standard.label": "Python: Huidige bestand",
Expand Down Expand Up @@ -80,18 +80,18 @@
"DataScience.connectingToJupyter": "Met Jupyter-server verbinden",
"Interpreters.RefreshingInterpreters": "Python-Interpreters verversen",
"Interpreters.LoadingInterpreters": "Python-Interpreters laden",
"DataScience.restartKernelMessage": "Wil je de iPython-kernel herstarten? Alle variabelen zullen verloren gaan.",
"DataScience.restartKernelMessage": "Wil je de IPython-kernel herstarten? Alle variabelen zullen verloren gaan.",
"DataScience.restartKernelMessageYes": "Herstarten",
"DataScience.restartKernelMessageNo": "Annuleren",
"DataScienceSurveyBanner.bannerMessage": "Zou je alsjeblieft 2 minuten kunnen nemen om ons te vertellen hoe de Python-data-science-functionaliteiten voor jou werkt?",
"DataScienceSurveyBanner.bannerLabelYes": "Ja, neem nu deel aan het onderzoek",
"DataScienceSurveyBanner.bannerLabelNo": "Nee, bedankt",
"DataScience.restartingKernelStatus": "iPython-Kernel herstarten",
"DataScience.restartingKernelStatus": "IPython-Kernel herstarten",
"DataScience.executingCode": "Cel aan het uitvoeren",
"DataScience.collapseAll": "Alle cel-invoeren sluiten",
"DataScience.expandAll": "Alle cel-invoeren openen",
"DataScience.export": "Als Jupyter-Notebook exporteren",
"DataScience.restartServer": "iPython-kernel herstarten",
"DataScience.restartServer": "IPython-kernel herstarten",
"DataScience.undo": "Herhaal",
"DataScience.redo": "Opnieuw uitvoeren",
"DataScience.clearAll": "Alle cellen verwijderen",
Expand All @@ -114,13 +114,13 @@
"diagnostics.warnBeforeEnablingSourceMaps": "Bronkaartondersteuning inschakelen in de Python-extensie zal een ongunstige impact hebben op de uitvoering van de extensie.",
"diagnostics.enableSourceMapsAndReloadVSC": "Venster inschakelen en herladen",
"diagnostics.lsNotSupported": "Uw besturingssysteem voldoet niet aan de minimumeisen van de language server. Aan het terugschakelen naar het alternatief, Jedi.",
"DataScience.interruptKernel": "iPython-kernel onderbreken",
"DataScience.interruptKernel": "IPython-kernel onderbreken",
"DataScience.exportingFormat": "Aan het exporteren {0}",
"DataScience.exportCancel": "Annuleren",
"Common.canceled": "Geannuleerd",
"DataScience.importChangeDirectoryComment": "#%% De werkmap van de werkruimte root naar de ipynb-bestandslocatie veranderen. Schakel deze toevoeging uit met de instelling DataScience.changeDirOnImportExport",
"DataScience.exportChangeDirectoryComment": "# De map wijzigen naar de VSCode-werktuimte root zodat de relatieve pad-ladingen correct werken. Schakel deze toevoeging uit met de instelling DataScience.changeDirOnImportExport",
"DataScience.interruptKernelStatus": "iPython-kernel onderbreken",
"DataScience.interruptKernelStatus": "IPython-kernel onderbreken",
"DataScience.restartKernelAfterInterruptMessage": "Het onderbreken van de kernel duurde te lang. Wil je de kernel in plaats daarvan herstarten? Alle variabelen zullen verloren gaan.",
"DataScience.pythonInterruptFailedHeader": "Toetsenbord-interrupt liet de kernel crashen. Kernel herstart.",
"DataScience.sysInfoURILabel": "Jupyter-server URI: ",
Expand Down
18 changes: 9 additions & 9 deletions src/client/common/utils/localize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export namespace DataScience {
export const connectingToJupyter = localize('DataScience.connectingToJupyter', 'Connecting to Jupyter server');
export const exportingFormat = localize('DataScience.exportingFormat', 'Exporting {0}');
export const runAllCellsLensCommandTitle = localize('python.command.python.datascience.runallcells.title', 'Run all cells');
export const runAllCellsAboveLensCommandTitle = localize('python.command.python.datascience.runallcellsabove.title', 'Run Above');
export const runAllCellsAboveLensCommandTitle = localize('python.command.python.datascience.runallcellsabove.title', 'Run above');
export const runCellAndAllBelowLensCommandTitle = localize('python.command.python.datascience.runcellandallbelow.title', 'Run Below');
export const importChangeDirectoryComment = localize('DataScience.importChangeDirectoryComment', '#%% Change working directory from the workspace root to the ipynb file location. Turn this addition off with the DataScience.changeDirOnImportExport setting');
export const exportChangeDirectoryComment = localize('DataScience.exportChangeDirectoryComment', '# Change directory to VSCode workspace root so that relative path loads work correctly. Turn this addition off with the DataScience.changeDirOnImportExport setting');
Expand All @@ -141,7 +141,7 @@ export namespace DataScience {
export const restartKernelMessageYes = localize('DataScience.restartKernelMessageYes', 'Restart');
export const restartKernelMessageDontAskAgain = localize('DataScience.restartKernelMessageDontAskAgain', 'Don\'t Ask Again');
export const restartKernelMessageNo = localize('DataScience.restartKernelMessageNo', 'Cancel');
export const restartingKernelStatus = localize('DataScience.restartingKernelStatus', 'Restarting iPython Kernel');
export const restartingKernelStatus = localize('DataScience.restartingKernelStatus', 'Restarting IPython Kernel');
export const restartingKernelFailed = localize('DataScience.restartingKernelFailed', 'Kernel restart failed. Jupyter server is hung. Please reload VS code.');
export const interruptingKernelFailed = localize('DataScience.interruptingKernelFailed', 'Kernel interrupt failed. Jupyter server is hung. Please reload VS code.');

Expand All @@ -150,11 +150,11 @@ export namespace DataScience {
export const expandAll = localize('DataScience.expandAll', 'Expand all cell inputs');
export const collapseSingle = localize('DataScience.collapseSingle', 'Collapse');
export const expandSingle = localize('DataScience.expandSingle', 'Expand');
export const exportKey = localize('DataScience.export', 'Export as Jupyter Notebook');
export const restartServer = localize('DataScience.restartServer', 'Restart iPython Kernel');
export const exportKey = localize('DataScience.export', 'Export as Jupyter notebook');
export const restartServer = localize('DataScience.restartServer', 'Restart IPython Kernel');
export const undo = localize('DataScience.undo', 'Undo');
export const redo = localize('DataScience.redo', 'Redo');
export const clearAll = localize('DataScience.clearAll', 'Remove All Cells');
export const clearAll = localize('DataScience.clearAll', 'Remove all cells');
export const pythonVersionHeader = localize('DataScience.pythonVersionHeader', 'Python Version:');
export const pythonRestartHeader = localize('DataScience.pythonRestartHeader', 'Restarted Kernel:');
export const pythonNewHeader = localize('DataScience.pythonNewHeader', 'Started new kernel:');
Expand All @@ -172,10 +172,10 @@ export namespace DataScience {
export const jupyterServerCrashed = localize('DataScience.jupyterServerCrashed', 'Jupyter server crashed. Unable to connect. \r\nError code from jupyter: {0}');
export const notebookVersionFormat = localize('DataScience.notebookVersionFormat', 'Jupyter Notebook Version: {0}');
//tslint:disable-next-line:no-multiline-string
export const jupyterKernelNotSupportedOnActive = localize('DataScience.jupyterKernelNotSupportedOnActive', `iPython kernel cannot be started from '{0}'. Using closest match {1} instead.`);
export const jupyterKernelSpecNotFound = localize('DataScience.jupyterKernelSpecNotFound', 'Cannot create a iPython kernel spec and none are available for use');
export const interruptKernel = localize('DataScience.interruptKernel', 'Interrupt iPython Kernel');
export const interruptKernelStatus = localize('DataScience.interruptKernelStatus', 'Interrupting iPython Kernel');
export const jupyterKernelNotSupportedOnActive = localize('DataScience.jupyterKernelNotSupportedOnActive', `IPython kernel cannot be started from '{0}'. Using closest match {1} instead.`);
export const jupyterKernelSpecNotFound = localize('DataScience.jupyterKernelSpecNotFound', 'Cannot create a IPython kernel spec and none are available for use');
export const interruptKernel = localize('DataScience.interruptKernel', 'Interrupt IPython Kernel');
export const interruptKernelStatus = localize('DataScience.interruptKernelStatus', 'Interrupting IPython Kernel');
export const exportCancel = localize('DataScience.exportCancel', 'Cancel');
export const restartKernelAfterInterruptMessage = localize('DataScience.restartKernelAfterInterruptMessage', 'Interrupting the kernel timed out. Do you want to restart the kernel instead? All variables will be lost.');
export const pythonInterruptFailedHeader = localize('DataScience.pythonInterruptFailedHeader', 'Keyboard interrupt crashed the kernel. Kernel restarted.');
Expand Down
8 changes: 4 additions & 4 deletions src/datascience-ui/history-react/toolbarPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export class ToolbarPanel extends React.Component<IToolbarPanelProps> {
return(
<div id='toolbar-panel'>
<MenuBar baseTheme={this.props.baseTheme}>
<ImageButton baseTheme={this.props.baseTheme} onClick={this.props.clearAll} tooltip={getLocString('DataScience.clearAll', 'Remove All Cells')}>
<ImageButton baseTheme={this.props.baseTheme} onClick={this.props.clearAll} tooltip={getLocString('DataScience.clearAll', 'Remove all cells')}>
<Image baseTheme={this.props.baseTheme} class='image-button-image' image={ImageName.Cancel}/>
</ImageButton>
<ImageButton baseTheme={this.props.baseTheme} onClick={this.props.redo} disabled={!this.props.canRedo} tooltip={getLocString('DataScience.redo', 'Redo')}>
Expand All @@ -49,13 +49,13 @@ export class ToolbarPanel extends React.Component<IToolbarPanelProps> {
<ImageButton baseTheme={this.props.baseTheme} onClick={this.props.undo} disabled={!this.props.canUndo} tooltip={getLocString('DataScience.undo', 'Undo')}>
<Image baseTheme={this.props.baseTheme} class='image-button-image' image={ImageName.Undo}/>
</ImageButton>
<ImageButton baseTheme={this.props.baseTheme} onClick={this.props.interruptKernel} tooltip={getLocString('DataScience.interruptKernel', 'Interrupt iPython Kernel')}>
<ImageButton baseTheme={this.props.baseTheme} onClick={this.props.interruptKernel} tooltip={getLocString('DataScience.interruptKernel', 'Interrupt IPython kernel')}>
<Image baseTheme={this.props.baseTheme} class='image-button-image' image={ImageName.Interrupt}/>
</ImageButton>
<ImageButton baseTheme={this.props.baseTheme} onClick={this.props.restartKernel} tooltip={getLocString('DataScience.restartServer', 'Restart iPython Kernel')}>
<ImageButton baseTheme={this.props.baseTheme} onClick={this.props.restartKernel} tooltip={getLocString('DataScience.restartServer', 'Restart IPython kernel')}>
<Image baseTheme={this.props.baseTheme} class='image-button-image' image={ImageName.Restart}/>
</ImageButton>
<ImageButton baseTheme={this.props.baseTheme} onClick={this.props.export} disabled={!this.props.canExport} tooltip={getLocString('DataScience.export', 'Export as Jupyter Notebook')}>
<ImageButton baseTheme={this.props.baseTheme} onClick={this.props.export} disabled={!this.props.canExport} tooltip={getLocString('DataScience.export', 'Export as Jupyter notebook')}>
<Image baseTheme={this.props.baseTheme} class='image-button-image' image={ImageName.SaveAs}/>
</ImageButton>
<ImageButton baseTheme={this.props.baseTheme} onClick={this.props.expandAll} disabled={!this.props.canExpandAll} tooltip={getLocString('DataScience.expandAll', 'Expand all cell inputs')}>
Expand Down