![](\"images/dashboard_files_tab.png\")
"
+ ""
]
},
{
@@ -31,7 +31,7 @@
"\n",
"To create a new notebook, click on the \"New\" button at the top of the list and select a kernel from the dropdown (as seen below). Which kernels are listed depend on what's installed on the server. Some of the kernels in the screenshot below may not exist as an option to you.\n",
"\n",
- "![](\"images/dashboard_files_tab_new.png\")
"
+ ""
]
},
{
@@ -42,7 +42,8 @@
"\n",
"The notebook list shows green \"Running\" text and a green notebook icon next to running notebooks (as seen below). Notebooks remain running until you explicitly shut them down; closing the notebook's page is not sufficient.\n",
"\n",
- "![](\"images/dashboard_files_tab_run.png\")
"
+ "\n",
+ ""
]
},
{
@@ -51,7 +52,7 @@
"source": [
"To shutdown, delete, duplicate, or rename a notebook check the checkbox next to it and an array of controls will appear at the top of the notebook list (as seen below). You can also use the same operations on directories and files when applicable.\n",
"\n",
- "![](\"images/dashboard_files_tab_btns.png\")
"
+ ""
]
},
{
@@ -60,7 +61,7 @@
"source": [
"To see all of your running notebooks along with their directories, click on the \"Running\" tab:\n",
"\n",
- "![](\"images/dashboard_running_tab.png\")
\n",
+ "\n",
"\n",
"This view provides a convenient way to track notebooks that you start as you navigate the file system in a long running notebook server."
]
@@ -112,7 +113,7 @@
"source": [
"Edit mode is indicated by a green cell border and a prompt showing in the editor area:\n",
"\n",
- "![](\"images/edit_mode.png\")
\n",
+ "\n",
"\n",
"When a cell is in edit mode, you can type into the cell, like a normal text editor."
]
@@ -139,7 +140,7 @@
"source": [
"Command mode is indicated by a grey cell border with a blue left margin:\n",
"\n",
- "![](\"images/command_mode.png\")
\n",
+ "\n",
"\n",
"When you are in command mode, you are able to edit the notebook as a whole, but not type into individual cells. Most importantly, in command mode, the keyboard is mapped to a set of shortcuts that let you perform notebook and cell actions efficiently. For example, if you are in command mode and you press `c`, you will copy the current cell - no modifier is needed."
]
@@ -175,7 +176,7 @@
"source": [
"All navigation and actions in the Notebook are available using the mouse through the menubar and toolbar, which are both above the main Notebook area:\n",
"\n",
- "![](\"images/menubar_toolbar.png\")
"
+ ""
]
},
{
@@ -193,7 +194,7 @@
"source": [
"The second idea of mouse based navigation is that **cell actions usually apply to the currently selected cell**. Thus if you want to run the code in a cell, you would select it and click the button in the toolbar or the \"Cell:Run\" menu item. Similarly, to copy a cell you would select it and click the button in the toolbar or the \"Edit:Copy\" menu item. With this simple pattern, you should be able to do most everything you need with the mouse.\n",
"\n",
- "Markdown and heading cells have one other state that can be modified with the mouse. These cells can either be rendered or unrendered. When they are rendered, you will see a nice formatted representation of the cell's contents. When they are unrendered, you will see the raw text source of the cell. To render the selected cell with the mouse, click the button in the toolbar or the \"Cell:Run\" menu item. To unrender the selected cell, double click on the cell."
+ "Markdown cells have one other state that can be modified with the mouse. These cells can either be rendered or unrendered. When they are rendered, you will see a nice formatted representation of the cell's contents. When they are unrendered, you will see the raw text source of the cell. To render the selected cell with the mouse, click the button in the toolbar or the \"Cell:Run\" menu item. To unrender the selected cell, double click on the cell."
]
},
{
@@ -245,9 +246,9 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.5.1"
+ "version": "3.5.2"
}
},
"nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
}
diff --git a/docs/source/examples/Notebook/What is the Jupyter Notebook.ipynb b/docs/source/examples/Notebook/What is the Jupyter Notebook.ipynb
index a5edb80e8..af9b187fc 100644
--- a/docs/source/examples/Notebook/What is the Jupyter Notebook.ipynb
+++ b/docs/source/examples/Notebook/What is the Jupyter Notebook.ipynb
@@ -79,7 +79,6 @@
"* See the results of computations with **rich media representations**, such as HTML, LaTeX, PNG, SVG, PDF, etc.\n",
"* Create and use **interactive JavaScript widgets**, which bind interactive user interface controls and visualizations to reactive kernel side computations.\n",
"* Author **narrative text** using the [Markdown](https://daringfireball.net/projects/markdown/) markup language.\n",
- "* Build **hierarchical documents** that are organized into sections with different levels of headings.\n",
"* Include mathematical equations using **LaTeX syntax in Markdown**, which are rendered in-browser by [MathJax](http://www.mathjax.org/)."
]
},
@@ -111,7 +110,7 @@
"\n",
"The default kernel runs Python code. The notebook provides a simple way for users to pick which of these kernels is used for a given notebook. \n",
"\n",
- "Each of these kernels communicate with the notebook web application and web browser using a JSON over ZeroMQ/WebSockets message protocol that is described [here](http://ipython.org/ipython-doc/dev/development/messaging.html). Most users don't need to know about these details, but it helps to understand that \"kernels run code.\""
+ "Each of these kernels communicate with the notebook web application and web browser using a JSON over ZeroMQ/WebSockets message protocol that is described [here](https://jupyter-client.readthedocs.io/en/latest/messaging.html#messaging). Most users don't need to know about these details, but it helps to understand that \"kernels run code.\""
]
},
{
diff --git a/docs/source/examples/Notebook/Working With Markdown Cells.ipynb b/docs/source/examples/Notebook/Working With Markdown Cells.ipynb
index 1e03b8319..b7ccc62e1 100644
--- a/docs/source/examples/Notebook/Working With Markdown Cells.ipynb
+++ b/docs/source/examples/Notebook/Working With Markdown Cells.ipynb
@@ -189,17 +189,13 @@
"source": [
"The Notebook webapp supports Github flavored markdown meaning that you can use triple backticks for code blocks:\n",
"\n",
- " \n",
" ```python\n",
" print \"Hello World\"\n",
" ```\n",
- " \n",
"\n",
- " \n",
" ```javascript\n",
" console.log(\"Hello World\")\n",
" ```\n",
- " \n",
"\n",
"Gives:\n",
"\n",
@@ -213,16 +209,10 @@
"\n",
"And a table like this: \n",
"\n",
- " \n",
- " ```\n",
- "\n",
" | This | is |\n",
" |------|------|\n",
" | a | table| \n",
"\n",
- " ```\n",
- " \n",
- "\n",
"A nice HTML Table:\n",
"\n",
"| This | is |\n",
@@ -278,7 +268,7 @@
"\n",
" ![](\"../images/python_logo.svg\"){kind=logo}
\n",
"\n",
- "![](\"images/python_logo.svg\"){kind=logo}
\n",
+ "\n",
"\n",
"and a video with the HTML5 video tag:\n",
"\n",
@@ -328,7 +318,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.5.2"
+ "version": "3.6.0"
}
},
"nbformat": 4,
diff --git a/docs/source/extending/handlers.rst b/docs/source/extending/handlers.rst
index f8a7dc613..90bed96a9 100644
--- a/docs/source/extending/handlers.rst
+++ b/docs/source/extending/handlers.rst
@@ -31,33 +31,33 @@ when the extension is loaded.
To get the notebook server to load your custom extension, you'll need to
add it to the list of extensions to be loaded. You can do this using the
-config system. ``NotebookApp.server_extensions`` is a config variable
-which is an array of strings, each a Python module to be imported.
+config system. ``NotebookApp.nbserver_extensions`` is a config variable
+which is a dictionary of strings, each a Python module to be imported, mapping
+to ``True`` to enable or ``False`` to disable each extension.
Because this variable is notebook config, you can set it two different
ways, using config files or via the command line.
For example, to get your extension to load via the command line add a
-double dash before the variable name, and put the Python array in
+double dash before the variable name, and put the Python dictionary in
double quotes. If your package is "mypackage" and module is
"mymodule", this would look like
-``jupyter notebook --NotebookApp.server_extensions="['mypackage.mymodule']"``
+``jupyter notebook --NotebookApp.nbserver_extensions="{'mypackage.mymodule':True}"``
.
Basically the string should be Python importable.
Alternatively, you can have your extension loaded regardless of the
command line args by setting the variable in the Jupyter config file.
The default location of the Jupyter config file is
-``~/.jupyter/profile_default/jupyter_notebook_config.py``. Then, inside
+``~/.jupyter/jupyter_notebook_config.py`` (see :doc:`/config_overview`). Inside
the config file, you can use Python to set the variable. For example,
-the following config does the same as the previous command line example
-[1].
+the following config does the same as the previous command line example.
.. code:: python
c = get_config()
- c.NotebookApp.server_extensions = [
- 'mypackage.mymodule'
- ]
+ c.NotebookApp.nbserver_extensions = {
+ 'mypackage.mymodule': True,
+ }
Before continuing, it's a good idea to verify that your extension is
being loaded. Use a print statement to print something unique. Launch
diff --git a/docs/source/frontend_config.rst b/docs/source/frontend_config.rst
index 6c4280ad5..be3699ffd 100644
--- a/docs/source/frontend_config.rst
+++ b/docs/source/frontend_config.rst
@@ -61,7 +61,7 @@ four spaces. Enter the following code snippet in your JavaScript console::
var config = cell.config;
var patch = {
CodeCell:{
- cm_config:{indentUnit: null} # only change here.
+ cm_config:{indentUnit: null} // only change here.
}
}
config.update(patch)
diff --git a/docs/source/notebook.rst b/docs/source/notebook.rst
index f50721018..9bbb7bdfc 100644
--- a/docs/source/notebook.rst
+++ b/docs/source/notebook.rst
@@ -208,15 +208,14 @@ operations within the notebook, by clicking on an icon.
Structure of a notebook document
--------------------------------
-The notebook consists of a sequence of cells. A cell is a multiline
-text input field, and its contents can be executed by using
-:kbd:`Shift-Enter`, or by clicking either the "Play" button the toolbar, or
-`Cell | Run` in the menu bar. The execution behavior of a cell is determined
-the cell's type. There are four types of cells: **code cells**, **markdown
-cells**, **raw cells** and **heading cells**. Every cell starts off
-being a **code cell**, but its type can be changed by using a drop-down on the
-toolbar (which will be "Code", initially), or via :ref:`keyboard shortcuts
-Enter or clicking in the input text area of the cell switches to Edit Mode."
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:70
+msgid "Notice that the border around the currently active cell changed color. Typing will insert text into the currently active cell."
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:73
+msgid "Back to Command Mode"
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:76
+msgid "Pressing Esc or clicking outside of the input text area takes you back to Command Mode."
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:79
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:91
+msgid "You can click here to get a list of all of the keyboard shortcuts."
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:94
+#: notebook/static/notebook/js/tour.js:100
+msgid "Kernel Indicator"
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:97
+msgid "This is the Kernel indicator. It looks like this when the Kernel is idle."
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:103
+msgid "The Kernel indicator looks like this when the Kernel is busy."
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:107
+msgid "Interrupting the Kernel"
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:109
+msgid "To cancel a computation in progress, you can click here."
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:114
+msgid "Notification Area"
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:115
+msgid "Messages in response to user actions (Save, Interrupt, etc.) appear here."
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:117
+msgid "End of Tour"
+msgstr ""
+
+#: notebook/static/notebook/js/tour.js:120
+msgid "This concludes the Jupyter Notebook User Interface Tour."
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/attachments.js:32
+msgid "Edit Attachments"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/default.js:19
+msgid "Cell"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/default.js:29
+#: notebook/static/notebook/js/celltoolbarpresets/default.js:47
+msgid "Edit Metadata"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/rawcell.js:22
+msgid "Custom"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/rawcell.js:32
+msgid "Set the MIME type of the raw cell:"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/rawcell.js:40
+msgid "Raw Cell MIME Type"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/rawcell.js:74
+msgid "Raw NBConvert Format"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/rawcell.js:81
+msgid "Raw Cell Format"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/slideshow.js:15
+msgid "Slide"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/slideshow.js:16
+msgid "Sub-Slide"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/slideshow.js:17
+msgid "Fragment"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/slideshow.js:18
+msgid "Skip"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/slideshow.js:19
+msgid "Notes"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/slideshow.js:35
+msgid "Slide Type"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/slideshow.js:41
+msgid "Slideshow"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/tags.js:133
+msgid "Add tag"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/tags.js:163
+msgid "Edit the list of tags below. All whitespace is treated as tag separators."
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/tags.js:172
+msgid "Edit the tags"
+msgstr ""
+
+#: notebook/static/notebook/js/celltoolbarpresets/tags.js:186
+msgid "Edit Tags"
+msgstr ""
+
+#: notebook/static/tree/js/kernellist.js:86
+#: notebook/static/tree/js/terminallist.js:105
+msgid "Shutdown"
+msgstr ""
+
+#: notebook/static/tree/js/newnotebook.js:70
+#, python-format
+msgid "Create a new notebook with %s"
+msgstr ""
+
+#: notebook/static/tree/js/newnotebook.js:101
+msgid "An error occurred while creating a new notebook."
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:122
+msgid "Creating File Failed"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:124
+msgid "An error occurred while creating a new file."
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:142
+msgid "Creating Folder Failed"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:144
+msgid "An error occurred while creating a new folder."
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:271
+msgid "Failed to read file"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:272
+#, python-format
+msgid "Failed to read file %s"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:283
+#, python-format
+msgid "The file size is %d MB. Do you still want to upload it?"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:286
+msgid "Large file size warning"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:355
+msgid "Server error: "
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:390
+msgid "The notebook list is empty."
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:463
+msgid "Click here to rename, delete, etc."
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:503
+msgid "Running"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:835
+msgid "Enter a new file name:"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:836
+msgid "Enter a new directory name:"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:838
+msgid "Enter a new name:"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:843
+msgid "Rename file"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:844
+msgid "Rename directory"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:845
+msgid "Rename notebook"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:859
+msgid "Move"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:875
+msgid "An error occurred while renaming \"%1$s\" to \"%2$s\"."
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:878
+msgid "Rename Failed"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:927
+#, python-format
+msgid "Enter a new destination directory path for this item:"
+msgid_plural "Enter a new destination directory path for these %d items:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: notebook/static/tree/js/notebooklist.js:940
+#, python-format
+msgid "Move an Item"
+msgid_plural "Move %d Items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: notebook/static/tree/js/notebooklist.js:959
+msgid "An error occurred while moving \"%1$s\" from \"%2$s\" to \"%3$s\"."
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:961
+msgid "Move Failed"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:1007
+#, python-format
+msgid "Are you sure you want to permanently delete: \"%s\"?"
+msgid_plural "Are you sure you want to permanently delete the %d files or folders selected?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: notebook/static/tree/js/notebooklist.js:1035
+#, python-format
+msgid "An error occurred while deleting \"%s\"."
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:1037
+msgid "Delete Failed"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:1078
+#, python-format
+msgid "Are you sure you want to duplicate: \"%s\"?"
+msgid_plural "Are you sure you want to duplicate the %d files selected?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: notebook/static/tree/js/notebooklist.js:1088
+msgid "Duplicate"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:1102
+#, python-format
+msgid "An error occurred while duplicating \"%s\"."
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:1104
+msgid "Duplicate Failed"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:1323
+msgid "Upload"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:1332
+msgid "Invalid file name"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:1333
+msgid "File names must be at least one character and not start with a period"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:1362
+msgid "Cannot upload invalid Notebook"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:1395
+#, python-format
+msgid "There is already a file named \"%s\". Do you want to replace it?"
+msgstr ""
+
+#: notebook/static/tree/js/notebooklist.js:1397
+msgid "Replace file"
+msgstr ""
+
diff --git a/notebook/i18n/nbui.pot b/notebook/i18n/nbui.pot
new file mode 100644
index 000000000..11c30aac6
--- /dev/null
+++ b/notebook/i18n/nbui.pot
@@ -0,0 +1,731 @@
+# Translations template for Jupyter.
+# Copyright (C) 2017 ORGANIZATION
+# This file is distributed under the same license as the Jupyter project.
+# FIRST AUTHOR ');
} else {
- message = "Current cell attachments";
+ message = i18n.msg._("Current cell attachments");
attachments_list = $('
')
.addClass('list_container')
@@ -238,7 +256,7 @@ define(function(require) {
.addClass('row list_header')
.append(
$('
')
- .text('Attachments')
+ .text(i18n.msg._('Attachments'))
)
);
@@ -262,7 +280,7 @@ define(function(require) {
.addClass('btn btn-default btn-xs')
.css('display', 'inline-block');
if (deleted) {
- btn.attr('title', 'Restore')
+ btn.attr('title', i18n.msg._('Restore'))
.append(
$('')
.addClass('fa fa-plus')
@@ -272,7 +290,7 @@ define(function(require) {
refresh_attachments_list();
});
} else {
- btn.attr('title', 'Delete')
+ btn.attr('title', i18n.msg._('Delete'))
.addClass('btn-danger')
.append(
$('')
@@ -321,12 +339,18 @@ define(function(require) {
}
var dialogform = $('')
- .attr('title', 'Edit attachments')
+ .attr('title', i18n.msg._('Edit attachments'))
.append(message)
.append('
') - .append(attachments_list) + .append(attachments_list); + var title_msg; + if ( options.name === "Notebook" ) { + title_msg = i18n.msg._("Edit Notebook Attachments"); + } else { + title_msg = i18n.msg._("Edit Cell Attachments"); + } var modal_obj = modal({ - title: "Edit " + options.name + " Attachments", + title: title_msg, body: dialogform, buttons: { Apply: { class : "btn-primary", @@ -346,7 +370,7 @@ define(function(require) { var insert_image = function (options) { var message = - "Select a file to insert."; + i18n.msg._("Select a file to insert."); var file_input = $('') .attr('type', 'file') .attr('accept', 'image/*') @@ -359,7 +383,7 @@ define(function(require) { $btn.addClass('disabled'); } }); - var dialogform = $('').attr('title', 'Edit attachments') + var dialogform = $('').attr('title', i18n.msg._('Edit attachments')) .append( $('').append( $('').append( @@ -372,7 +396,7 @@ define(function(require) { ) ); var modal_obj = modal({ - title: "Pick a file", + title: i18n.msg._("Select a file"), body: dialogform, buttons: { OK: { diff --git a/notebook/static/base/js/i18n.js b/notebook/static/base/js/i18n.js new file mode 100644 index 000000000..3785056ec --- /dev/null +++ b/notebook/static/base/js/i18n.js @@ -0,0 +1,54 @@ +// Copyright (c) Jupyter Development Team. +// Distributed under the terms of the Modified BSD License. + +// Module to handle i18n ( Internationalization ) and translated UI + +define([ + 'jed', + 'moment', + 'json!../../../i18n/nbjs.json', + 'base/js/i18nload', + ], function(Jed, moment, nbjs, i18nload) { + "use strict"; + + // Setup language related stuff + var ui_lang = navigator.languages && navigator.languages[0] || // Chrome / Firefox + navigator.language || // All browsers + navigator.userLanguage; // IE <= 10 + + var init = function() { + var msg_promise; + if (nbjs.supported_languages.indexOf(ui_lang) >= 0) { + moment.locale(ui_lang); + msg_promise = new Promise( function (resolve, reject) { + require([i18nload.id+"!"+ui_lang], function (data) { + var newi18n = new Jed(data); + newi18n._ = newi18n.gettext; + resolve(newi18n); + }, function (error) { + console.log("Error loading translations for language: "+ui_lang); + var newi18n = new Jed(nbjs); + newi18n._ = newi18n.gettext; + resolve(newi18n); + }); + }); + } else { + msg_promise = new Promise( function (resolve, reject) { + var newi18n = new Jed(nbjs); + newi18n._ = newi18n.gettext; + resolve(newi18n); + }); + } + return msg_promise; + } + var i18n = new Jed(nbjs); + i18n._ = i18n.gettext; + i18n.msg = i18n; // Just a place holder until the init promise resolves. + + init().then(function (msg) { + i18n.msg = msg; + i18n.msg._ = i18n.msg.gettext; + }); + + return i18n; +}); diff --git a/notebook/static/base/js/i18nload.js b/notebook/static/base/js/i18nload.js new file mode 100644 index 000000000..420a1aa2b --- /dev/null +++ b/notebook/static/base/js/i18nload.js @@ -0,0 +1,26 @@ +/** + * Plugin to load a single locale. + */ +define([ + "require", + "module", + // These are only here so that the optimizer knows which ones we MIGHT load. + // We will actually only load the ones we need. There should be one entry + // here for each language you want to support. + // For example, for German.... + // "json!base/../../i18n/de/LC_MESSAGES/nbjs.json" + ], function (require, module) { + return { + id: module.id, + + load: function (locale, callerRequire, onload, loaderConfig) { + + var dependencies = "json!base/../../i18n/"+locale+"/LC_MESSAGES/nbjs.json"; + + // Load the JSON file requested + require([dependencies], function (data) { + onload(data); + }); + } + }; +}); diff --git a/notebook/static/base/js/namespace.js b/notebook/static/base/js/namespace.js index 22f47bafb..af8a940f0 100644 --- a/notebook/static/base/js/namespace.js +++ b/notebook/static/base/js/namespace.js @@ -73,7 +73,7 @@ define(function(){ // tree jglobal('SessionList','tree/js/sessionlist'); - Jupyter.version = "5.0.0.dev"; + Jupyter.version = "5.1.0.dev"; Jupyter._target = '_blank'; return Jupyter; }); diff --git a/notebook/static/base/js/page.js b/notebook/static/base/js/page.js index 8a013341c..666230011 100644 --- a/notebook/static/base/js/page.js +++ b/notebook/static/base/js/page.js @@ -7,7 +7,17 @@ define([ ], function($, events){ "use strict"; - var Page = function () { + var Page = function (header_div_selector, site_div_selector) { + /** + * Constructor + * + * Parameters + * header_div_selector: string + * site_div_selector: string + */ + this.header_div_element = $(header_div_selector); + this.site_div_element = $(site_div_selector); + this.bind_events(); }; @@ -38,18 +48,16 @@ define([ /** * The header and site divs start out hidden to prevent FLOUC. * Main scripts should call this method after styling everything. - * TODO: selector are hardcoded, pass as constructor argument */ - $('div#header').css('display','block'); + this.header_div_element.css('display','block'); }; Page.prototype.show_site = function () { /** * The header and site divs start out hidden to prevent FLOUC. * Main scripts should call this method after styling everything. - * TODO: selector are hardcoded, pass as constructor argument */ - $('div#site').css('display', 'block'); + this.site_div_element.css('display', 'block'); this._resize_site(); }; diff --git a/notebook/static/base/js/utils.js b/notebook/static/base/js/utils.js index 93df51748..c88a9fc9d 100644 --- a/notebook/static/base/js/utils.js +++ b/notebook/static/base/js/utils.js @@ -282,6 +282,8 @@ define([ var fg = []; var bg = []; var bold = false; + var underline = false; + var inverse = false; var match; var out = []; var numbers = []; @@ -330,6 +332,14 @@ define([ classes.push("ansi-bold"); } + if (underline) { + classes.push("ansi-underline"); + } + + if (inverse) { + classes.push("ansi-inverse"); + } + if (classes.length || styles.length) { out.push("= 0xD800 && char_code <= 0xDBFF) {
+ var next_char_code = text.charCodeAt(i+1);
+ if (next_char_code >= 0xDC00 && next_char_code <= 0xDFFF) {
+ char_idx--;
+ i++;
+ }
+ }
+ }
+ return char_idx;
+ }
+
+ function char_idx_to_js_idx (char_idx, text) {
+ var js_idx = char_idx;
+ for (var i = 0; i + 1 < text.length && i < js_idx; i++) {
+ var char_code = text.charCodeAt(i);
+ // check for surrogate pair
+ if (char_code >= 0xD800 && char_code <= 0xDBFF) {
+ var next_char_code = text.charCodeAt(i+1);
+ if (next_char_code >= 0xDC00 && next_char_code <= 0xDFFF) {
+ js_idx++;
+ i++;
+ }
+ }
+ }
+ return js_idx;
+ }
+
+ if ('𝐚'.length === 1) {
+ // If javascript fixes string indices of non-BMP characters,
+ // don't keep shifting offsets to compensate for surrogate pairs
+ char_idx_to_js_idx = js_idx_to_char_idx = function (idx, text) { return idx; };
+ }
+
// Test if a drag'n'drop event contains a file (as opposed to an HTML
// element/text from the document)
var dnd_contain_file = function(event) {
@@ -1027,6 +1098,21 @@ define([
fn();
}
}
+
+ var change_favicon = function (src) {
+ var link = document.createElement('link'),
+ oldLink = document.getElementById('favicon');
+ link.id = 'favicon';
+ link.type = 'image/x-icon';
+ link.rel = 'shortcut icon';
+ link.href = utils.url_path_join(utils.get_body_data('baseUrl'), src);
+ if (oldLink && (link.href === oldLink.href)) {
+ // This favicon is already set, don't modify the DOM.
+ return;
+ }
+ if (oldLink) document.head.removeChild(oldLink);
+ document.head.appendChild(link);
+ };
var utils = {
throttle: throttle,
@@ -1077,7 +1163,10 @@ define([
format_datetime: format_datetime,
datetime_sort_helper: datetime_sort_helper,
dnd_contain_file: dnd_contain_file,
- _ansispan:_ansispan
+ js_idx_to_char_idx: js_idx_to_char_idx,
+ char_idx_to_js_idx: char_idx_to_js_idx,
+ _ansispan:_ansispan,
+ change_favicon: change_favicon
};
return utils;
diff --git a/notebook/static/base/less/page.less b/notebook/static/base/less/page.less
index 6a565433a..85e7f825a 100644
--- a/notebook/static/base/less/page.less
+++ b/notebook/static/base/less/page.less
@@ -27,6 +27,10 @@ body > #header {
z-index: 100;
#header-container {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ padding: 5px;
padding-bottom: 5px;
padding-top: 5px;
.border-box-sizing();
@@ -57,9 +61,6 @@ body > #header {
padding-left: 0px;
padding-top: (@navbar-height - @logo_height) / 2;
padding-bottom: (@navbar-height - @logo_height) / 2;
- @media (max-width: @screen-sm-max){
- margin-left: 10px;
- }
}
[dir="rtl"] #ipython_notebook {
@@ -71,6 +72,10 @@ body > #header {
.pull-right();
}
+.flex-spacer {
+ flex: 1;
+}
+
#noscript {
width: auto;
padding-top: 16px;
@@ -106,6 +111,10 @@ input.ui-button {
padding: 0.3em 0.9em;
}
+span#kernel_logo_widget {
+ margin: 0 10px;
+}
+
span#login_widget {
float: right;
}
diff --git a/notebook/static/custom/custom.js b/notebook/static/custom/custom.js
index 05aa9ae20..17b06f49d 100644
--- a/notebook/static/custom/custom.js
+++ b/notebook/static/custom/custom.js
@@ -63,16 +63,6 @@
* });
* });
*
- * __Example 3:__
- *
- * Use `jQuery.getScript(url [, success(script, textStatus, jqXHR)] );`
- * to load custom script into the notebook.
- *
- * // to load the metadata ui extension example.
- * $.getScript('/static/notebook/js/celltoolbarpresets/example.js');
- * // or
- * // to load the metadata ui extension to control slideshow mode / reveal js for nbconvert
- * $.getScript('/static/notebook/js/celltoolbarpresets/slideshow.js');
*
*
* @module IPython
diff --git a/notebook/static/edit/js/editor.js b/notebook/static/edit/js/editor.js
index 71a582dcc..b95ceda97 100644
--- a/notebook/static/edit/js/editor.js
+++ b/notebook/static/edit/js/editor.js
@@ -32,6 +32,8 @@ function(
this.base_url = options.base_url;
this.file_path = options.file_path;
this.config = options.config;
+ this.file_extension_modes = options.file_extension_modes || {};
+
this.codemirror = new CodeMirror($(this.selector)[0]);
this.codemirror.on('changes', function(cm, changes){
that._clean_state();
@@ -54,6 +56,16 @@ function(
);
that._set_codemirror_options(cmopts);
that.events.trigger('config_changed.Editor', {config: that.config});
+ if (cfg.file_extension_modes) {
+ // check for file extension in user preferences
+ var modename = cfg.file_extension_modes[that._get_file_extension()];
+ if (modename) {
+ var modeinfo = CodeMirror.findModeByName(modename);
+ if (modeinfo) {
+ that.set_codemirror_mode(modeinfo);
+ }
+ }
+ }
that._clean_state();
});
this.clean_sel = $('');
@@ -99,7 +111,7 @@ function(
}
);
};
-
+
Editor.prototype._set_mode_for_model = function (model) {
/** Set the CodeMirror mode based on the file model */
@@ -107,20 +119,28 @@ function(
// first by mime-type, then by file extension
var modeinfo;
- // mimetype is unset on file rename
- if (model.mimetype) {
- modeinfo = CodeMirror.findModeByMIME(model.mimetype);
+ var ext = this._get_file_extension();
+ if (ext) {
+ // check if a mode has been remembered for this extension
+ var modename = this.file_extension_modes[ext];
+ if (modename) {
+ modeinfo = CodeMirror.findModeByName(modename);
+ }
}
+ // prioritize CodeMirror's filename identification
if (!modeinfo || modeinfo.mode === "null") {
- // find by mime failed, use find by ext
- var ext_idx = model.name.lastIndexOf('.');
-
- if (ext_idx > 0) {
- // CodeMirror.findModeByExtension wants extension without '.'
- modeinfo = CodeMirror.findModeByExtension(
- model.name.slice(ext_idx + 1).toLowerCase());
+ modeinfo = CodeMirror.findModeByFileName(model.name);
+ // codemirror's filename identification is case-sensitive.
+ // try once more with lowercase extension
+ if (!modeinfo && ext) {
+ // CodeMirror wants lowercase ext without leading '.'
+ modeinfo = CodeMirror.findModeByExtension(ext.slice(1).toLowerCase());
}
}
+ if (model.mimetype && (!modeinfo || modeinfo.mode === "null")) {
+ // mimetype is not set on file rename
+ modeinfo = CodeMirror.findModeByMIME(model.mimetype);
+ }
if (modeinfo) {
this.set_codemirror_mode(modeinfo);
}
@@ -134,11 +154,41 @@ function(
that.events.trigger("mode_changed.Editor", modeinfo);
});
};
-
+
+ Editor.prototype.save_codemirror_mode = function (modeinfo) {
+ /** save the selected codemirror mode for the current extension in config */
+ var update_mode_map = {};
+ var ext = this._get_file_extension();
+ // no extension, nothing to save
+ // TODO: allow remembering no-extension things like Makefile?
+ if (!ext) return;
+
+ update_mode_map[ext] = modeinfo.name;
+ return this.config.update({
+ Editor: {
+ file_extension_modes: update_mode_map,
+ }
+ })
+ };
+
Editor.prototype.get_filename = function () {
return utils.url_path_split(this.file_path)[1];
};
+ Editor.prototype._get_file_extension = function () {
+ /** return file extension *including* .
+
+ Returns undefined if no extension is found.
+ */
+ var filename = this.get_filename();
+ var ext_idx = filename.lastIndexOf('.');
+ if (ext_idx < 0) {
+ return;
+ } else {
+ return filename.slice(ext_idx);
+ }
+ };
+
Editor.prototype.rename = function (new_name) {
/** rename the file */
var that = this;
@@ -203,7 +253,7 @@ function(
});
var that = this;
};
-
+
Editor.prototype.update_codemirror_options = function (options) {
/** update codemirror options locally and save changes in config */
var that = this;
diff --git a/notebook/static/edit/js/main.js b/notebook/static/edit/js/main.js
index 7a8a8a4f5..6f523d877 100644
--- a/notebook/static/edit/js/main.js
+++ b/notebook/static/edit/js/main.js
@@ -39,7 +39,7 @@ require([
console.warn(err);
}
- page = new page.Page();
+ page = new page.Page('div#header', 'div#site');
var base_url = utils.get_body_data('baseUrl');
var file_path = utils.get_body_data('filePath');
diff --git a/notebook/static/edit/js/menubar.js b/notebook/static/edit/js/menubar.js
index 992e58590..d7fa05577 100644
--- a/notebook/static/edit/js/menubar.js
+++ b/notebook/static/edit/js/menubar.js
@@ -146,6 +146,8 @@ define([
function make_set_mode(info) {
return function () {
editor.set_codemirror_mode(info);
+ // save codemirror mode for extension when explicitly selected
+ editor.save_codemirror_mode(info);
};
}
for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
diff --git a/notebook/static/edit/js/savewidget.js b/notebook/static/edit/js/savewidget.js
index 38f7fa851..f7dd92b2a 100644
--- a/notebook/static/edit/js/savewidget.js
+++ b/notebook/static/edit/js/savewidget.js
@@ -80,6 +80,11 @@ define([
class: "btn-primary",
click: function () {
var new_name = d.find('input').val();
+ if (!new_name) {
+ // Reset the message
+ d.find('.rename-message').text("Enter a new filename:");
+ return false;
+ }
d.find('.rename-message').text("Renaming...");
d.find('input[type="text"]').prop('disabled', true);
that.editor.rename(new_name).then(
diff --git a/notebook/static/edit/less/edit.less b/notebook/static/edit/less/edit.less
index 972da2b84..a23f548d0 100644
--- a/notebook/static/edit/less/edit.less
+++ b/notebook/static/edit/less/edit.less
@@ -49,3 +49,7 @@
}
}
}
+
+.CodeMirror-dialog {
+ background-color: @page-color;
+}
diff --git a/notebook/static/favicon.ico b/notebook/static/favicon.ico
new file mode 120000
index 000000000..34c393d8a
--- /dev/null
+++ b/notebook/static/favicon.ico
@@ -0,0 +1 @@
+base/images/favicon.ico
\ No newline at end of file
diff --git a/notebook/static/notebook/js/about.js b/notebook/static/notebook/js/about.js
index fe977bbd8..073f121a7 100644
--- a/notebook/static/notebook/js/about.js
+++ b/notebook/static/notebook/js/about.js
@@ -3,35 +3,39 @@
require([
'jquery',
'base/js/dialog',
+ 'base/js/i18n',
'underscore',
'base/js/namespace'
-], function ($, dialog, _, IPython) {
+], function ($, dialog, i18n, _, IPython) {
'use strict';
$('#notebook_about').click(function () {
// use underscore template to auto html escape
if (sys_info) {
- var text = 'You are using Jupyter notebook.
'; - text = text + 'The version of the notebook server is '; + var text = i18n.msg._('You are using Jupyter notebook.'); + text = text + '
'; + text = text + i18n.msg._('The version of the notebook server is: '); text = text + _.template('<%- version %>')({ version: sys_info.notebook_version }); if (sys_info.commit_hash) { text = text + _.template('-<%- hash %>')({ hash: sys_info.commit_hash }); } - text = text + _.template(' and is running on:
'; + text = text + i18n.msg._('The server is running on this version of Python:'); + text = text + _.template('
") ).append( @@ -36,7 +37,7 @@ define([ .val(cell.metadata.raw_mimetype || "-") ); dialog.modal({ - title: "Raw Cell MIME Type", + title: i18n.msg._("Raw Cell MIME Type"), body: dialog, buttons : { "Cancel": {}, @@ -70,14 +71,14 @@ define([ return cell.metadata.raw_mimetype || ""; }, // name - "Raw NBConvert Format" + i18n.msg._("Raw NBConvert Format") ); var register = function (notebook) { CellToolbar.register_callback('raw_cell.select', select_type, ['raw']); raw_cell_preset.push('raw_cell.select'); - CellToolbar.register_preset('Raw Cell Format', raw_cell_preset, notebook); + CellToolbar.register_preset(i18n.msg._('Raw Cell Format'), raw_cell_preset, notebook); }; return {'register': register}; diff --git a/notebook/static/notebook/js/celltoolbarpresets/slideshow.js b/notebook/static/notebook/js/celltoolbarpresets/slideshow.js index 9ae7641c7..505af7b44 100644 --- a/notebook/static/notebook/js/celltoolbarpresets/slideshow.js +++ b/notebook/static/notebook/js/celltoolbarpresets/slideshow.js @@ -3,20 +3,20 @@ define([ 'notebook/js/celltoolbar', -], function(celltoolbar) { + 'base/js/i18n' +], function(celltoolbar, i18n) { "use strict"; - var CellToolbar = celltoolbar.CellToolbar; var slideshow_preset = []; var select_type = CellToolbar.utils.select_ui_generator([ ["-" ,"-" ], - ["Slide" ,"slide" ], - ["Sub-Slide" ,"subslide" ], - ["Fragment" ,"fragment" ], - ["Skip" ,"skip" ], - ["Notes" ,"notes" ], + [i18n.msg._("Slide") ,"slide" ], + [i18n.msg._("Sub-Slide") ,"subslide" ], + [i18n.msg._("Fragment") ,"fragment" ], + [i18n.msg._("Skip") ,"skip" ], + [i18n.msg._("Notes") ,"notes" ], ], // setter function(cell, value){ @@ -32,13 +32,13 @@ define([ // return the value return (ns === undefined)? undefined: ns.slide_type; }, - "Slide Type"); + i18n.msg._("Slide Type")); var register = function (notebook) { CellToolbar.register_callback('slideshow.select',select_type); slideshow_preset.push('slideshow.select'); - CellToolbar.register_preset('Slideshow',slideshow_preset, notebook); + CellToolbar.register_preset(i18n.msg._('Slideshow'),slideshow_preset, notebook); }; return {'register': register}; }); diff --git a/notebook/static/notebook/js/celltoolbarpresets/tags.js b/notebook/static/notebook/js/celltoolbarpresets/tags.js index 6289e7082..4ec2761ec 100644 --- a/notebook/static/notebook/js/celltoolbarpresets/tags.js +++ b/notebook/static/notebook/js/celltoolbarpresets/tags.js @@ -4,7 +4,8 @@ define([ 'notebook/js/celltoolbar', 'base/js/dialog', -], function(celltoolbar, dialog) { + 'base/js/i18n' +], function(celltoolbar, dialog, i18n) { "use strict"; var CellToolbar = celltoolbar.CellToolbar; @@ -13,7 +14,7 @@ define([ return a.filter(function(n) { return b.indexOf(n) === -1; }); - } + }; var write_tag = function(cell, name, add) { if (add) { @@ -43,12 +44,12 @@ define([ } cell.events.trigger('set_dirty.Notebook', {value: true}); return true; - } + }; var preprocess_input = function(input) { - // Split on whitespace: - return input.split(/\s/); - } + // Split on whitespace + commas: + return input.split(/[,\s]+/) + }; var add_tag = function(cell, tag_container, on_remove) { return function(name) { @@ -111,14 +112,12 @@ define([ .addClass('cell-tag') .text(name); - var remove_button = $('') + var remove_button = $('') .addClass('remove-tag-btn') - .text('X') - .click( function(ev) { - if (ev.button === 0) { - on_remove(name); - return false; - } + .addClass('fa fa-times') + .click(function () { + on_remove(name); + return false; }); tag_UI.append(remove_button); return tag_UI; @@ -131,7 +130,7 @@ define([ var text = $('').attr('type', 'text'); var button = $('') .addClass('btn btn-default btn-xs') - .text('Add tag') + .text(i18n.msg._('Add tag')) .click(function() { var tags = preprocess_input(text[0].value); for (var i=0; i < tags.length; ++i) { @@ -148,7 +147,7 @@ define([ } }); var input_container = $('') - .addClass('tags-input') + .addClass('tags-input'); add_dialog_button(input_container, cell, on_add, on_remove); button_container.append(input_container .append(text) @@ -161,8 +160,8 @@ define([ var tag_list = cell.metadata.tags || []; var message = - "Edit the list of tags below. All whitespace " + - "is treated as tag separators."; + i18n.msg._("Edit the list of tags below. All whitespace " + + "is treated as tag separators."); var textarea = $('') .attr('rows', '13') @@ -170,7 +169,7 @@ define([ .attr('name', 'tags') .text(tag_list.join('\n')); - var dialogform = $('').attr('title', 'Edit the tags') + var dialogform = $('').attr('title', i18n.msg._('Edit the tags')) .append( $('').append( $('').append( @@ -184,7 +183,7 @@ define([ ); var modal_obj = dialog.modal({ - title: "Edit Tags", + title: i18n.msg._("Edit Tags"), body: dialogform, default_button: "Cancel", buttons: { diff --git a/notebook/static/notebook/js/clipboard.js b/notebook/static/notebook/js/clipboard.js index e12edfa74..b5248dd23 100644 --- a/notebook/static/notebook/js/clipboard.js +++ b/notebook/static/notebook/js/clipboard.js @@ -5,8 +5,9 @@ define([ 'jquery', 'base/js/namespace', 'base/js/utils', + 'base/js/i18n', 'base/js/dialog' -], function($, Jupyter, utils, dialog) { +], function($, Jupyter, utils, i18n, dialog) { var jcbprefix = '
') - .append(attachments_list) + .append(attachments_list); + var title_msg; + if ( options.name === "Notebook" ) { + title_msg = i18n.msg._("Edit Notebook Attachments"); + } else { + title_msg = i18n.msg._("Edit Cell Attachments"); + } var modal_obj = modal({ - title: "Edit " + options.name + " Attachments", + title: title_msg, body: dialogform, buttons: { Apply: { class : "btn-primary", @@ -346,7 +370,7 @@ define(function(require) { var insert_image = function (options) { var message = - "Select a file to insert."; + i18n.msg._("Select a file to insert."); var file_input = $('') .attr('type', 'file') .attr('accept', 'image/*') @@ -359,7 +383,7 @@ define(function(require) { $btn.addClass('disabled'); } }); - var dialogform = $('').attr('title', 'Edit attachments') + var dialogform = $('').attr('title', i18n.msg._('Edit attachments')) .append( $('').append( $('').append( @@ -372,7 +396,7 @@ define(function(require) { ) ); var modal_obj = modal({ - title: "Pick a file", + title: i18n.msg._("Select a file"), body: dialogform, buttons: { OK: { diff --git a/notebook/static/base/js/i18n.js b/notebook/static/base/js/i18n.js new file mode 100644 index 000000000..3785056ec --- /dev/null +++ b/notebook/static/base/js/i18n.js @@ -0,0 +1,54 @@ +// Copyright (c) Jupyter Development Team. +// Distributed under the terms of the Modified BSD License. + +// Module to handle i18n ( Internationalization ) and translated UI + +define([ + 'jed', + 'moment', + 'json!../../../i18n/nbjs.json', + 'base/js/i18nload', + ], function(Jed, moment, nbjs, i18nload) { + "use strict"; + + // Setup language related stuff + var ui_lang = navigator.languages && navigator.languages[0] || // Chrome / Firefox + navigator.language || // All browsers + navigator.userLanguage; // IE <= 10 + + var init = function() { + var msg_promise; + if (nbjs.supported_languages.indexOf(ui_lang) >= 0) { + moment.locale(ui_lang); + msg_promise = new Promise( function (resolve, reject) { + require([i18nload.id+"!"+ui_lang], function (data) { + var newi18n = new Jed(data); + newi18n._ = newi18n.gettext; + resolve(newi18n); + }, function (error) { + console.log("Error loading translations for language: "+ui_lang); + var newi18n = new Jed(nbjs); + newi18n._ = newi18n.gettext; + resolve(newi18n); + }); + }); + } else { + msg_promise = new Promise( function (resolve, reject) { + var newi18n = new Jed(nbjs); + newi18n._ = newi18n.gettext; + resolve(newi18n); + }); + } + return msg_promise; + } + var i18n = new Jed(nbjs); + i18n._ = i18n.gettext; + i18n.msg = i18n; // Just a place holder until the init promise resolves. + + init().then(function (msg) { + i18n.msg = msg; + i18n.msg._ = i18n.msg.gettext; + }); + + return i18n; +}); diff --git a/notebook/static/base/js/i18nload.js b/notebook/static/base/js/i18nload.js new file mode 100644 index 000000000..420a1aa2b --- /dev/null +++ b/notebook/static/base/js/i18nload.js @@ -0,0 +1,26 @@ +/** + * Plugin to load a single locale. + */ +define([ + "require", + "module", + // These are only here so that the optimizer knows which ones we MIGHT load. + // We will actually only load the ones we need. There should be one entry + // here for each language you want to support. + // For example, for German.... + // "json!base/../../i18n/de/LC_MESSAGES/nbjs.json" + ], function (require, module) { + return { + id: module.id, + + load: function (locale, callerRequire, onload, loaderConfig) { + + var dependencies = "json!base/../../i18n/"+locale+"/LC_MESSAGES/nbjs.json"; + + // Load the JSON file requested + require([dependencies], function (data) { + onload(data); + }); + } + }; +}); diff --git a/notebook/static/base/js/namespace.js b/notebook/static/base/js/namespace.js index 22f47bafb..af8a940f0 100644 --- a/notebook/static/base/js/namespace.js +++ b/notebook/static/base/js/namespace.js @@ -73,7 +73,7 @@ define(function(){ // tree jglobal('SessionList','tree/js/sessionlist'); - Jupyter.version = "5.0.0.dev"; + Jupyter.version = "5.1.0.dev"; Jupyter._target = '_blank'; return Jupyter; }); diff --git a/notebook/static/base/js/page.js b/notebook/static/base/js/page.js index 8a013341c..666230011 100644 --- a/notebook/static/base/js/page.js +++ b/notebook/static/base/js/page.js @@ -7,7 +7,17 @@ define([ ], function($, events){ "use strict"; - var Page = function () { + var Page = function (header_div_selector, site_div_selector) { + /** + * Constructor + * + * Parameters + * header_div_selector: string + * site_div_selector: string + */ + this.header_div_element = $(header_div_selector); + this.site_div_element = $(site_div_selector); + this.bind_events(); }; @@ -38,18 +48,16 @@ define([ /** * The header and site divs start out hidden to prevent FLOUC. * Main scripts should call this method after styling everything. - * TODO: selector are hardcoded, pass as constructor argument */ - $('div#header').css('display','block'); + this.header_div_element.css('display','block'); }; Page.prototype.show_site = function () { /** * The header and site divs start out hidden to prevent FLOUC. * Main scripts should call this method after styling everything. - * TODO: selector are hardcoded, pass as constructor argument */ - $('div#site').css('display', 'block'); + this.site_div_element.css('display', 'block'); this._resize_site(); }; diff --git a/notebook/static/base/js/utils.js b/notebook/static/base/js/utils.js index 93df51748..c88a9fc9d 100644 --- a/notebook/static/base/js/utils.js +++ b/notebook/static/base/js/utils.js @@ -282,6 +282,8 @@ define([ var fg = []; var bg = []; var bold = false; + var underline = false; + var inverse = false; var match; var out = []; var numbers = []; @@ -330,6 +332,14 @@ define([ classes.push("ansi-bold"); } + if (underline) { + classes.push("ansi-underline"); + } + + if (inverse) { + classes.push("ansi-inverse"); + } + if (classes.length || styles.length) { out.push("
'; - text = text + 'The version of the notebook server is '; + var text = i18n.msg._('You are using Jupyter notebook.'); + text = text + '
'; + text = text + i18n.msg._('The version of the notebook server is: '); text = text + _.template('<%- version %>')({ version: sys_info.notebook_version }); if (sys_info.commit_hash) { text = text + _.template('-<%- hash %>')({ hash: sys_info.commit_hash }); } - text = text + _.template(' and is running on:
Python <%- pyver %>')({ + text = text + '
'; + text = text + i18n.msg._('The server is running on this version of Python:'); + text = text + _.template('
Python <%- pyver %>')({ pyver: sys_info.sys_version }); - var kinfo = $('').attr('id', '#about-kinfo').text('Waiting for kernel to be available...'); + var kinfo = $('').attr('id', '#about-kinfo').text(i18n.msg._('Waiting for kernel to be available...')); var body = $(''); - body.append($('').text('Server Information:')); + body.append($('').text(i18n.msg._('Server Information:'))); body.append($('').html(text)); - body.append($('').text('Current Kernel Information:')); + body.append($('').text(i18n.msg._('Current Kernel Information:'))); body.append(kinfo); } else { - var text = 'Could not access sys_info variable for version information.'; + var text = i18n.msg._('Could not access sys_info variable for version information.'); var body = $(''); - body.append($('').text('Cannot find sys_info!')); + body.append($('').text(i18n.msg._('Cannot find sys_info!'))); body.append($('').html(text)); } dialog.modal({ - title: 'About Jupyter Notebook', + title: i18n.msg._('About Jupyter Notebook'), body: body, buttons: { 'OK': {} } }); @@ -40,7 +44,7 @@ require([ kinfo.html($('').text(data.content.banner)); }); } catch (e) { - kinfo.html($('').text('unable to contact kernel')); + kinfo.html($('').text(i18n.msg._('unable to contact kernel'))); } }); }); diff --git a/notebook/static/notebook/js/actions.js b/notebook/static/notebook/js/actions.js index b6d120c95..f9fcfcbb1 100644 --- a/notebook/static/notebook/js/actions.js +++ b/notebook/static/notebook/js/actions.js @@ -15,7 +15,9 @@ // * For dialogs, use a verb that indicates what the dialog will accomplish, such as "confirm-restart-kernel". -define(function(require){ +define([ + 'base/js/i18n', + ], function(i18n){ "use strict"; var warn_bad_name = function(name){ @@ -64,13 +66,15 @@ define(function(require){ **/ var _actions = { 'toggle-rtl-layout': { - help: 'Open a dialog to edit the command mode keyboard shortcuts', + cmd: i18n.msg._('toggle rtl layout'), + help: i18n.msg._('Toggle the screen directionality between left-to-right and right-to-left'), handler: function () { (document.body.getAttribute('dir')=='rtl') ? document.body.setAttribute('dir','ltr') : document.body.setAttribute('dir','rtl'); } }, 'edit-command-mode-keyboard-shortcuts': { - help: 'Open a dialog to edit the command mode keyboard shortcuts', + cmd: i18n.msg._('edit command mode keyboard shortcuts'), + help: i18n.msg._('Open a dialog to edit the command mode keyboard shortcuts'), handler: function (env) { env.notebook.show_shortcuts_editor(); } @@ -90,7 +94,8 @@ define(function(require){ } }, 'restart-kernel': { - help: 'restart the kernel (no confirmation dialog)', + cmd: i18n.msg._('restart kernel'), + help: i18n.msg._('restart the kernel (no confirmation dialog)'), handler: function (env) { env.notebook.restart_kernel({confirm: false}); }, @@ -98,131 +103,155 @@ define(function(require){ 'confirm-restart-kernel':{ icon: 'fa-repeat', help_index : 'hb', - help: 'restart the kernel (with dialog)', + cmd: i18n.msg._('confirm restart kernel'), + help: i18n.msg._('restart the kernel (with dialog)'), handler : function (env) { env.notebook.restart_kernel(); } }, 'restart-kernel-and-run-all-cells': { - help: 'restart the kernel, then re-run the whole notebook (no confirmation dialog)', + cmd: i18n.msg._('restart kernel and run all cells'), + help: i18n.msg._('restart the kernel, then re-run the whole notebook (no confirmation dialog)'), handler: function (env) { env.notebook.restart_run_all({confirm: false}); } }, 'confirm-restart-kernel-and-run-all-cells': { - help: 'restart the kernel, then re-run the whole notebook (with dialog)', + cmd: i18n.msg._('confirm restart kernel and run all cells'), + help: i18n.msg._('restart the kernel, then re-run the whole notebook (with dialog)'), handler: function (env) { env.notebook.restart_run_all(); } }, 'restart-kernel-and-clear-output': { - help: 'restart the kernel and clear all output (no confirmation dialog)', + cmd: i18n.msg._('restart kernel and clear output'), + help: i18n.msg._('restart the kernel and clear all output (no confirmation dialog)'), handler: function (env) { env.notebook.restart_clear_output({confirm: false}); } }, 'confirm-restart-kernel-and-clear-output': { - help: 'restart the kernel and clear all output (with dialog)', + cmd: i18n.msg._('confirm restart kernel and clear output'), + help: i18n.msg._('restart the kernel and clear all output (with dialog)'), handler: function (env) { env.notebook.restart_clear_output(); } }, 'interrupt-kernel':{ icon: 'fa-stop', + cmd: i18n.msg._('interrupt the kernel'), + help: i18n.msg._('interrupt the kernel'), help_index : 'ha', handler : function (env) { env.notebook.kernel.interrupt(); } }, 'run-cell-and-select-next': { + cmd: i18n.msg._('run cell and select next'), icon: 'fa-step-forward', - help : 'run cell, select below', + help: i18n.msg._('run cell, select below'), help_index : 'ba', handler : function (env) { env.notebook.execute_cell_and_select_below(); } }, 'run-cell':{ - help : 'run selected cells', + cmd: i18n.msg._('run selected cells'), + help : i18n.msg._('run selected cells'), help_index : 'bb', handler : function (env) { env.notebook.execute_selected_cells(); } }, 'run-cell-and-insert-below':{ - help : 'run cell, insert below', + cmd: i18n.msg._('run cell and insert below'), + help : i18n.msg._('run cell and insert below'), help_index : 'bc', handler : function (env) { env.notebook.execute_cell_and_insert_below(); } }, 'run-all-cells': { - help: 'run all cells', + cmd: i18n.msg._('run all cells'), + help: i18n.msg._('run all cells'), help_index: 'bd', handler: function (env) { env.notebook.execute_all_cells(); } }, 'run-all-cells-above':{ + cmd: i18n.msg._('run all cells above'), + help: i18n.msg._('run all cells above'), handler : function (env) { env.notebook.execute_cells_above(); } }, 'run-all-cells-below':{ + cmd: i18n.msg._('run all cells below'), + help: i18n.msg._('run all cells below'), handler : function (env) { env.notebook.execute_cells_below(); } }, 'enter-command-mode': { - help : 'command mode', + cmd: i18n.msg._('enter command mode'), + help : i18n.msg._('enter command mode'), help_index : 'aa', handler : function (env) { env.notebook.command_mode(); } }, 'insert-image': { - help : 'insert image', + cmd: i18n.msg._('insert image'), + help : i18n.msg._('insert image'), help_index : 'dz', handler : function (env) { env.notebook.insert_image(); } }, 'cut-cell-attachments': { - help : 'cut cell attachments', + cmd: i18n.msg._('cut cell attachments'), + help : i18n.msg._('cut cell attachments'), help_index : 'dza', handler: function (env) { env.notebook.cut_cell_attachments(); } }, 'copy-cell-attachments': { - help : 'copy cell attachments', + cmd: i18n.msg._('copy cell attachments'), + help : i18n.msg._('copy cell attachments'), help_index: 'dzb', handler: function (env) { env.notebook.copy_cell_attachments(); } }, 'paste-cell-attachments': { - help : 'paste cell attachments', + cmd: i18n.msg._('paste cell attachments'), + help : i18n.msg._('paste cell attachments'), help_index: 'dzc', handler: function (env) { env.notebook.paste_cell_attachments(); } }, 'split-cell-at-cursor': { - help : 'split cell', + cmd: i18n.msg._('split cell at cursor'), + help : i18n.msg._('split cell at cursor'), help_index : 'ea', handler : function (env) { env.notebook.split_cell(); } }, 'enter-edit-mode' : { + cmd: i18n.msg._('enter edit mode'), + help : i18n.msg._('enter edit mode'), help_index : 'aa', handler : function (env) { env.notebook.edit_mode(); } }, 'select-previous-cell' : { - help: 'select cell above', + cmd: i18n.msg._('select previous cell'), + help: i18n.msg._('select cell above'), help_index : 'da', handler : function (env) { var index = env.notebook.get_selected_index(); @@ -233,7 +262,8 @@ define(function(require){ } }, 'select-next-cell' : { - help: 'select cell below', + cmd: i18n.msg._('select next cell'), + help: i18n.msg._('select cell below'), help_index : 'db', handler : function (env) { var index = env.notebook.get_selected_index(); @@ -244,29 +274,32 @@ define(function(require){ } }, 'extend-selection-above' : { - help: 'extend selected cells above', + cmd: i18n.msg._('extend selection above'), + help: i18n.msg._('extend selected cells above'), help_index : 'dc', handler : function (env) { env.notebook.extend_selection_by(-1); - // scroll into view, - // do not call notebook.focus_cell(), or + // scroll into view, + // do not call notebook.focus_cell(), or // all the selection get thrown away env.notebook.get_selected_cell().element.focus(); } }, 'extend-selection-below' : { - help: 'extend selected cells below', + cmd: i18n.msg._('extend selection below'), + help: i18n.msg._('extend selected cells below'), help_index : 'dd', handler : function (env) { env.notebook.extend_selection_by(1); - // scroll into view, - // do not call notebook.focus_cell(), or + // scroll into view, + // do not call notebook.focus_cell(), or // all the selection get thrown away env.notebook.get_selected_cell().element.focus(); } }, 'cut-cell' : { - help: 'cut selected cells', + cmd: i18n.msg._('cut selected cells'), + help: i18n.msg._('cut selected cells'), icon: 'fa-cut', help_index : 'ee', handler : function (env) { @@ -276,22 +309,31 @@ define(function(require){ } }, 'copy-cell' : { - help: 'copy selected cells', + cmd: i18n.msg._('copy selected cells'), + help: i18n.msg._('copy selected cells'), icon: 'fa-copy', help_index : 'ef', handler : function (env) { env.notebook.copy_cell(); } }, + 'paste-cell-replace' : { + help: 'paste cells replace', + handler : function (env) { + env.notebook.paste_cell_replace(); + } + }, 'paste-cell-above' : { - help: 'paste cells above', + cmd: i18n.msg._('paste cells above'), + help: i18n.msg._('paste cells above'), help_index : 'eg', handler : function (env) { env.notebook.paste_cell_above(); } }, 'paste-cell-below' : { - help: 'paste cells below', + cmd: i18n.msg._('paste cells below'), + help: i18n.msg._('paste cells below'), icon: 'fa-paste', help_index : 'eh', handler : function (env) { @@ -299,7 +341,8 @@ define(function(require){ } }, 'insert-cell-above' : { - help: 'insert cell above', + cmd: i18n.msg._('insert cell above'), + help: i18n.msg._('insert cell above'), help_index : 'ec', handler : function (env) { env.notebook.insert_cell_above(); @@ -308,7 +351,8 @@ define(function(require){ } }, 'insert-cell-below' : { - help: 'insert cell below', + cmd: i18n.msg._('insert cell below'), + help: i18n.msg._('insert cell below'), icon : 'fa-plus', help_index : 'ed', handler : function (env) { @@ -318,90 +362,103 @@ define(function(require){ } }, 'change-cell-to-code' : { - help : 'to code', + cmd: i18n.msg._('change cell to code'), + help : i18n.msg._('change cell to code'), help_index : 'ca', handler : function (env) { env.notebook.cells_to_code(); } }, 'change-cell-to-markdown' : { - help : 'to markdown', + cmd: i18n.msg._('change cell to markdown'), + help : i18n.msg._('change cell to markdown'), help_index : 'cb', handler : function (env) { env.notebook.cells_to_markdown(); } }, 'change-cell-to-raw' : { - help : 'to raw', + cmd: i18n.msg._('change cell to raw'), + help : i18n.msg._('change cell to raw'), help_index : 'cc', handler : function (env) { env.notebook.cells_to_raw(); } }, 'change-cell-to-heading-1' : { - help : 'to heading 1', + cmd: i18n.msg._('change cell to heading 1'), + help : i18n.msg._('change cell to heading 1'), help_index : 'cd', handler : function (env) { env.notebook.to_heading(undefined, 1); } }, 'change-cell-to-heading-2' : { - help : 'to heading 2', + cmd: i18n.msg._('change cell to heading 2'), + help : i18n.msg._('change cell to heading 2'), help_index : 'ce', handler : function (env) { env.notebook.to_heading(undefined, 2); } }, 'change-cell-to-heading-3' : { - help : 'to heading 3', + cmd: i18n.msg._('change cell to heading 3'), + help : i18n.msg._('change cell to heading 3'), help_index : 'cf', handler : function (env) { env.notebook.to_heading(undefined, 3); } }, 'change-cell-to-heading-4' : { - help : 'to heading 4', + cmd: i18n.msg._('change cell to heading 4'), + help : i18n.msg._('change cell to heading 4'), help_index : 'cg', handler : function (env) { env.notebook.to_heading(undefined, 4); } }, 'change-cell-to-heading-5' : { - help : 'to heading 5', + cmd: i18n.msg._('change cell to heading 5'), + help : i18n.msg._('change cell to heading 5'), help_index : 'ch', handler : function (env) { env.notebook.to_heading(undefined, 5); } }, 'change-cell-to-heading-6' : { - help : 'to heading 6', + cmd: i18n.msg._('change cell to heading 6'), + help : i18n.msg._('change cell to heading 6'), help_index : 'ci', handler : function (env) { env.notebook.to_heading(undefined, 6); } }, 'toggle-cell-output-collapsed' : { - help : 'toggle output of selected cells', + cmd: i18n.msg._('toggle cell output'), + help : i18n.msg._('toggle output of selected cells'), help_index : 'gb', handler : function (env) { env.notebook.toggle_cells_outputs(); } }, 'toggle-cell-output-scrolled' : { - help : 'toggle output scrolling of selected cells', + cmd: i18n.msg._('toggle cell scrolling'), + help : i18n.msg._('toggle output scrolling of selected cells'), help_index : 'gc', handler : function (env) { env.notebook.toggle_cells_outputs_scroll(); } }, 'clear-cell-output' : { - help : 'clear output of selected cells', + cmd: i18n.msg._('clear cell output'), + help : i18n.msg._('clear output of selected cells'), handler : function (env) { env.notebook.clear_cells_outputs(); } }, 'move-cell-down' : { - help: 'move selected cells down', + cmd: i18n.msg._('move cells down'), + help: i18n.msg._('move selected cells down'), icon: 'fa-arrow-down', help_index : 'eb', handler : function (env) { @@ -409,7 +466,8 @@ define(function(require){ } }, 'move-cell-up' : { - help: 'move selected cells up', + cmd: i18n.msg._('move cells up'), + help: i18n.msg._('move selected cells up'), icon: 'fa-arrow-up', help_index : 'ea', handler : function (env) { @@ -417,54 +475,65 @@ define(function(require){ } }, 'toggle-cell-line-numbers' : { - help : 'toggle line numbers', + cmd: i18n.msg._('toggle line numbers'), + help : i18n.msg._('toggle line numbers'), help_index : 'ga', handler : function (env) { env.notebook.cell_toggle_line_numbers(); } }, 'show-keyboard-shortcuts' : { + cmd: i18n.msg._('show keyboard shortcuts'), + help : i18n.msg._('show keyboard shortcuts'), help_index : 'ge', handler : function (env) { env.quick_help.show_keyboard_shortcuts(); } }, 'delete-cell': { - help: 'delete selected cells', + cmd: i18n.msg._('delete cells'), + help: i18n.msg._('delete selected cells'), help_index : 'ej', handler : function (env) { env.notebook.delete_cell(); } }, 'undo-cell-deletion' : { + cmd: i18n.msg._('undo cell deletion'), + help: i18n.msg._('undo cell deletion'), help_index : 'ei', handler : function (env) { env.notebook.undelete_cell(); } }, // TODO reminder - // open an issue, merge with above merge with last cell of notebook if at top. + // open an issue, merge with above merge with last cell of notebook if at top. 'merge-cell-with-previous-cell' : { + cmd: i18n.msg._('merge cell with previous cell'), + help : i18n.msg._('merge cell above'), handler : function (env) { env.notebook.merge_cell_above(); } }, 'merge-cell-with-next-cell' : { - help : 'merge cell below', + cmd: i18n.msg._('merge cell with next cell'), + help : i18n.msg._('merge cell below'), help_index : 'ek', handler : function (env) { env.notebook.merge_cell_below(); } }, 'merge-selected-cells' : { - help : 'merge selected cells', + cmd: i18n.msg._('merge selected cells'), + help : i18n.msg._('merge selected cells'), help_index: 'el', handler: function(env) { env.notebook.merge_selected_cells(); } }, 'merge-cells' : { - help : 'merge selected cells, or current cell with cell below if only one cell selected', + cmd: i18n.msg._('merge cells'), + help : i18n.msg._('merge selected cells, or current cell with cell below if only one cell is selected'), help_index: 'el', handler: function(env) { var l = env.notebook.get_selected_cells_indices().length; @@ -477,14 +546,16 @@ define(function(require){ }, 'show-command-palette': { help_index : 'aa', - help: 'open the command palette', + cmd: i18n.msg._('show command pallette'), + help: i18n.msg._('open the command palette'), icon: 'fa-keyboard-o', handler : function(env){ env.notebook.show_command_palette(); } }, 'toggle-all-line-numbers': { - help : 'toggles line numbers in all cells, and persist the setting', + cmd: i18n.msg._('toggle all line numbers'), + help : i18n.msg._('toggles line numbers in all cells, and persist the setting'), icon: 'fa-list-ol', handler: function(env) { var value = !env.notebook.line_numbers; @@ -495,7 +566,8 @@ define(function(require){ } }, 'show-all-line-numbers': { - help : 'show line numbers in all cells, and persist the setting', + cmd: i18n.msg._('show all line numbers'), + help : i18n.msg._('show line numbers in all cells, and persist the setting'), handler: function(env) { env.notebook.get_cells().map(function(c) { c.code_mirror.setOption('lineNumbers', true); @@ -504,7 +576,8 @@ define(function(require){ } }, 'hide-all-line-numbers': { - help : 'hide line numbers in all cells, and persist the setting', + cmd: i18n.msg._('hide all line numbers'), + help : i18n.msg._('hide line numbers in all cells, and persist the setting'), handler: function(env) { env.notebook.get_cells().map(function(c) { c.code_mirror.setOption('lineNumbers', false); @@ -513,7 +586,8 @@ define(function(require){ } }, 'toggle-header':{ - help: 'hide/show the header', + cmd: i18n.msg._('toggle header'), + help: i18n.msg._('switch between showing and hiding the header'), handler : function(env) { var value = !env.notebook.header; if (value === true) { @@ -528,7 +602,8 @@ define(function(require){ } }, 'show-header':{ - help: 'show the header', + cmd: i18n.msg._('show the header'), + help: i18n.msg._('show the header'), handler : function(env) { $('#header-container').show(); $('.header-bar').show(); @@ -537,7 +612,8 @@ define(function(require){ } }, 'hide-header':{ - help: 'hide the header', + cmd: i18n.msg._('hide the header'), + help: i18n.msg._('hide the header'), handler : function(env) { $('#header-container').hide(); $('.header-bar').hide(); @@ -545,8 +621,30 @@ define(function(require){ env.notebook.header = false; } }, + 'toggle-menubar':{ + help: 'hide/show the menu bar', + handler : function(env) { + $('#menubar-container').toggle(); + events.trigger('resize-header.Page'); + } + }, + 'show-menubar':{ + help: 'show the menu bar', + handler : function(env) { + $('#menubar-container').show(); + events.trigger('resize-header.Page'); + } + }, + 'hide-menubar':{ + help: 'hide the menu bar', + handler : function(env) { + $('#menubar-container').hide(); + events.trigger('resize-header.Page'); + } + }, 'toggle-toolbar':{ - help: 'hide/show the toolbar', + cmd: i18n.msg._('toggle toolbar'), + help: i18n.msg._('switch between showing and hiding the toolbar'), handler : function(env) { var value = !env.notebook.toolbar; if (value === true) { @@ -559,7 +657,8 @@ define(function(require){ } }, 'show-toolbar':{ - help: 'show the toolbar', + cmd: i18n.msg._('show the toolbar'), + help: i18n.msg._('show the toolbar'), handler : function(env) { $('div#maintoolbar').show(); events.trigger('resize-header.Page'); @@ -567,7 +666,8 @@ define(function(require){ } }, 'hide-toolbar':{ - help: 'hide the toolbar', + cmd: i18n.msg._('hide the toolbar'), + help: i18n.msg._('hide the toolbar'), handler : function(env) { $('div#maintoolbar').hide(); events.trigger('resize-header.Page'); @@ -575,7 +675,8 @@ define(function(require){ } }, 'close-pager': { - help : 'close the pager', + cmd: i18n.msg._('close the pager'), + help : i18n.msg._('close the pager'), handler : function(env) { // Collapse the page if it is open if (env.pager && env.pager.expanded) { @@ -600,11 +701,14 @@ define(function(require){ **/ var custom_ignore = { 'ignore':{ + cmd: i18n.msg._('ignore'), handler : function () { return true; } }, 'move-cursor-up':{ + cmd: i18n.msg._('move cursor up'), + help: i18n.msg._("move cursor up"), handler : function (env, event) { var index = env.notebook.get_selected_index(); var cell = env.notebook.get_cell(index); @@ -624,6 +728,8 @@ define(function(require){ } }, 'move-cursor-down':{ + cmd: i18n.msg._('move cursor down'), + help: i18n.msg._("move cursor down"), handler : function (env, event) { var index = env.notebook.get_selected_index(); var cell = env.notebook.get_cell(index); @@ -641,6 +747,8 @@ define(function(require){ } }, 'scroll-notebook-down': { + cmd: i18n.msg._('scroll notebook down'), + help: i18n.msg._("scroll notebook down"), handler: function(env, event) { if(event){ event.preventDefault(); @@ -649,6 +757,8 @@ define(function(require){ }, }, 'scroll-notebook-up': { + cmd: i18n.msg._('scroll notebook up'), + help: i18n.msg._("scroll notebook up"), handler: function(env, event) { if(event){ event.preventDefault(); @@ -657,7 +767,8 @@ define(function(require){ }, }, 'scroll-cell-center': { - help: "Scroll the current cell to the center", + cmd: i18n.msg._('scroll cell center'), + help: i18n.msg._("Scroll the current cell to the center"), handler: function (env, event) { if(event){ event.preventDefault(); @@ -667,7 +778,8 @@ define(function(require){ } }, 'scroll-cell-top': { - help: "Scroll the current cell to the top", + cmd: i18n.msg._('scroll cell top'), + help: i18n.msg._("Scroll the current cell to the top"), handler: function (env, event) { if(event){ event.preventDefault(); @@ -677,44 +789,51 @@ define(function(require){ } }, 'duplicate-notebook':{ - help: "Create an open a copy of current notebook", + cmd: i18n.msg._('duplicate notebook'), + help: i18n.msg._("Create and open a copy of the current notebook"), handler : function (env, event) { env.notebook.copy_notebook(); } }, 'trust-notebook':{ - help: "Trust the current notebook", + cmd: i18n.msg._('trust notebook'), + help: i18n.msg._("Trust the current notebook"), handler : function (env, event) { env.notebook.trust_notebook(); } }, 'rename-notebook':{ - help: "Rename current notebook", + cmd: i18n.msg._('rename notebook'), + help: i18n.msg._("Rename the current notebook"), handler : function (env, event) { env.notebook.save_widget.rename_notebook({notebook: env.notebook}); } }, 'toggle-all-cells-output-collapsed':{ - help: "Toggle the hiddens state of all output areas", + cmd: i18n.msg._('toggle all cells output collapsed'), + help: i18n.msg._("Toggle the hidden state of all output areas"), handler : function (env, event) { env.notebook.toggle_all_output(); } }, 'toggle-all-cells-output-scrolled':{ - help: "Toggle the scrolling state of all output areas", + cmd: i18n.msg._('toggle all cells output scrolled'), + help: i18n.msg._("Toggle the scrolling state of all output areas"), handler : function (env, event) { env.notebook.toggle_all_output_scroll(); } }, 'clear-all-cells-output':{ - help: "Clear the content of all the outputs", + cmd: i18n.msg._('clear all cells output'), + help: i18n.msg._("Clear the content of all the outputs"), handler : function (env, event) { env.notebook.clear_all_output(); } }, 'save-notebook':{ - help: "Save and Checkpoint", + cmd: i18n.msg._('save notebook'), + help: i18n.msg._("Save and Checkpoint"), help_index : 'fb', icon: 'fa-save', handler : function (env, event) { @@ -731,6 +850,7 @@ define(function(require){ // and uniformize/fill in missing pieces in of an action. var _prepare_handler = function(registry, subkey, source){ registry['jupyter-notebook:'+subkey] = {}; + registry['jupyter-notebook:'+subkey].cmd = source[subkey].cmd; registry['jupyter-notebook:'+subkey].help = source[subkey].help||subkey.replace(/-/g,' '); registry['jupyter-notebook:'+subkey].help_index = source[subkey].help_index; registry['jupyter-notebook:'+subkey].icon = source[subkey].icon; diff --git a/notebook/static/notebook/js/cell.js b/notebook/static/notebook/js/cell.js index 89038c86b..41bcd7444 100644 --- a/notebook/static/notebook/js/cell.js +++ b/notebook/static/notebook/js/cell.js @@ -12,12 +12,13 @@ define([ 'jquery', 'base/js/utils', + 'base/js/i18n', 'codemirror/lib/codemirror', 'codemirror/addon/edit/matchbrackets', 'codemirror/addon/edit/closebrackets', 'codemirror/addon/comment/comment', 'services/config', -], function($, utils, CodeMirror, cm_match, cm_closeb, cm_comment, configmod) { +], function($, utils, i18n, CodeMirror, cm_match, cm_closeb, cm_comment, configmod) { "use strict"; var overlayHack = CodeMirror.scrollbarModel.native.prototype.overlayHack; @@ -75,7 +76,7 @@ define([ // backward compat. Object.defineProperty(this, 'cm_config', { get: function() { - console.warn("Warning: accessing Cell.cm_config directly is deprecated."); + console.warn(i18n.msg._("Warning: accessing Cell.cm_config directly is deprecated.")); return that._options.cm_config; }, }); @@ -133,8 +134,8 @@ define([ "Cmd-Left": "goLineLeft", "Tab": "indentMore", "Shift-Tab" : "indentLess", - "Cmd-Alt-[" : "indentAuto", - "Ctrl-Alt-[" : "indentAuto", + // "Cmd-Alt-[" : "indentAuto", + // "Ctrl-Alt-[" : "indentAuto", "Cmd-/" : "toggleComment", "Ctrl-/" : "toggleComment", } @@ -759,7 +760,7 @@ define([ } else { data.metadata = this.metadata; } - this.element.find('.inner_cell').find("a").text("Unrecognized cell type: " + data.cell_type); + this.element.find('.inner_cell').find("a").text(i18n.msg.sprintf(i18n.msg._("Unrecognized cell type: %s"), data.cell_type)); }; UnrecognizedCell.prototype.create_element = function () { @@ -773,7 +774,7 @@ define([ inner_cell.append( $("") .attr("href", "#") - .text("Unrecognized cell type") + .text(i18n.msg._("Unrecognized cell type")) ); cell.append(inner_cell); this.element = cell; diff --git a/notebook/static/notebook/js/celltoolbar.js b/notebook/static/notebook/js/celltoolbar.js index e9276b506..3a954706b 100644 --- a/notebook/static/notebook/js/celltoolbar.js +++ b/notebook/static/notebook/js/celltoolbar.js @@ -4,8 +4,9 @@ define([ 'jquery', 'base/js/namespace', - 'base/js/events' -], function($, IPython, events) { + 'base/js/events', + 'base/js/i18n' +], function($, IPython, events, i18n) { "use strict"; var CellToolbar = function (options) { @@ -292,7 +293,7 @@ define([ callback(local_div, this.cell, this); this.ui_controls_list.push(key); } catch (e) { - console.log("Error in cell toolbar callback " + key, e); + console.log(i18n.msg.sprintf(i18n.msg._("Error in cell toolbar callback %s"), key), e); continue; } // only append if callback succeeded. diff --git a/notebook/static/notebook/js/celltoolbarpresets/attachments.js b/notebook/static/notebook/js/celltoolbarpresets/attachments.js index 068d84d69..6419a94c6 100644 --- a/notebook/static/notebook/js/celltoolbarpresets/attachments.js +++ b/notebook/static/notebook/js/celltoolbarpresets/attachments.js @@ -4,7 +4,8 @@ define([ 'notebook/js/celltoolbar', 'base/js/dialog', -], function(celltoolbar, dialog) { + 'base/js/i18n' +], function(celltoolbar, dialog, i18n) { "use strict"; var CellToolbar = celltoolbar.CellToolbar; @@ -18,7 +19,7 @@ define([ cell.unrender(); cell.render(); }, - name: 'cell', + name: 'Cell', notebook: cell.notebook, keyboard_manager: cell.keyboard_manager }); @@ -28,7 +29,7 @@ define([ var button_container = $(div); var button = $('') .addClass('btn btn-default btn-xs') - .text('Edit Attachments') + .text(i18n.msg._('Edit Attachments')) .click( function() { edit_attachments_dialog(cell); return false; @@ -42,7 +43,7 @@ define([ var attachments_preset = []; attachments_preset.push('attachments.edit'); - CellToolbar.register_preset('Attachments', attachments_preset, notebook); + CellToolbar.register_preset(i18n.msg._('Attachments'), attachments_preset, notebook); }; return {'register' : register}; diff --git a/notebook/static/notebook/js/celltoolbarpresets/default.js b/notebook/static/notebook/js/celltoolbarpresets/default.js index 41e8b4d1f..b21bbf839 100644 --- a/notebook/static/notebook/js/celltoolbarpresets/default.js +++ b/notebook/static/notebook/js/celltoolbarpresets/default.js @@ -4,7 +4,8 @@ define([ 'notebook/js/celltoolbar', 'base/js/dialog', -], function(celltoolbar, dialog) { + 'base/js/i18n' +], function(celltoolbar, dialog, i18n) { "use strict"; var CellToolbar = celltoolbar.CellToolbar; @@ -15,7 +16,7 @@ define([ callback: function (md) { cell.metadata = md; }, - name: 'Cell', + name: i18n.msg._('Cell'), notebook: this.notebook, keyboard_manager: this.keyboard_manager }); @@ -25,7 +26,7 @@ define([ var button_container = $(div); var button = $('') .addClass("btn btn-default btn-xs") - .text("Edit Metadata") + .text(i18n.msg._("Edit Metadata")) .click( function () { raw_edit(cell); return false; @@ -43,7 +44,7 @@ define([ var example_preset = []; example_preset.push('default.rawedit'); - CellToolbar.register_preset('Edit Metadata', example_preset, notebook); + CellToolbar.register_preset(i18n.msg._('Edit Metadata'), example_preset, notebook); }; return {'register': register}; }); diff --git a/notebook/static/notebook/js/celltoolbarpresets/example.js b/notebook/static/notebook/js/celltoolbarpresets/example.js index d49b3134e..c2ac59ea2 100644 --- a/notebook/static/notebook/js/celltoolbarpresets/example.js +++ b/notebook/static/notebook/js/celltoolbarpresets/example.js @@ -1,13 +1,6 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. -// Example Use for the CellToolbar library -// add the following to your custom.js to load -// Celltoolbar UI for slideshow - -// ``` -// $.getScript('/static/js/celltoolbarpresets/example.js'); -// ``` define([ 'notebook/js/celltoolbar', ], function(celltoolbar) { diff --git a/notebook/static/notebook/js/celltoolbarpresets/rawcell.js b/notebook/static/notebook/js/celltoolbarpresets/rawcell.js index 3cfb858d3..7cfc43b69 100644 --- a/notebook/static/notebook/js/celltoolbarpresets/rawcell.js +++ b/notebook/static/notebook/js/celltoolbarpresets/rawcell.js @@ -5,20 +5,21 @@ define([ 'notebook/js/celltoolbar', 'base/js/dialog', 'base/js/keyboard', -], function(celltoolbar, dialog, keyboard) { + 'base/js/i18n' +], function(celltoolbar, dialog, keyboard, i18n) { "use strict"; var CellToolbar = celltoolbar.CellToolbar; var raw_cell_preset = []; var select_type = CellToolbar.utils.select_ui_generator([ - ["None", "-"], + [i18n.msg._("None"), "-"], ["LaTeX", "text/latex"], ["reST", "text/restructuredtext"], ["HTML", "text/html"], ["Markdown", "text/markdown"], ["Python", "text/x-python"], - ["Custom", "dialog"], + [i18n.msg._("Custom"), "dialog"], ], // setter @@ -28,7 +29,7 @@ define([ } else if (value === 'dialog'){ var dialog = $('').append( $("") - .text("Set the MIME type of the raw cell:") + .text(i18n.msg._("Set the MIME type of the raw cell:")) ).append( $("
") ).append( @@ -36,7 +37,7 @@ define([ .val(cell.metadata.raw_mimetype || "-") ); dialog.modal({ - title: "Raw Cell MIME Type", + title: i18n.msg._("Raw Cell MIME Type"), body: dialog, buttons : { "Cancel": {}, @@ -70,14 +71,14 @@ define([ return cell.metadata.raw_mimetype || ""; }, // name - "Raw NBConvert Format" + i18n.msg._("Raw NBConvert Format") ); var register = function (notebook) { CellToolbar.register_callback('raw_cell.select', select_type, ['raw']); raw_cell_preset.push('raw_cell.select'); - CellToolbar.register_preset('Raw Cell Format', raw_cell_preset, notebook); + CellToolbar.register_preset(i18n.msg._('Raw Cell Format'), raw_cell_preset, notebook); }; return {'register': register}; diff --git a/notebook/static/notebook/js/celltoolbarpresets/slideshow.js b/notebook/static/notebook/js/celltoolbarpresets/slideshow.js index 9ae7641c7..505af7b44 100644 --- a/notebook/static/notebook/js/celltoolbarpresets/slideshow.js +++ b/notebook/static/notebook/js/celltoolbarpresets/slideshow.js @@ -3,20 +3,20 @@ define([ 'notebook/js/celltoolbar', -], function(celltoolbar) { + 'base/js/i18n' +], function(celltoolbar, i18n) { "use strict"; - var CellToolbar = celltoolbar.CellToolbar; var slideshow_preset = []; var select_type = CellToolbar.utils.select_ui_generator([ ["-" ,"-" ], - ["Slide" ,"slide" ], - ["Sub-Slide" ,"subslide" ], - ["Fragment" ,"fragment" ], - ["Skip" ,"skip" ], - ["Notes" ,"notes" ], + [i18n.msg._("Slide") ,"slide" ], + [i18n.msg._("Sub-Slide") ,"subslide" ], + [i18n.msg._("Fragment") ,"fragment" ], + [i18n.msg._("Skip") ,"skip" ], + [i18n.msg._("Notes") ,"notes" ], ], // setter function(cell, value){ @@ -32,13 +32,13 @@ define([ // return the value return (ns === undefined)? undefined: ns.slide_type; }, - "Slide Type"); + i18n.msg._("Slide Type")); var register = function (notebook) { CellToolbar.register_callback('slideshow.select',select_type); slideshow_preset.push('slideshow.select'); - CellToolbar.register_preset('Slideshow',slideshow_preset, notebook); + CellToolbar.register_preset(i18n.msg._('Slideshow'),slideshow_preset, notebook); }; return {'register': register}; }); diff --git a/notebook/static/notebook/js/celltoolbarpresets/tags.js b/notebook/static/notebook/js/celltoolbarpresets/tags.js index 6289e7082..4ec2761ec 100644 --- a/notebook/static/notebook/js/celltoolbarpresets/tags.js +++ b/notebook/static/notebook/js/celltoolbarpresets/tags.js @@ -4,7 +4,8 @@ define([ 'notebook/js/celltoolbar', 'base/js/dialog', -], function(celltoolbar, dialog) { + 'base/js/i18n' +], function(celltoolbar, dialog, i18n) { "use strict"; var CellToolbar = celltoolbar.CellToolbar; @@ -13,7 +14,7 @@ define([ return a.filter(function(n) { return b.indexOf(n) === -1; }); - } + }; var write_tag = function(cell, name, add) { if (add) { @@ -43,12 +44,12 @@ define([ } cell.events.trigger('set_dirty.Notebook', {value: true}); return true; - } + }; var preprocess_input = function(input) { - // Split on whitespace: - return input.split(/\s/); - } + // Split on whitespace + commas: + return input.split(/[,\s]+/) + }; var add_tag = function(cell, tag_container, on_remove) { return function(name) { @@ -111,14 +112,12 @@ define([ .addClass('cell-tag') .text(name); - var remove_button = $('') + var remove_button = $('') .addClass('remove-tag-btn') - .text('X') - .click( function(ev) { - if (ev.button === 0) { - on_remove(name); - return false; - } + .addClass('fa fa-times') + .click(function () { + on_remove(name); + return false; }); tag_UI.append(remove_button); return tag_UI; @@ -131,7 +130,7 @@ define([ var text = $('').attr('type', 'text'); var button = $('') .addClass('btn btn-default btn-xs') - .text('Add tag') + .text(i18n.msg._('Add tag')) .click(function() { var tags = preprocess_input(text[0].value); for (var i=0; i < tags.length; ++i) { @@ -148,7 +147,7 @@ define([ } }); var input_container = $('') - .addClass('tags-input') + .addClass('tags-input'); add_dialog_button(input_container, cell, on_add, on_remove); button_container.append(input_container .append(text) @@ -161,8 +160,8 @@ define([ var tag_list = cell.metadata.tags || []; var message = - "Edit the list of tags below. All whitespace " + - "is treated as tag separators."; + i18n.msg._("Edit the list of tags below. All whitespace " + + "is treated as tag separators."); var textarea = $('') .attr('rows', '13') @@ -170,7 +169,7 @@ define([ .attr('name', 'tags') .text(tag_list.join('\n')); - var dialogform = $('').attr('title', 'Edit the tags') + var dialogform = $('').attr('title', i18n.msg._('Edit the tags')) .append( $('').append( $('').append( @@ -184,7 +183,7 @@ define([ ); var modal_obj = dialog.modal({ - title: "Edit Tags", + title: i18n.msg._("Edit Tags"), body: dialogform, default_button: "Cancel", buttons: { diff --git a/notebook/static/notebook/js/clipboard.js b/notebook/static/notebook/js/clipboard.js index e12edfa74..b5248dd23 100644 --- a/notebook/static/notebook/js/clipboard.js +++ b/notebook/static/notebook/js/clipboard.js @@ -5,8 +5,9 @@ define([ 'jquery', 'base/js/namespace', 'base/js/utils', + 'base/js/i18n', 'base/js/dialog' -], function($, Jupyter, utils, dialog) { +], function($, Jupyter, utils, i18n, dialog) { var jcbprefix = '
'; var jcbsuffix = ''; @@ -49,7 +50,7 @@ function paste(event) { if (Jupyter.notebook.mode !== 'command') { return; } - console.log('Clipboard types: ' + event.clipboardData.types); + console.log(i18n.msg.sprintf(i18n.msg._('Clipboard types: %s'),event.clipboardData.types)); cells = load_json(event.clipboardData); // console.log(cells); // Does this JSON look like cells? @@ -92,7 +93,7 @@ function setup_paste_dialog() { // second Ctrl-V var action = { icon: 'fa-clipboard', // a font-awesome class used on buttons, etc - help : 'Dialog for paste from system clipboard', + help : i18n.msg._('Dialog for paste from system clipboard'), help_index : 'zz', handler : function () { var entry_box = $(''); @@ -105,20 +106,23 @@ function setup_paste_dialog() { document.removeEventListener('paste', paste_close_dlg); } document.addEventListener('paste', paste_close_dlg); - var cmdtrl = 'Ctrl'; + var cmdtrl = i18n.msg._('Ctrl-V'); if (utils.platform === 'MacOS') { - cmdtrl = 'Cmd'; + cmdtrl = i18n.msg._('Cmd-V'); } - var dialog_body = $("").append("
Press "+cmdtrl+"-V again to paste") + var dialog_body = $("
").append("").append(i18n.msg.sprintf(i18n.msg._("Press %s again to paste"),cmdtrl))
.append("
")
- .append("
Why is this needed? We can't get paste events in this browser without a text box. "+ - "There's an invisible text box focused in this dialog.") + .append("
") + .append(i18n.msg._("Why is this needed? ")) + .append("") + .append(i18n.msg._("We can't get paste events in this browser without a text box. ")) + .append(i18n.msg._("There's an invisible text box focused in this dialog.")) .append($("
").append(entry_box)); var paste_dlg = dialog.modal({ notebook: Jupyter.notebook, keyboard_manager: Jupyter.keyboard_manager, - title : cmdtrl+"-V to paste", + title : i18n.msg.sprintf(i18n.msg._("%s to paste"),cmdtrl), body : dialog_body, open: function() { entry_box.focus(); diff --git a/notebook/static/notebook/js/codecell.js b/notebook/static/notebook/js/codecell.js index 54781cf6f..5451f676c 100644 --- a/notebook/static/notebook/js/codecell.js +++ b/notebook/static/notebook/js/codecell.js @@ -13,6 +13,7 @@ define([ 'jquery', 'base/js/namespace', 'base/js/utils', + 'base/js/i18n', 'base/js/keyboard', 'services/config', 'notebook/js/cell', @@ -26,6 +27,7 @@ define([ $, IPython, utils, + i18n, keyboard, configmod, cell, @@ -305,15 +307,24 @@ define([ */ CodeCell.prototype.execute = function (stop_on_error) { if (!this.kernel) { - console.log("Can't execute cell since kernel is not set."); + console.log(i18n.msg._("Can't execute cell since kernel is not set.")); return; } if (stop_on_error === undefined) { - stop_on_error = true; + if (this.metadata !== undefined && + this.metadata.tags !== undefined) { + if (this.metadata.tags.indexOf('raises-exception') !== -1) { + stop_on_error = false; + } else { + stop_on_error = true; + } + } else { + stop_on_error = true; + } } - this.output_area.clear_output(false, true); + this.clear_output(false, true); var old_msg_id = this.last_msg_id; if (old_msg_id) { this.kernel.clear_callbacks_for_msg(old_msg_id); @@ -335,11 +346,13 @@ define([ this.render(); this.events.trigger('execute.CodeCell', {cell: this}); var that = this; - this.events.on('finished_iopub.Kernel', function (evt, data) { + function handleFinished(evt, data) { if (that.kernel.id === data.kernel.id && that.last_msg_id === data.msg_id) { - that.events.trigger('finished_execute.CodeCell', {cell: that}); - } - }); + that.events.trigger('finished_execute.CodeCell', {cell: that}); + that.events.off('finished_iopub.Kernel', handleFinished); + } + } + this.events.on('finished_iopub.Kernel', handleFinished); }; /** @@ -465,7 +478,7 @@ define([ } else { ns = encodeURIComponent(prompt_value); } - return 'In [' + ns + ']:'; + return ''+i18n.msg._('In')+' [' + ns + ']:'; }; CodeCell.input_prompt_continuation = function (prompt_value, lines_number) { @@ -507,8 +520,9 @@ define([ }; - CodeCell.prototype.clear_output = function (wait) { - this.output_area.clear_output(wait); + CodeCell.prototype.clear_output = function (wait, ignore_queue) { + this.events.trigger('clear_output.CodeCell', {cell: this}); + this.output_area.clear_output(wait, ignore_queue); this.set_input_prompt(); }; diff --git a/notebook/static/notebook/js/codemirror-ipythongfm.js b/notebook/static/notebook/js/codemirror-ipythongfm.js index 9a6bbc36b..fb2fb60df 100644 --- a/notebook/static/notebook/js/codemirror-ipythongfm.js +++ b/notebook/static/notebook/js/codemirror-ipythongfm.js @@ -33,14 +33,15 @@ return CodeMirror.multiplexingMode( gfm_mode, + // By defining the $$ delimiter before the $ delimiter we don't run + // into the problem that $$ is interpreted as two consecutive $. { - open: "$", close: "$", + open: "$$", close: "$$", mode: tex_mode, delimStyle: "delimit" }, { - // not sure this works as $$ is interpreted at (opening $, closing $, as defined just above) - open: "$$", close: "$$", + open: "$", close: "$", mode: tex_mode, delimStyle: "delimit" }, diff --git a/notebook/static/notebook/js/commandpalette.js b/notebook/static/notebook/js/commandpalette.js index 73a79b2d9..9ef218318 100644 --- a/notebook/static/notebook/js/commandpalette.js +++ b/notebook/static/notebook/js/commandpalette.js @@ -1,13 +1,14 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. -define(function(require){ +define([ + 'jquery', + 'typeahead', + 'base/js/i18n', + 'notebook/js/quickhelp' +],function($, typeahead, i18n, QH){ "use strict"; - var $ = require('jquery'); - require('typeahead'); - var QH = require("notebook/js/quickhelp"); - /** * Humanize the action name to be consumed by user. * internaly the actions anem are of the form @@ -150,13 +151,20 @@ define(function(require){ short = QH.humanize_sequence(short); } + var display_text; + if (action.cmd) { + display_text = i18n.msg._(action.cmd); + } else { + display_text = humanize_action_id(action_id); + } + src[group].data.push({ - display: humanize_action_id(action_id), + display: display_text, shortcut: short, mode_shortcut: get_mode_for_action_id(action_id, notebook), group: group, icon: action.icon, - help: action.help, + help: i18n.msg._(action.help), key: action_id, }); } @@ -164,7 +172,11 @@ define(function(require){ // now src is the right structure for typeahead input.typeahead({ - emptyTemplate: "No results found for{{query}}",
+ emptyTemplate: function(query) {
+ return $('').text("No results found for ").append(
+ $('
').text(query)
+ );
+ },
maxItem: 1e3,
minLength: 0,
hint: true,
diff --git a/notebook/static/notebook/js/completer.js b/notebook/static/notebook/js/completer.js
index 8eb92ca2e..21a6a3b32 100644
--- a/notebook/static/notebook/js/completer.js
+++ b/notebook/static/notebook/js/completer.js
@@ -153,6 +153,8 @@ define([
// one kernel completion came back, finish_completing will be called with the results
// we fork here and directly call finish completing if kernel is busy
var cursor_pos = this.editor.indexFromPos(cur);
+ var text = this.editor.getValue();
+ cursor_pos = utils.js_idx_to_char_idx(cursor_pos, text);
if (this.skip_kernel_completion) {
this.finish_completing({ content: {
matches: [],
@@ -160,7 +162,7 @@ define([
cursor_end: cursor_pos,
}});
} else {
- this.cell.kernel.complete(this.editor.getValue(), cursor_pos,
+ this.cell.kernel.complete(text, cursor_pos,
$.proxy(this.finish_completing, this)
);
}
@@ -175,6 +177,7 @@ define([
var start = content.cursor_start;
var end = content.cursor_end;
var matches = content.matches;
+ console.log(content);
var cur = this.editor.getCursor();
if (end === null) {
@@ -187,7 +190,13 @@ define([
} else if (start < 0) {
start = end + start;
}
+ } else {
+ // handle surrogate pairs
+ var text = this.editor.getValue();
+ end = utils.char_idx_to_js_idx(end, text);
+ start = utils.char_idx_to_js_idx(start, text);
}
+
var results = CodeMirror.contextHint(this.editor);
var filtered_results = [];
//remove results from context completion
diff --git a/notebook/static/notebook/js/kernelselector.js b/notebook/static/notebook/js/kernelselector.js
index 6273c36ae..58f71d323 100644
--- a/notebook/static/notebook/js/kernelselector.js
+++ b/notebook/static/notebook/js/kernelselector.js
@@ -5,8 +5,9 @@ define([
'jquery',
'base/js/namespace',
'base/js/dialog',
- 'base/js/utils'
-], function($, IPython, dialog, utils) {
+ 'base/js/utils',
+ 'base/js/i18n'
+], function($, IPython, dialog, utils, i18n) {
"use strict";
var KernelSelector = function(selector, notebook) {
@@ -265,15 +266,19 @@ define([
);
});
+ var no_kernel_msg = i18n.msg.sprintf(i18n.msg._("Could not find a kernel matching %s. Please select a kernel:"),
+ (data.selected.display_name || data.selected.name))
var body = $("