Oct 31, 2017 · Oct 23, 2017 · Oct 23, 2017 · Oct 23, 2017 · Oct 23, 2017 · Oct 24, 2017
diff --git a/notebook/base/handlers.py b/notebook/base/handlers.py

 import notebook
 from notebook._tz import utcnow
 from notebook.i18n import combine_translations
 from notebook.utils import is_hidden, url_path_join, url_is_absolute, url_escape
 from notebook.services.security import csp_report_uri

            xsrf_form_html=self.xsrf_form_html,
            token=self.token,
            xsrf_token=self.xsrf_token.decode('utf8'),
            nbjs_translations=json.dumps(combine_translations(
                self.request.headers.get('Accept-Language', ''))),
            **self.jinja_template_vars
        )

diff --git a/notebook/i18n/__init__.py b/notebook/i18n/__init__.py
 """Server functions for loading translations
 """
 from collections import defaultdict
 import errno
 import json
 from os.path import dirname, join as pjoin
 import re

 I18N_DIR = pjoin(dirname(dirname(__file__)), 'i18n')
 # Cache structure:
 # {'nbjs': {   # Domain
 #   'zh-CN': {  # Language code
 #     <english string>: <translated string>
 #     ...
 #   }
 # }}
 TRANSLATIONS_CACHE = {'nbjs': {}}


 _accept_lang_re = re.compile(r'''
 (?P<lang>[a-zA-Z]{1,8}(-[a-zA-Z]{1,8})?)
 (\s*;\s*q\s*=\s*
  (?P<qvalue>[01](.\d+)?)
 )?''', re.VERBOSE)

 def parse_accept_lang_header(accept_lang):
    """Parses the 'Accept-Language' HTTP header.

    Returns a list of language codes in *ascending* order of preference
    (with the most preferred language last).
    """
    by_q = defaultdict(list)
    for part in accept_lang.split(','):
        m = _accept_lang_re.match(part.strip())
        if not m:
            continue
        lang, qvalue = m.group('lang', 'qvalue')
        if qvalue is None:
            qvalue = 1.
        else:
            qvalue = float(qvalue)
        if qvalue == 0:
            continue  # 0 means not accepted
        by_q[qvalue].append(lang)

    res = []
    for qvalue, langs in sorted(by_q.items()):
        res.extend(sorted(langs))
    return res

 def load(language, domain='nbjs'):
    """Load translations from an nbjs.json file"""
    try:
        f = open(pjoin(I18N_DIR, language, 'LC_MESSAGES', 'nbjs.json'), encoding='utf-8')
    except OSError as e:
        if e.errno != errno.ENOENT:
            raise
        return {}

    with f:
        data = json.load(f)
    return data["locale_data"][domain]

 def cached_load(language, domain='nbjs'):
    """Load translations for one language, using in-memory cache if available"""
    domain_cache = TRANSLATIONS_CACHE[domain]
    try:
        return domain_cache[language]
    except KeyError:
        data = load(language, domain)
        domain_cache[language] = data
        return data

 def combine_translations(accept_language, domain='nbjs'):
    """Combine translations for multiple accepted languages.

    Returns data re-packaged in jed1.x format.
    """
    lang_codes = parse_accept_lang_header(accept_language)
    combined = {}
    for language in lang_codes:
        if language == 'en':
            # en is default, all translations are in frontend.
            combined.clear()
        else:
            combined.update(cached_load(language, domain))

    combined[''] = {"domain":"nbjs"}

    return {
        "domain": domain,
        "locale_data": {
            domain: combined
        }
    }
diff --git a/notebook/static/base/js/i18n.js b/notebook/static/base/js/i18n.js
    'jed',
    'moment',
    'json!../../../i18n/nbjs.json',
    'base/js/i18nload',
 ], function(Jed, moment, nbjs, i18nload) {
 ], function(Jed, moment, nbjs) {
    "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);
    var i18n = new Jed(document.nbjs_translations);
    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
diff --git a/notebook/templates/page.html b/notebook/templates/page.html
              return {};
          }
      })

    document.nbjs_translations = {{ nbjs_translations|safe }};
    </script>

    {% block meta %}
