Commit cd0bb4c7 by Diana Huang

Add ability to generate static i18n files.

parent dce3d9ca
**/vendor **/vendor
node_modules node_modules
cms/static/js/i18n/**/*.js
lms/static/js/i18n/**/*.js
...@@ -60,6 +60,8 @@ from lms.envs.common import ( ...@@ -60,6 +60,8 @@ from lms.envs.common import (
# Django REST framework configuration # Django REST framework configuration
REST_FRAMEWORK, REST_FRAMEWORK,
STATICI18N_OUTPUT_DIR
) )
from path import Path as path from path import Path as path
from warnings import simplefilter from warnings import simplefilter
...@@ -465,6 +467,8 @@ LANGUAGE_DICT = dict(LANGUAGES) ...@@ -465,6 +467,8 @@ LANGUAGE_DICT = dict(LANGUAGES)
USE_I18N = True USE_I18N = True
USE_L10N = True USE_L10N = True
STATICI18N_ROOT = PROJECT_ROOT / "static"
# Localization strings (e.g. django.po) are under this directory # Localization strings (e.g. django.po) are under this directory
LOCALE_PATHS = (REPO_ROOT + '/conf/locale',) # edx-platform/conf/locale/ LOCALE_PATHS = (REPO_ROOT + '/conf/locale',) # edx-platform/conf/locale/
...@@ -845,6 +849,9 @@ INSTALLED_APPS = ( ...@@ -845,6 +849,9 @@ INSTALLED_APPS = (
# edx-milestones service # edx-milestones service
'milestones', 'milestones',
# Static i18n support
'statici18n',
) )
......
if (window) { ;(function (require, define) {
// MathJax Fast Preview was introduced in 2.5. However, it 'use strict';
// causes undesirable flashing/font size changes when if (window) {
// MathJax is used for interactive preview (equation editor). // MathJax Fast Preview was introduced in 2.5. However, it
// Setting processSectionDelay to 0 (see below) fully eliminates // causes undesirable flashing/font size changes when
// fast preview, but to reduce confusion, we are also setting // MathJax is used for interactive preview (equation editor).
// the option as displayed in the context menu to false. // Setting processSectionDelay to 0 (see below) fully eliminates
// When upgrading to 2.6, check if this variable name changed. // fast preview, but to reduce confusion, we are also setting
window.MathJax = { // the option as displayed in the context menu to false.
menuSettings: {CHTMLpreview: false} // When upgrading to 2.6, check if this variable name changed.
}; window.MathJax = {
} menuSettings: {CHTMLpreview: false}
};
// Since we are serving the gettext catalog as static files,
// the URL for the gettext file will vary depending on which locale
// needs to be served. To handle this, we load the correct file in the
// rendered template and then use this to ensure that RequireJS knows
// how to find it.
define("gettext", function () { return window.gettext; });
}
require.config({ require.config({
// NOTE: baseUrl has been previously set in cms/static/templates/base.html // NOTE: baseUrl has been previously set in cms/static/templates/base.html
waitSeconds: 60, waitSeconds: 60,
paths: { paths: {
"domReady": "js/vendor/domReady", "domReady": "js/vendor/domReady",
"gettext": "/i18n", "mustache": "js/vendor/mustache",
"mustache": "js/vendor/mustache", "codemirror": "js/vendor/codemirror-compressed",
"codemirror": "js/vendor/codemirror-compressed", "codemirror/stex": "js/vendor/CodeMirror/stex",
"codemirror/stex": "js/vendor/CodeMirror/stex", "jquery": "js/vendor/jquery.min",
"jquery": "js/vendor/jquery.min", "jquery.ui": "js/vendor/jquery-ui.min",
"jquery.ui": "js/vendor/jquery-ui.min", "jquery.form": "js/vendor/jquery.form",
"jquery.form": "js/vendor/jquery.form", "jquery.markitup": "js/vendor/markitup/jquery.markitup",
"jquery.markitup": "js/vendor/markitup/jquery.markitup", "jquery.leanModal": "js/vendor/jquery.leanModal",
"jquery.leanModal": "js/vendor/jquery.leanModal", "jquery.ajaxQueue": "js/vendor/jquery.ajaxQueue",
"jquery.ajaxQueue": "js/vendor/jquery.ajaxQueue", "jquery.smoothScroll": "js/vendor/jquery.smooth-scroll.min",
"jquery.smoothScroll": "js/vendor/jquery.smooth-scroll.min", "jquery.timepicker": "js/vendor/timepicker/jquery.timepicker",
"jquery.timepicker": "js/vendor/timepicker/jquery.timepicker", "jquery.cookie": "js/vendor/jquery.cookie",
"jquery.cookie": "js/vendor/jquery.cookie", "jquery.qtip": "js/vendor/jquery.qtip.min",
"jquery.qtip": "js/vendor/jquery.qtip.min", "jquery.scrollTo": "js/vendor/jquery.scrollTo-1.4.2-min",
"jquery.scrollTo": "js/vendor/jquery.scrollTo-1.4.2-min", "jquery.flot": "js/vendor/flot/jquery.flot.min",
"jquery.flot": "js/vendor/flot/jquery.flot.min", "jquery.fileupload": "js/vendor/jQuery-File-Upload/js/jquery.fileupload",
"jquery.fileupload": "js/vendor/jQuery-File-Upload/js/jquery.fileupload", "jquery.fileupload-process": "js/vendor/jQuery-File-Upload/js/jquery.fileupload-process",
"jquery.fileupload-process": "js/vendor/jQuery-File-Upload/js/jquery.fileupload-process", "jquery.fileupload-validate": "js/vendor/jQuery-File-Upload/js/jquery.fileupload-validate",
"jquery.fileupload-validate": "js/vendor/jQuery-File-Upload/js/jquery.fileupload-validate", "jquery.iframe-transport": "js/vendor/jQuery-File-Upload/js/jquery.iframe-transport",
"jquery.iframe-transport": "js/vendor/jQuery-File-Upload/js/jquery.iframe-transport", "jquery.inputnumber": "js/vendor/html5-input-polyfills/number-polyfill",
"jquery.inputnumber": "js/vendor/html5-input-polyfills/number-polyfill", "jquery.immediateDescendents": "coffee/src/jquery.immediateDescendents",
"jquery.immediateDescendents": "coffee/src/jquery.immediateDescendents", "datepair": "js/vendor/timepicker/datepair",
"datepair": "js/vendor/timepicker/datepair", "date": "js/vendor/date",
"date": "js/vendor/date", "moment": "js/vendor/moment.min",
"moment": "js/vendor/moment.min", "moment-with-locales": "js/vendor/moment-with-locales.min",
"moment-with-locales": "js/vendor/moment-with-locales.min", "text": 'js/vendor/requirejs/text',
"text": 'js/vendor/requirejs/text', "underscore": "js/vendor/underscore-min",
"underscore": "js/vendor/underscore-min", "underscore.string": "js/vendor/underscore.string.min",
"underscore.string": "js/vendor/underscore.string.min", "backbone": "js/vendor/backbone-min",
"backbone": "js/vendor/backbone-min", "backbone-relational" : "js/vendor/backbone-relational.min",
"backbone-relational" : "js/vendor/backbone-relational.min", "backbone.associations": "js/vendor/backbone-associations-min",
"backbone.associations": "js/vendor/backbone-associations-min", "backbone.paginator": "js/vendor/backbone.paginator.min",
"backbone.paginator": "js/vendor/backbone.paginator.min", "tinymce": "js/vendor/tinymce/js/tinymce/tinymce.full.min",
"tinymce": "js/vendor/tinymce/js/tinymce/tinymce.full.min", "jquery.tinymce": "js/vendor/tinymce/js/tinymce/jquery.tinymce.min",
"jquery.tinymce": "js/vendor/tinymce/js/tinymce/jquery.tinymce.min", "xmodule": "/xmodule/xmodule",
"xmodule": "/xmodule/xmodule", "xblock/core": "js/xblock/core",
"xblock/core": "js/xblock/core", "xblock": "coffee/src/xblock",
"xblock": "coffee/src/xblock", "utility": "js/src/utility",
"utility": "js/src/utility", "accessibility": "js/src/accessibility_tools",
"accessibility": "js/src/accessibility_tools", "draggabilly": "js/vendor/draggabilly.pkgd",
"draggabilly": "js/vendor/draggabilly.pkgd", "URI": "js/vendor/URI.min",
"URI": "js/vendor/URI.min", "ieshim": "js/src/ie_shim",
"ieshim": "js/src/ie_shim", "tooltip_manager": "js/src/tooltip_manager",
"tooltip_manager": "js/src/tooltip_manager",
// Files needed for Annotations feature // Files needed for Annotations feature
"annotator": "js/vendor/ova/annotator-full", "annotator": "js/vendor/ova/annotator-full",
"annotator-harvardx": "js/vendor/ova/annotator-full-firebase-auth", "annotator-harvardx": "js/vendor/ova/annotator-full-firebase-auth",
"video.dev": "js/vendor/ova/video.dev", "video.dev": "js/vendor/ova/video.dev",
"vjs.youtube": 'js/vendor/ova/vjs.youtube', "vjs.youtube": 'js/vendor/ova/vjs.youtube',
"rangeslider": 'js/vendor/ova/rangeslider', "rangeslider": 'js/vendor/ova/rangeslider',
"share-annotator": 'js/vendor/ova/share-annotator', "share-annotator": 'js/vendor/ova/share-annotator',
"richText-annotator": 'js/vendor/ova/richText-annotator', "richText-annotator": 'js/vendor/ova/richText-annotator',
"reply-annotator": 'js/vendor/ova/reply-annotator', "reply-annotator": 'js/vendor/ova/reply-annotator',
"grouping-annotator": 'js/vendor/ova/grouping-annotator', "grouping-annotator": 'js/vendor/ova/grouping-annotator',
"tags-annotator": 'js/vendor/ova/tags-annotator', "tags-annotator": 'js/vendor/ova/tags-annotator',
"diacritic-annotator": 'js/vendor/ova/diacritic-annotator', "diacritic-annotator": 'js/vendor/ova/diacritic-annotator',
"flagging-annotator": 'js/vendor/ova/flagging-annotator', "flagging-annotator": 'js/vendor/ova/flagging-annotator',
"jquery-Watch": 'js/vendor/ova/jquery-Watch', "jquery-Watch": 'js/vendor/ova/jquery-Watch',
"openseadragon": 'js/vendor/ova/openseadragon', "openseadragon": 'js/vendor/ova/openseadragon',
"osda": 'js/vendor/ova/OpenSeaDragonAnnotation', "osda": 'js/vendor/ova/OpenSeaDragonAnnotation',
"ova": 'js/vendor/ova/ova', "ova": 'js/vendor/ova/ova',
"catch": 'js/vendor/ova/catch/js/catch', "catch": 'js/vendor/ova/catch/js/catch',
"handlebars": 'js/vendor/ova/catch/js/handlebars-1.1.2', "handlebars": 'js/vendor/ova/catch/js/handlebars-1.1.2',
// end of Annotation tool files // end of Annotation tool files
// externally hosted files // externally hosted files
"mathjax": "//cdn.mathjax.org/mathjax/2.5-latest/MathJax.js?config=TeX-MML-AM_HTMLorMML-full&delayStartupUntil=configured", "mathjax": "//cdn.mathjax.org/mathjax/2.5-latest/MathJax.js?config=TeX-MML-AM_HTMLorMML-full&delayStartupUntil=configured", // jshint ignore:line
"youtube": [ "youtube": [
// youtube URL does not end in ".js". We add "?noext" to the path so // youtube URL does not end in ".js". We add "?noext" to the path so
// that require.js adds the ".js" to the query component of the URL, // that require.js adds the ".js" to the query component of the URL,
// and leaves the path component intact. // and leaves the path component intact.
"//www.youtube.com/player_api?noext", "//www.youtube.com/player_api?noext",
// if youtube fails to load, fallback on a local file // if youtube fails to load, fallback on a local file
// so that require doesn't fall over // so that require doesn't fall over
"js/src/youtube_fallback" "js/src/youtube_fallback"
] ]
}, },
shim: { shim: {
"gettext": { "gettext": {
exports: "gettext" exports: "gettext"
}, },
"date": { "date": {
exports: "Date" exports: "Date"
}, },
"jquery.ui": { "jquery.ui": {
deps: ["jquery"], deps: ["jquery"],
exports: "jQuery.ui" exports: "jQuery.ui"
}, },
"jquery.form": { "jquery.form": {
deps: ["jquery"], deps: ["jquery"],
exports: "jQuery.fn.ajaxForm" exports: "jQuery.fn.ajaxForm"
}, },
"jquery.markitup": { "jquery.markitup": {
deps: ["jquery"], deps: ["jquery"],
exports: "jQuery.fn.markitup" exports: "jQuery.fn.markitup"
}, },
"jquery.leanmodal": { "jquery.leanmodal": {
deps: ["jquery"], deps: ["jquery"],
exports: "jQuery.fn.leanModal" exports: "jQuery.fn.leanModal"
}, },
"jquery.ajaxQueue": { "jquery.ajaxQueue": {
deps: ["jquery"], deps: ["jquery"],
exports: "jQuery.fn.ajaxQueue" exports: "jQuery.fn.ajaxQueue"
}, },
"jquery.smoothScroll": { "jquery.smoothScroll": {
deps: ["jquery"], deps: ["jquery"],
exports: "jQuery.fn.smoothScroll" exports: "jQuery.fn.smoothScroll"
}, },
"jquery.cookie": { "jquery.cookie": {
deps: ["jquery"], deps: ["jquery"],
exports: "jQuery.fn.cookie" exports: "jQuery.fn.cookie"
}, },
"jquery.qtip": { "jquery.qtip": {
deps: ["jquery"], deps: ["jquery"],
exports: "jQuery.fn.qtip" exports: "jQuery.fn.qtip"
}, },
"jquery.scrollTo": { "jquery.scrollTo": {
deps: ["jquery"], deps: ["jquery"],
exports: "jQuery.fn.scrollTo", exports: "jQuery.fn.scrollTo",
}, },
"jquery.flot": { "jquery.flot": {
deps: ["jquery"], deps: ["jquery"],
exports: "jQuery.fn.plot" exports: "jQuery.fn.plot"
}, },
"jquery.fileupload": { "jquery.fileupload": {
deps: ["jquery.ui", "jquery.iframe-transport"], deps: ["jquery.ui", "jquery.iframe-transport"],
exports: "jQuery.fn.fileupload" exports: "jQuery.fn.fileupload"
}, },
"jquery.fileupload-process": { "jquery.fileupload-process": {
deps: ["jquery.fileupload"] deps: ["jquery.fileupload"]
}, },
"jquery.fileupload-validate": { "jquery.fileupload-validate": {
deps: ["jquery.fileupload"] deps: ["jquery.fileupload"]
}, },
"jquery.inputnumber": { "jquery.inputnumber": {
deps: ["jquery"], deps: ["jquery"],
exports: "jQuery.fn.inputNumber" exports: "jQuery.fn.inputNumber"
}, },
"jquery.tinymce": { "jquery.tinymce": {
deps: ["jquery", "tinymce"], deps: ["jquery", "tinymce"],
exports: "jQuery.fn.tinymce" exports: "jQuery.fn.tinymce"
}, },
"datepair": { "datepair": {
deps: ["jquery.ui", "jquery.timepicker"] deps: ["jquery.ui", "jquery.timepicker"]
}, },
"underscore": { "underscore": {
exports: "_" exports: "_"
}, },
"backbone": { "backbone": {
deps: ["underscore", "jquery"], deps: ["underscore", "jquery"],
exports: "Backbone" exports: "Backbone"
}, },
"backbone.associations": { "backbone.associations": {
deps: ["backbone"], deps: ["backbone"],
exports: "Backbone.Associations" exports: "Backbone.Associations"
}, },
"backbone.paginator": { "backbone.paginator": {
deps: ["backbone"], deps: ["backbone"],
exports: "Backbone.Paginator" exports: "Backbone.Paginator"
}, },
"youtube": { "youtube": {
exports: "YT" exports: "YT"
}, },
"codemirror": { "codemirror": {
exports: "CodeMirror" exports: "CodeMirror"
}, },
"codemirror/stex": { "codemirror/stex": {
deps: ["codemirror"] deps: ["codemirror"]
}, },
"tinymce": { "tinymce": {
exports: "tinymce" exports: "tinymce"
}, },
"mathjax": { "mathjax": {
exports: "MathJax", exports: "MathJax",
init: function() { init: function() {
MathJax.Hub.Config({ window.MathJax.Hub.Config({
tex2jax: { tex2jax: {
inlineMath: [ inlineMath: [
["\\(","\\)"], ["\\(","\\)"],
['[mathjaxinline]','[/mathjaxinline]'] ['[mathjaxinline]','[/mathjaxinline]']
], ],
displayMath: [ displayMath: [
["\\[","\\]"], ["\\[","\\]"],
['[mathjax]','[/mathjax]'] ['[mathjax]','[/mathjax]']
] ]
}
});
// In order to eliminate all flashing during interactive
// preview, it is necessary to set processSectionDelay to 0
// (remove delay between input and output phases). This
// effectively disables fast preview, regardless of
// the fast preview setting as shown in the context menu.
window.MathJax.Hub.processSectionDelay = 0;
window.MathJax.Hub.Configured();
} }
}); },
// In order to eliminate all flashing during interactive "URI": {
// preview, it is necessary to set processSectionDelay to 0 exports: "URI"
// (remove delay between input and output phases). This },
// effectively disables fast preview, regardless of "tooltip_manager": {
// the fast preview setting as shown in the context menu. deps: ["jquery", "underscore"]
MathJax.Hub.processSectionDelay = 0; },
MathJax.Hub.Configured(); "jquery.immediateDescendents": {
} deps: ["jquery"]
}, },
"URI": { "xblock/core": {
exports: "URI" exports: "XBlock",
}, deps: ["jquery", "jquery.immediateDescendents"]
"tooltip_manager": { },
deps: ["jquery", "underscore"] "xblock/runtime.v1": {
}, exports: "XBlock",
"jquery.immediateDescendents": { deps: ["xblock/core"]
deps: ["jquery"] },
},
"xblock/core": {
exports: "XBlock",
deps: ["jquery", "jquery.immediateDescendents"]
},
"xblock/runtime.v1": {
exports: "XBlock",
deps: ["xblock/core"]
},
"coffee/src/main": { "coffee/src/main": {
deps: ["coffee/src/ajax_prefix"] deps: ["coffee/src/ajax_prefix"]
}, },
"js/src/logger": { "js/src/logger": {
exports: "Logger", exports: "Logger",
deps: ["coffee/src/ajax_prefix"] deps: ["coffee/src/ajax_prefix"]
}, },
// the following are all needed for annotation tools // the following are all needed for annotation tools
"video.dev": { "video.dev": {
exports:"videojs" exports:"videojs"
}, },
"vjs.youtube": { "vjs.youtube": {
deps: ["video.dev"] deps: ["video.dev"]
}, },
"rangeslider": { "rangeslider": {
deps: ["video.dev"] deps: ["video.dev"]
}, },
"annotator": { "annotator": {
exports: "Annotator" exports: "Annotator"
}, },
"annotator-harvardx":{ "annotator-harvardx":{
deps: ["annotator"] deps: ["annotator"]
}, },
"share-annotator": { "share-annotator": {
deps: ["annotator"] deps: ["annotator"]
}, },
"richText-annotator": { "richText-annotator": {
deps: ["annotator", "tinymce"] deps: ["annotator", "tinymce"]
}, },
"reply-annotator": { "reply-annotator": {
deps: ["annotator"] deps: ["annotator"]
}, },
"tags-annotator": { "tags-annotator": {
deps: ["annotator"] deps: ["annotator"]
}, },
"diacritic-annotator": { "diacritic-annotator": {
deps: ["annotator"] deps: ["annotator"]
}, },
"flagging-annotator": { "flagging-annotator": {
deps: ["annotator"] deps: ["annotator"]
}, },
"grouping-annotator": { "grouping-annotator": {
deps: ["annotator"] deps: ["annotator"]
}, },
"ova":{ "ova":{
exports: "ova", exports: "ova",
deps: ["annotator", "annotator-harvardx", "video.dev", "vjs.youtube", "rangeslider", "share-annotator", "richText-annotator", "reply-annotator", "tags-annotator", "flagging-annotator", "grouping-annotator", "diacritic-annotator", "jquery-Watch", "catch", "handlebars", "URI"] deps: ["annotator", "annotator-harvardx", "video.dev", "vjs.youtube",
}, "rangeslider", "share-annotator", "richText-annotator", "reply-annotator",
"osda":{ "tags-annotator", "flagging-annotator", "grouping-annotator", "diacritic-annotator",
exports: "osda", "jquery-Watch", "catch", "handlebars", "URI"]
deps: ["annotator", "annotator-harvardx", "video.dev", "vjs.youtube", "rangeslider", "share-annotator", "richText-annotator", "reply-annotator", "tags-annotator", "flagging-annotator", "grouping-annotator", "diacritic-annotator", "openseadragon", "jquery-Watch", "catch", "handlebars", "URI"] },
"osda":{
exports: "osda",
deps: ["annotator", "annotator-harvardx", "video.dev", "vjs.youtube",
"rangeslider", "share-annotator", "richText-annotator", "reply-annotator",
"tags-annotator", "flagging-annotator", "grouping-annotator", "diacritic-annotator",
"openseadragon", "jquery-Watch", "catch", "handlebars", "URI"]
}
// end of annotation tool files
} }
// end of annotation tool files });
} }).call(this, require, define);
});
...@@ -23,6 +23,11 @@ from openedx.core.lib.js_utils import ( ...@@ -23,6 +23,11 @@ from openedx.core.lib.js_utils import (
${settings.STUDIO_NAME} ${settings.STUDIO_NAME}
</title> </title>
<%
jsi18n_path = "js/i18n/{language}/djangojs.js".format(language=LANGUAGE_CODE)
%>
<script type="text/javascript" src="${static.url(jsi18n_path)}"></script>
<meta name="viewport" content="width=device-width,initial-scale=1"> <meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="path_prefix" content="${EDX_ROOT_URL}"> <meta name="path_prefix" content="${EDX_ROOT_URL}">
......
...@@ -122,12 +122,6 @@ JS_INFO_DICT = { ...@@ -122,12 +122,6 @@ JS_INFO_DICT = {
'packages': ('openassessment',), 'packages': ('openassessment',),
} }
urlpatterns += patterns(
'',
# Serve catalog of localized strings to be rendered by Javascript
url(r'^i18n.js$', 'django.views.i18n.javascript_catalog', JS_INFO_DICT),
)
if settings.FEATURES.get('ENABLE_CONTENT_LIBRARIES'): if settings.FEATURES.get('ENABLE_CONTENT_LIBRARIES'):
urlpatterns += ( urlpatterns += (
url(r'^library/{}?$'.format(LIBRARY_KEY_PATTERN), url(r'^library/{}?$'.format(LIBRARY_KEY_PATTERN),
......
...@@ -111,6 +111,9 @@ ignore_dirs: ...@@ -111,6 +111,9 @@ ignore_dirs:
- '*/spec' - '*/spec'
- '*/tests' - '*/tests'
- '*/features' - '*/features'
# Directories full of auto-generated JS
- lms/static/js/i18n
- cms/static/js/i18n
# Third-party installed apps that we also extract strings from. When adding a # Third-party installed apps that we also extract strings from. When adding a
......
...@@ -922,6 +922,9 @@ LANGUAGE_DICT = dict(LANGUAGES) ...@@ -922,6 +922,9 @@ LANGUAGE_DICT = dict(LANGUAGES)
USE_I18N = True USE_I18N = True
USE_L10N = True USE_L10N = True
STATICI18N_ROOT = PROJECT_ROOT / "static"
STATICI18N_OUTPUT_DIR = "js/i18n"
# Localization strings (e.g. django.po) are under this directory # Localization strings (e.g. django.po) are under this directory
LOCALE_PATHS = (REPO_ROOT + '/conf/locale',) # edx-platform/conf/locale/ LOCALE_PATHS = (REPO_ROOT + '/conf/locale',) # edx-platform/conf/locale/
# Messages # Messages
...@@ -1943,6 +1946,9 @@ INSTALLED_APPS = ( ...@@ -1943,6 +1946,9 @@ INSTALLED_APPS = (
# Gating of course content # Gating of course content
'gating.apps.GatingConfig', 'gating.apps.GatingConfig',
# Static i18n support
'statici18n',
) )
# Migrations which are not in the standard module "migrations" # Migrations which are not in the standard module "migrations"
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
// NOTE: baseUrl has been previously set in lms/templates/main.html // NOTE: baseUrl has been previously set in lms/templates/main.html
waitSeconds: 60, waitSeconds: 60,
paths: { paths: {
"gettext": "/i18n",
"annotator_1.2.9": "js/vendor/edxnotes/annotator-full.min", "annotator_1.2.9": "js/vendor/edxnotes/annotator-full.min",
"date": "js/vendor/date", "date": "js/vendor/date",
"moment": "js/vendor/moment.min", "moment": "js/vendor/moment.min",
......
...@@ -51,7 +51,11 @@ from branding import api as branding_api ...@@ -51,7 +51,11 @@ from branding import api as branding_api
</script> </script>
% endif % endif
<script type="text/javascript" src="/i18n.js"></script> <%
jsi18n_path = "js/i18n/{language}/djangojs.js".format(language=LANGUAGE_CODE)
%>
<script type="text/javascript" src="${static.url(jsi18n_path)}"></script>
<link rel="icon" type="image/x-icon" href="${static.url(static.get_value('favicon_path', settings.FAVICON_PATH))}" /> <link rel="icon" type="image/x-icon" href="${static.url(static.get_value('favicon_path', settings.FAVICON_PATH))}" />
......
...@@ -138,11 +138,6 @@ js_info_dict = { ...@@ -138,11 +138,6 @@ js_info_dict = {
'packages': ('openassessment',), 'packages': ('openassessment',),
} }
urlpatterns += (
# Serve catalog of localized strings to be rendered by Javascript
url(r'^i18n.js$', 'django.views.i18n.javascript_catalog', js_info_dict),
)
# sysadmin dashboard, to see what courses are loaded, to delete & load courses # sysadmin dashboard, to see what courses are loaded, to delete & load courses
if settings.FEATURES["ENABLE_SYSADMIN_DASHBOARD"]: if settings.FEATURES["ENABLE_SYSADMIN_DASHBOARD"]:
urlpatterns += ( urlpatterns += (
......
...@@ -5,12 +5,15 @@ import sys ...@@ -5,12 +5,15 @@ import sys
import subprocess import subprocess
from path import Path as path from path import Path as path
from paver.easy import task, cmdopts, needs, sh from paver.easy import task, cmdopts, needs, sh
from .utils.cmd import django_cmd
try: try:
from pygments.console import colorize from pygments.console import colorize
except ImportError: except ImportError:
colorize = lambda color, text: text colorize = lambda color, text: text
DEFAULT_SETTINGS = 'devstack'
@task @task
@needs( @needs(
...@@ -194,6 +197,7 @@ def i18n_robot_pull(): ...@@ -194,6 +197,7 @@ def i18n_robot_pull():
""" """
Pull source strings, generate po and mo files, and validate Pull source strings, generate po and mo files, and validate
""" """
# sh('paver test_i18n') # sh('paver test_i18n')
# Tests were removed from repo, but there should still be tests covering the translations # Tests were removed from repo, but there should still be tests covering the translations
# TODO: Validate the recently pulled translations, and give a bail option # TODO: Validate the recently pulled translations, and give a bail option
...@@ -203,10 +207,16 @@ def i18n_robot_pull(): ...@@ -203,10 +207,16 @@ def i18n_robot_pull():
print "\n\nValidating translations with `i18n_tool validate`..." print "\n\nValidating translations with `i18n_tool validate`..."
sh("{cmd}".format(cmd=cmd)) sh("{cmd}".format(cmd=cmd))
# Generate static i18n JS files.
for system in ['lms', 'cms']:
sh(django_cmd(system, DEFAULT_SETTINGS, 'compilejsi18n'))
con = raw_input("Continue with committing these translations (y/n)? ") con = raw_input("Continue with committing these translations (y/n)? ")
if con.lower() == 'y': if con.lower() == 'y':
sh('git add conf/locale') sh('git add conf/locale')
sh('git add cms/static/js/i18n')
sh('git add lms/static/js/i18n')
sh( sh(
'git commit --message=' 'git commit --message='
......
...@@ -26,6 +26,7 @@ django-oauth-plus==2.2.8 ...@@ -26,6 +26,7 @@ django-oauth-plus==2.2.8
django-sekizai==0.8.2 django-sekizai==0.8.2
django-ses==0.7.0 django-ses==0.7.0
django-simple-history==1.6.3 django-simple-history==1.6.3
django-statici18n==1.1.5
django-storages-redux==1.3 django-storages-redux==1.3
django-method-override==0.1.0 django-method-override==0.1.0
# We need a fix to DRF 3.2.x, for now use it from our own cherry-picked repo # We need a fix to DRF 3.2.x, for now use it from our own cherry-picked repo
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment