Iss3342

cms/djangoapps/contentstore/course_info_model.py

@@ -93,7 +93,7 @@ def _course_info_content(html_parsed):
         content = html_parsed[0].tail
     else:
         content = html_parsed[0].tail if html_parsed[0].tail is not None else ""
-        content += "\n".join([html.tostring(ele) for ele in html_parsed[1:]])
+        content += "\n".join([html.tostring(ele, encoding=unicode) for ele in html_parsed[1:]])
     return content
 
 

cms/djangoapps/contentstore/views/component.py

@@ -43,8 +43,12 @@
 
 log = logging.getLogger(__name__)
 
+
+def _(s):
+    return s
+
 # NOTE: unit_handler assumes this list is disjoint from ADVANCED_COMPONENT_TYPES
-COMPONENT_TYPES = ['discussion', 'html', 'problem', 'video']
+COMPONENT_TYPES = [_('discussion'), _('html'), _('problem'), _('video')]
 
 OPEN_ENDED_COMPONENT_TYPES = ["combinedopenended", "peergrading"]
 NOTE_COMPONENT_TYPES = ['notes']
@@ -58,6 +62,7 @@
         'textannotation',  # module for annotating text (with annotation table)
         'videoannotation',  # module for annotating video (with annotation table)
         'word_cloud',
+        'master_class',
         'graphical_slider_tool',
         'lti',
         'concept',

cms/envs/common.py

@@ -52,7 +52,7 @@
     'AUTH_USE_CERTIFICATES': False,
 
     # email address for studio staff (eg to request course creation)
-    'STUDIO_REQUEST_EMAIL': '',
+    'STUDIO_REQUEST_EMAIL': 'edu.olimpiada@yandex.ru',
 
     'STUDIO_NPS_SURVEY': True,
 
@@ -67,7 +67,7 @@
 
     # If set to True, new Studio users won't be able to author courses unless
     # edX has explicitly added them to the course creator group.
-    'ENABLE_CREATOR_GROUP': False,
+    'ENABLE_CREATOR_GROUP': True,
 
     # whether to use password policy enforcement or not
     'ENFORCE_PASSWORD_POLICY': False,
@@ -269,9 +269,9 @@
 EMAIL_USE_TLS = False
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
-DEFAULT_FROM_EMAIL = 'registration@example.com'
-DEFAULT_FEEDBACK_EMAIL = 'feedback@example.com'
-SERVER_EMAIL = 'devops@example.com'
+DEFAULT_FROM_EMAIL = 'noreply.edu@olimpiada.ru'
+DEFAULT_FEEDBACK_EMAIL = 'edu.olimpiada@yandex..ru'
+SERVER_EMAIL = 'edu.olimpiada@yandex.ru'
 ADMINS = ()
 MANAGERS = ADMINS
 
@@ -290,8 +290,8 @@
 ]
 
 # Locale/Internationalization
-TIME_ZONE = 'America/New_York'  # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-LANGUAGE_CODE = 'en'  # http://www.i18nguy.com/unicode/language-identifiers.html
+TIME_ZONE = 'Europe/Moscow'  # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+LANGUAGE_CODE = 'ru'  # http://www.i18nguy.com/unicode/language-identifiers.html
 
 LANGUAGES = lms.envs.common.LANGUAGES
 USE_I18N = True

cms/static/js/base.js

@@ -21,6 +21,8 @@ domReady(function() {
     $newComponentButton = $('.new-component-button');
     $spinner = $('<span class="spinner-in-field-icon"></span>');
 
+    var language = "ru"; //if you have a multilanguage site you should set this varibale in the current user language
+
     $body.on('click', '.embeddable-xml-input', function() {
         $(this).select();
     });
@@ -117,6 +119,7 @@ domReady(function() {
     });
 
     IframeUtils.iframeBinding();
+    $.datepicker.setDefaults( $.datepicker.regional[language] );
 });
 
 function smoothScrollLink(e) {
@@ -236,7 +239,7 @@ function createNewUnit(e) {
     $.postJSON(ModuleUtils.getUpdateUrl(), {
         'parent_locator': parent,
         'category': category,
-        'display_name': 'New Unit'
+        'display_name': gettext('New Unit')
     },
 
     function(data) {
@@ -247,23 +250,23 @@ function createNewUnit(e) {
 
 function deleteUnit(e) {
     e.preventDefault();
-    _deleteItem($(this).parents('li.courseware-unit'), 'Unit');
+    _deleteItem($(this).parents('li.courseware-unit'), gettext('Unit'));
 }
 
 function deleteSubsection(e) {
     e.preventDefault();
-    _deleteItem($(this).parents('li.courseware-subsection'), 'Subsection');
+    _deleteItem($(this).parents('li.courseware-subsection'), gettext('Subsection'));
 }
 
 function deleteSection(e) {
     e.preventDefault();
-    _deleteItem($(this).parents('section.courseware-section'), 'Section');
+    _deleteItem($(this).parents('section.courseware-section'), gettext('Section'));
 }
 
 function _deleteItem($el, type) {
     var confirm = new PromptView.Warning({
-        title: gettext('Delete this ' + type + '?'),
-        message: gettext('Deleting this ' + type + ' is permanent and cannot be undone.'),
+        title: interpolate(gettext('Delete this %(type)s?'), {type: type}, true),
+        message: interpolate(gettext('Deleting this %(type)s is permanent and cannot be undone.'), {type: type}, true),
         actions: {
             primary: {
                 text: gettext('Yes, delete this ' + type),

cms/static/js/models/course_update.js

@@ -2,7 +2,7 @@ define(["backbone", "jquery", "jquery.ui"], function(Backbone, $) {
     // course update -- biggest kludge here is the lack of a real id to map updates to originals
     var CourseUpdate = Backbone.Model.extend({
         defaults: {
-            "date" : $.datepicker.formatDate('MM d, yy', new Date()),
+            "date" : $.datepicker.formatDate('d MM, yy', new Date()),
             "content" : ""
         }
     });

cms/static/js/views/course_info_update.js

@@ -36,7 +36,7 @@ define(["js/views/baseview", "codemirror", "js/models/course_update",
                 }
             });
             this.$el.find(".new-update-form").hide();
-            this.$el.find('.date').datepicker({ 'dateFormat': 'MM d, yy' });
+            this.$el.find('.date').datepicker({ 'dateFormat': 'd MM, yy' }).datepicker('setDate', new Date());
             return this;
         },
 
@@ -68,7 +68,7 @@ define(["js/views/baseview", "codemirror", "js/models/course_update",
             });
 
             $('.date').datepicker('destroy');
-            $('.date').datepicker({ 'dateFormat': 'MM d, yy' });
+            $('.date').datepicker({ 'dateFormat': 'd MM, yy' }).datepicker('setDate', new Date());
         },
 
         onSave: function(event) {

cms/static/js/views/settings/grading.js

@@ -1,5 +1,5 @@
-define(["js/views/validation", "underscore", "jquery", "jquery.ui", "js/views/settings/grader"],
-    function(ValidatingView, _, $, ui, GraderView) {
+define(["js/views/validation", "underscore", "jquery", "jquery.ui", "gettext", "js/views/settings/grader"],
+    function(ValidatingView, _, $, ui, gettext, GraderView) {
 
 var GradingView = ValidatingView.extend({
     // Model class is CMS.Models.Settings.CourseGradingPolicy
@@ -273,7 +273,7 @@ var GradingView = ValidatingView.extend({
 
         // Munge existing grade labels?
         // If going from Pass/Fail to 3 levels, change to Pass to A
-        if (gradeLength === 1 && this.descendingCutoffs[0]['designation'] === 'Pass') {
+        if (gradeLength === 1 && gettext(this.descendingCutoffs[0]['designation']) === gettext('Pass')) {
             this.descendingCutoffs[0]['designation'] = this.GRADES[0];
             this.setTopGradeLabel();
         }
@@ -293,7 +293,7 @@ var GradingView = ValidatingView.extend({
         domElement.remove();
 
         if (this.descendingCutoffs.length === 1 && this.descendingCutoffs[0]['designation'] === this.GRADES[0]) {
-            this.descendingCutoffs[0]['designation'] = 'Pass';
+            this.descendingCutoffs[0]['designation'] = gettext('Pass');
             this.setTopGradeLabel();
         }
         this.setFailLabel();
@@ -308,7 +308,7 @@ var GradingView = ValidatingView.extend({
     },
 
     failLabel: function() {
-        if (this.descendingCutoffs.length === 1) return 'Fail';
+        if (this.descendingCutoffs.length === 1) return gettext('Fail');
         else return 'F';
     },
     setFailLabel: function() {

cms/static/sass/assets/_fonts.scss

@@ -2,4 +2,4 @@
 // ====================
 
 // import from google fonts - Open Sans (http://www.google.com/fonts/specimen/Open+Sans)
-@import url(//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700);
+@import url(//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700&subset=latin,cyrillic-ext,latin-ext,cyrillic);

cms/templates/base.html

@@ -64,6 +64,7 @@
             "jquery.iframe-transport": "js/vendor/jQuery-File-Upload/js/jquery.iframe-transport",
             "jquery.inputnumber": "js/vendor/html5-input-polyfills/number-polyfill",
             "jquery.immediateDescendents": "coffee/src/jquery.immediateDescendents",
+            "jquery.datapicker-ru": "js/vendor/jquery.ui.datepicker-ru",
             "datepair": "js/vendor/timepicker/datepair",
             "date": "js/vendor/date",
             "tzAbbr": "js/vendor/tzAbbr",
@@ -140,7 +141,7 @@
             },
             "jquery.scrollTo": {
                 deps: ["jquery"],
-                exports: "jQuery.fn.scrollTo",
+                exports: "jQuery.fn.scrollTo"
             },
             "jquery.flot": {
                 deps: ["jquery"],
@@ -227,13 +228,16 @@
             "coffee/src/logger": {
                 exports: "Logger",
                 deps: ["coffee/src/ajax_prefix"]
+            },
+            "jquery.datapicker-ru" : {
+                deps: ["jquery.ui"]
             }
         },
         // load jquery and gettext automatically
         deps: ["jquery", "gettext"],
         callback: function() {
             // load other scripts on every page, after jquery loads
-            require(["js/base", "coffee/src/main", "coffee/src/logger", "datepair", "accessibility"]);
+            require(["js/base", "coffee/src/main", "coffee/src/logger", "datepair", "accessibility", "jquery.datapicker-ru"]);
             // we need "datepair" because it dynamically modifies the page
             // when it is loaded -- yuck!
         }

cms/templates/index.html

@@ -199,7 +199,7 @@ <h3 class="title">${_('Create Your First Course')}</h3>
 
 
       %if course_creator_status == "unrequested":
-      <div class="wrapper wrapper-creationrights">
+      <div class="wrapper wrapper-creationrights sr">
         <h3 class="title">
           <a href="#instruction-creationrights" class="ui-toggle-control show-creationrights"><span class="label">${_('Becoming a Course Creator in Studio')}</span> <i class="icon-remove-sign"></i></a>
         </h3>

cms/templates/js/course_info_update.underscore

@@ -4,7 +4,7 @@
 		<div class="row">
 			<label class="inline-label">Date:</label>
 			<!-- TODO replace w/ date widget and actual date (problem is that persisted version is "Month day" not an actual date obj -->
-			<input type="text" class="date" value="<%= updateModel.get('date') %>">
+			<input type="text" class="date">
 		</div>
 		<div class="row">
 			<textarea class="new-update-content text-editor"><%= updateModel.get('content') %></textarea>