diff --git a/notebook/tests/test_i18n.py b/notebook/tests/test_i18n.py
 import nose.tools as nt

 from notebook import i18n

 def test_parse_accept_lang_header():
    palh = i18n.parse_accept_lang_header
    nt.assert_equal(palh(''), [])
    nt.assert_equal(palh('zh-CN,en-GB;q=0.7,en;q=0.3'),
                    ['en', 'en-GB', 'zh-CN'])
    nt.assert_equal(palh('nl,fr;q=0'), ['nl'])
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,6 +34,7 @@

		import notebook
		from notebook._tz import utcnow
		from notebook.i18n import combine_translations
		from notebook.utils import is_hidden, url_path_join, url_is_absolute, url_escape
		from notebook.services.security import csp_report_uri

Expand DownExpand Up		@@ -409,6 +410,8 @@ def template_namespace(self):
		xsrf_form_html=self.xsrf_form_html,
		token=self.token,
		xsrf_token=self.xsrf_token.decode('utf8'),
		nbjs_translations=json.dumps(combine_translations(
		self.request.headers.get('Accept-Language', ''))),
		**self.jinja_template_vars
		)

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,95 @@
		"""Server functions for loading translations
		"""
		from collections import defaultdict
		import errno
		import json
		from os.path import dirname, join as pjoin
		import re

		I18N_DIR = pjoin(dirname(dirname(__file__)), 'i18n')
		# Cache structure:
		# {'nbjs': { # Domain
		# 'zh-CN': { # Language code
		# <english string>: <translated string>
		# ...
		# }
		# }}
		TRANSLATIONS_CACHE = {'nbjs': {}}


		_accept_lang_re = re.compile(r'''
		(?P<lang>[a-zA-Z]{1,8}(-[a-zA-Z]{1,8})?)
		(\s;\sq\s=\s
		(?P<qvalue>[01](.\d+)?)
		)?''', re.VERBOSE)

		def parse_accept_lang_header(accept_lang):
		"""Parses the 'Accept-Language' HTTP header.

		Returns a list of language codes in ascending order of preference
		(with the most preferred language last).
		"""
		by_q = defaultdict(list)
		for part in accept_lang.split(','):
		m = _accept_lang_re.match(part.strip())
		if not m:
		continue
		lang, qvalue = m.group('lang', 'qvalue')
		if qvalue is None:
		qvalue = 1.
		else:
		qvalue = float(qvalue)
		if qvalue == 0:
		continue # 0 means not accepted
		by_q[qvalue].append(lang)

		res = []
		for qvalue, langs in sorted(by_q.items()):
		res.extend(sorted(langs))
		return res

		def load(language, domain='nbjs'):
		"""Load translations from an nbjs.json file"""
		try:
		f = open(pjoin(I18N_DIR, language, 'LC_MESSAGES', 'nbjs.json'), encoding='utf-8')
		except OSError as e:
		if e.errno != errno.ENOENT:
		raise
		return {}

		with f:
		data = json.load(f)
		return data["locale_data"][domain]

		def cached_load(language, domain='nbjs'):
		"""Load translations for one language, using in-memory cache if available"""
		domain_cache = TRANSLATIONS_CACHE[domain]
		try:
		return domain_cache[language]
		except KeyError:
		data = load(language, domain)
		domain_cache[language] = data
		return data

		def combine_translations(accept_language, domain='nbjs'):
		"""Combine translations for multiple accepted languages.

		Returns data re-packaged in jed1.x format.
		"""
		lang_codes = parse_accept_lang_header(accept_language)
		combined = {}
		for language in lang_codes:
		if language == 'en':
		# en is default, all translations are in frontend.
		combined.clear()
		else:
		combined.update(cached_load(language, domain))

		combined[''] = {"domain":"nbjs"}

		return {
		"domain": domain,
		"locale_data": {
		domain: combined
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,48 +7,17 @@ define([
		'jed',
		'moment',
		'json!../../../i18n/nbjs.json',
		'base/js/i18nload',
		], function(Jed, moment, nbjs, i18nload) {
		], function(Jed, moment, nbjs) {
		"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);
		var i18n = new Jed(document.nbjs_translations);
		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;
		});
Original file line number	Diff line number	Diff line change
Expand Up		@@ -97,6 +97,8 @@
		return {};
		}
		})

		document.nbjs_translations = {{ nbjs_translations\|safe }};
		</script>

		{% block meta %}
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,10 @@
		import nose.tools as nt

		from notebook import i18n

		def test_parse_accept_lang_header():
		palh = i18n.parse_accept_lang_header
		nt.assert_equal(palh(''), [])
		nt.assert_equal(palh('zh-CN,en-GB;q=0.7,en;q=0.3'),
		['en', 'en-GB', 'zh-CN'])
		nt.assert_equal(palh('nl,fr;q=0'), ['nl'])