Merge pull request #2357 from Ashamandi/master

Bidi support
jupyter · Sep 15, 2017 · aa3c1a5 · aa3c1a5
2 parents 5a0ee98 + 28fcc7b
commit aa3c1a5
Show file tree

Hide file tree

Showing 21 changed files with 364 additions and 21 deletions.
diff --git a/notebook/static/auth/js/main.js b/notebook/static/auth/js/main.js
@@ -1,7 +1,10 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-define(['./loginmain', './logoutmain'], function (login_main, logout_main) {
+define(['./loginmain', './logoutmain', 'bidi/bidi'], function (login_main, logout_main, bidi) {
+	if(bidi.isMirroringEnabled()){
+		$("body").attr("dir","rtl");
+	}
     return {
         login_main: login_main,
         logout_main: logout_main

diff --git a/notebook/static/auth/less/login.less b/notebook/static/auth/less/login.less
@@ -3,4 +3,21 @@
   display: inline-block;
   // pull the lower margin back
   margin-bottom: -4px;
-}
+}
+
+[dir="rtl"] .center-nav {
+    form.pull-left {
+        .pull-right();
+    }
+    .navbar-text {
+        float: right;
+    }
+}
+
+[dir="rtl"] .navbar-inner {
+    text-align: right;
+}
+
+[dir="rtl"] div.text-left {
+    .text-right();
+}
diff --git a/notebook/static/base/less/page.less b/notebook/static/base/less/page.less
@@ -63,6 +63,15 @@ body > #header {
     padding-bottom: (@navbar-height - @logo_height) / 2;
 }
 
+[dir="rtl"] #ipython_notebook {
+    margin-right: 10px;
+    margin-left: 0;
+}
+
+[dir="rtl"] #ipython_notebook.pull-left {
+     .pull-right();
+}
+
 .flex-spacer {
     flex: 1;
 }
@@ -107,7 +116,11 @@ span#kernel_logo_widget {
 }
 
 span#login_widget {
-
+    float: right;
+}
+
+[dir="rtl"] span#login_widget {
+    float: left;
 }
 
 span#login_widget > .button,

diff --git a/notebook/static/bidi/bidi.js b/notebook/static/bidi/bidi.js
@@ -0,0 +1,56 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+define([
+    'bidi/numericshaping',
+], function (numericshaping){
+    "use strict";
+
+    var shaperType="";
+    var textDir="";
+
+    var _uiLang= function (){
+    	return navigator.language.toLowerCase();
+    };
+
+	var _loadLocale = function () {
+		if(_isMirroringEnabled()){
+			$("body").attr("dir","rtl");
+		}
+		requirejs(['components/moment/locale/'+_uiLang()], function (err){
+			console.warn("Error loading the required locale");
+			console.warn(err);
+	    });
+		shaperType= _uiLang()=='ar'? "national" : "defaultNumeral";
+    };
+
+    var _isMirroringEnabled= function() {
+    	return (new RegExp("^(ar|he)").test(_uiLang()));
+    };
+
+    /**
+     * NS :  for digit Shaping.
+     * BTD : for future work in case of Base Text Direction Addition.
+     */  
+    /*var _flags= {
+        NS: 1,
+    	BTD : 2
+    };*/
+
+    /**
+     * @param value : the string to apply the bidi-support on it.
+     * @param flag :indicates the type of bidi-support (Numeric-shaping ,Base-text-dir ).
+     */
+    var _applyBidi = function (value /*, flag*/) {
+    	value = numericshaping.shapeNumerals(value, shaperType);
+        return value;
+    };
+
+    var bidi = {
+    	applyBidi : _applyBidi,
+    	isMirroringEnabled : _isMirroringEnabled,
+    	loadLocale : _loadLocale,
+    };
+
+    return bidi;
+});
diff --git a/notebook/static/bidi/numericshaping.js b/notebook/static/bidi/numericshaping.js
@@ -0,0 +1,42 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+define([],
+    function(bidi) {
+    "use strict";
+
+    var regex = /([0-9])|([\u0660-\u0669])|([\u0608\u060B\u060D\u061B-\u064A\u066D-\u066F\u0671-\u06D5\u06E5-\u06E6\u06EE-\u06EF\u06FA-\u06FF\u0750-\u077F\u08A0-\u08E3\u200F\u202B\u202E\u2067\uFB50-\uFD3D\uFD40-\uFDCF\uFDF0-\uFDFC\uFDFE-\uFDFF\uFE70-\uFEFE]+)|([^0-9\u0660-\u0669\u0608\u060B\u060D\u061B-\u064A\u066D-\u066F\u0671-\u06D5\u06E5-\u06E6\u06EE-\u06EF\u06FA-\u06FF\u0750-\u077F\u08A0-\u08E3\u200F\u202B\u202E\u2067\uFB50-\uFD3D\uFD40-\uFDCF\uFDF0-\uFDFC\uFDFE-\uFDFF\uFE70-\uFEFE\u0600-\u0607\u0609-\u060A\u060C\u060E-\u061A\u064B-\u066C\u0670\u06D6-\u06E4\u06E7-\u06ED\u06F0-\u06F9\u08E4-\u08FF\uFD3E-\uFD3F\uFDD0-\uFDEF\uFDFD\uFEFF\u0000-\u0040\u005B-\u0060\u007B-\u007F\u0080-\u00A9\u00AB-\u00B4\u00B6-\u00B9\u00BB-\u00BF\u00D7\u00F7\u02B9-\u02BA\u02C2-\u02CF\u02D2-\u02DF\u02E5-\u02ED\u02EF-\u02FF\u2070\u2074-\u207E\u2080-\u208E\u2100-\u2101\u2103-\u2106\u2108-\u2109\u2114\u2116-\u2118\u211E-\u2123\u2125\u2127\u2129\u212E\u213A-\u213B\u2140-\u2144\u214A-\u214D\u2150-\u215F\u2189\uA720-\uA721\uA788\uFF01-\uFF20\uFF3B-\uFF40\uFF5B-\uFF65\uFFE0-\uFFE6\uFFE8-\uFFEE]+)/g;
+
+    var shape = function(text, shaperType) {
+        text = text.toString();
+        if (!text) { 
+            return text;
+        }
+        switch (shaperType) {
+            case "defaultNumeral":
+                return _shapeEuropean(text);
+            case "national":
+                return _shapeArabic(text);
+            default:
+                return text;
+        }
+    };
+
+    var _shapeEuropean = function(text) {
+        return text.replace(/[\u0660-\u0669]/g, function(c) {
+            return c.charCodeAt(0) - 1632;
+        });
+    };
+
+    var _shapeArabic = function(text) {
+        return text.replace(/[0-9]/g, function(c) {
+            return String.fromCharCode(parseInt(c) + 1632);
+        });
+    };
+
+    var numericshaping = {
+        shapeNumerals : shape
+    };
+
+    return numericshaping;       
+});
diff --git a/notebook/static/custom/custom.css b/notebook/static/custom/custom.css
@@ -4,4 +4,18 @@ Placeholder for custom user CSS
 mainly to be overridden in profile/static/custom/custom.css
 
 This will always be an empty file in IPython
-*/
+*/
+
+/*for the error , connecting & renaming window*/
+
+[dir="rtl"] .modal-footer {
+	text-align : left !important;
+}
+
+[dir="rtl"] .close {
+	float : left;
+}
+
+[dir="rtl"] .fa-step-forward::before {
+    content: "\f048";
+}
diff --git a/notebook/static/edit/js/main.js b/notebook/static/edit/js/main.js
@@ -13,6 +13,7 @@ require([
     'edit/js/menubar',
     'edit/js/savewidget',
     'edit/js/notificationarea',
+    'bidi/bidi',
 ], function(
     $,
     contents_service,
@@ -24,12 +25,14 @@ require([
     editmod,
     menubar,
     savewidget,
-    notificationarea
+    notificationarea,
+    bidi
     ){
     "use strict";
 
     try {
         requirejs(['custom/custom'], function() {});
+        bidi.loadLocale();
     } catch(err) {
         console.log("Error loading custom.js from edition service. Continuing and logging");
         console.warn(err);

diff --git a/notebook/static/edit/js/savewidget.js b/notebook/static/edit/js/savewidget.js
@@ -7,9 +7,10 @@ define([
     'base/js/dialog',
     'base/js/keyboard',
     'moment',
-], function($, utils, dialog, keyboard, moment) {
+    'bidi/bidi',
+], function($, utils, dialog, keyboard, moment, bidi) {
     "use strict";
-
+    
     var SaveWidget = function (selector, options) {
         this.editor = undefined;
         this.selector = selector;
@@ -113,6 +114,7 @@ define([
 
 
     SaveWidget.prototype.update_filename = function (filename) {
+    	filename = bidi.applyBidi(filename);
         this.element.find('span.filename').text(filename);
     };
 
@@ -151,7 +153,7 @@ define([
         if (!this._last_modified) {
             el.text('').attr('title', 'never saved');
             return;
-        }
+	 }
         var chkd = moment(this._last_modified);
         var long_date = chkd.format('llll');
         var human_date;

diff --git a/notebook/static/notebook/js/main.js b/notebook/static/notebook/js/main.js
@@ -44,7 +44,8 @@ require([
     'codemirror/lib/codemirror',
     'notebook/js/about',
     'notebook/js/searchandreplace',
-    'notebook/js/clipboard'
+    'notebook/js/clipboard',
+    'bidi/bidi'
 ], function(
     $,
     contents_service,
@@ -69,7 +70,8 @@ require([
     CodeMirror,
     about,
     searchandreplace,
-    clipboard
+    clipboard,
+    bidi
     ) {
     "use strict";
 
@@ -78,6 +80,7 @@ require([
 
     try{
         requirejs(['custom/custom'], function() {});
+        bidi.loadLocale();
     } catch(err) {
         console.log("Error processing custom.js. Logging and continuing");
         console.warn(err);

diff --git a/notebook/static/notebook/js/savewidget.js b/notebook/static/notebook/js/savewidget.js
@@ -8,7 +8,8 @@ define([
     'base/js/dialog',
     'base/js/keyboard',
     'moment',
-], function($, utils, i18n, dialog, keyboard, moment) {
+    'bidi/bidi',
+], function($, utils, i18n, dialog, keyboard, moment, bidi) {
     "use strict";
 
     var SaveWidget = function (selector, options) {
@@ -133,6 +134,7 @@ define([
 
     SaveWidget.prototype.update_notebook_name = function () {
         var nbname = this.notebook.get_notebook_name();
+        nbname = bidi.applyBidi(nbname);
         this.element.find('span.filename').text(nbname);
     };
 
@@ -186,10 +188,11 @@ define([
             // less than 24 hours old, use relative date
             human_date = chkd.fromNow();
         } else {
-            // otherwise show calendar 
+            // otherwise show calendar
             // <Today | yesterday|...> at hh,mm,ss
             human_date = chkd.calendar();
         }
+
         el.text(i18n.msg.sprintf(i18n.msg._('Last Checkpoint: %s'),human_date)).attr('title', long_date);
     };
 

diff --git a/notebook/static/notebook/less/commandpalette.less b/notebook/static/notebook/less/commandpalette.less
@@ -3,6 +3,11 @@ ul.typeahead-list i{
     width: 18px;
 }
 
+[dir="rtl"] ul.typeahead-list i {
+    margin-left: 0;
+    margin-right: -10px;
+}
+
 ul.typeahead-list {
   max-height: 80vh;
   overflow:auto;
@@ -14,6 +19,14 @@ ul.typeahead-list {
     }
 }
 
+ul.typeahead-list & > li > a.pull-right {
+    .pull-left();
+}
+
+[dir="rtl"] .typeahead-list {
+    text-align : right;
+}
+
 .cmd-palette {
   & .modal-body{
     padding: 7px;
@@ -33,6 +46,14 @@ ul.typeahead-list {
     color: transparent;
 }
 
+[dir="rtl"] .no-shortcut.pull-right{
+    .pull-left();
+}
+
+[dir="rtl"] .command-shortcut.pull-right{
+    .pull-left();
+}
+
 .command-shortcut:before{
     content:"(command mode)";
     padding-right:3px;
@@ -44,3 +65,7 @@ ul.typeahead-list {
     padding-right:3px;
     color:@gray-light;
 }
+
+[dir="rtl"] .edit-shortcut.pull-right {
+    .pull-left();
+}
diff --git a/notebook/static/notebook/less/kernelselector.less b/notebook/static/notebook/less/kernelselector.less
@@ -6,3 +6,7 @@
         height: 32px;
     }
 }
+
+[dir="rtl"] #kernel_logo_widget {
+    .pull-left();
+}