diff --git a/cms/static/coffee/spec/views/assets_spec.coffee b/cms/static/coffee/spec/views/assets_spec.coffee index 7709580a73..038ad63b73 100644 --- a/cms/static/coffee/spec/views/assets_spec.coffee +++ b/cms/static/coffee/spec/views/assets_spec.coffee @@ -120,7 +120,7 @@ define ["jquery", "jasmine", "js/common_helpers/ajax_helpers", "squire"], expect(@savingSpies.constructor).toHaveBeenCalled() expect(@savingSpies.show).toHaveBeenCalled() savingOptions = @savingSpies.constructor.mostRecentCall.args[0] - expect(savingOptions.title).toMatch("Saving...") + expect(savingOptions.title).toMatch("Saving") expect(@model.get("locked")).toBeFalsy() # return a success response requests[0].respond(200) diff --git a/cms/static/coffee/src/views/tabs.coffee b/cms/static/coffee/src/views/tabs.coffee index 2e6810003a..84e64311dc 100644 --- a/cms/static/coffee/src/views/tabs.coffee +++ b/cms/static/coffee/src/views/tabs.coffee @@ -34,7 +34,7 @@ define ["jquery", "jquery.ui", "backbone", "js/views/feedback_prompt", "js/views checkbox_element = event.target tab_element = $(checkbox_element).parents(".course-tab")[0] - saving = new NotificationView.Mini({title: gettext("Saving…")}) + saving = new NotificationView.Mini({title: gettext("Saving")}) saving.show() $.ajax({ @@ -64,7 +64,7 @@ define ["jquery", "jquery.ui", "backbone", "js/views/feedback_prompt", "js/views analytics.track "Reordered Pages", course: course_location_analytics - saving = new NotificationView.Mini({title: gettext("Saving…")}) + saving = new NotificationView.Mini({title: gettext("Saving")}) saving.show() $.ajax({ @@ -114,7 +114,7 @@ define ["jquery", "jquery.ui", "backbone", "js/views/feedback_prompt", "js/views course: course_location_analytics id: $component.data('locator') deleting = new NotificationView.Mini - title: gettext('Deleting…') + title: gettext('Deleting') deleting.show() $.ajax({ type: 'DELETE', diff --git a/cms/static/coffee/src/xblock/cms.runtime.v1.coffee b/cms/static/coffee/src/xblock/cms.runtime.v1.coffee index d38640d091..082d2fb74d 100644 --- a/cms/static/coffee/src/xblock/cms.runtime.v1.coffee +++ b/cms/static/coffee/src/xblock/cms.runtime.v1.coffee @@ -55,7 +55,7 @@ define [ _handleSave: (data) -> # Starting to save, so show a notification if data.state == 'start' - message = data.message || gettext('Saving…') + message = data.message || gettext('Saving') @notification = new NotificationView.Mini title: message @notification.show() diff --git a/cms/static/js/models/section.js b/cms/static/js/models/section.js index 09272a6ce9..ca167e9304 100644 --- a/cms/static/js/models/section.js +++ b/cms/static/js/models/section.js @@ -25,7 +25,7 @@ define(["backbone", "gettext", "js/views/feedback_notification", "js/utils/modul showNotification: function() { if(!this.msg) { this.msg = new NotificationView.Mini({ - title: gettext("Saving…") + title: gettext("Saving") }); } this.msg.show(); diff --git a/cms/static/js/utils/drag_and_drop.js b/cms/static/js/utils/drag_and_drop.js index 23c3404559..a88589d2b6 100644 --- a/cms/static/js/utils/drag_and_drop.js +++ b/cms/static/js/utils/drag_and_drop.js @@ -289,7 +289,7 @@ define(["jquery", "jquery.ui", "underscore", "gettext", "js/views/feedback_notif }; saving = new NotificationView.Mini({ - title: gettext('Saving…') + title: gettext('Saving') }); saving.show(); element.addClass('was-dropped'); diff --git a/cms/static/js/views/asset.js b/cms/static/js/views/asset.js index 480df08854..074313fa7b 100644 --- a/cms/static/js/views/asset.js +++ b/cms/static/js/views/asset.js @@ -77,7 +77,7 @@ var AssetView = BaseView.extend({ lockAsset: function(e) { var asset = this.model; var saving = new NotificationView.Mini({ - title: gettext("Saving…") + title: gettext("Saving") }).show(); asset.save({'locked': !asset.get('locked')}, { wait: true, // This means we won't re-render until we get back the success state. diff --git a/cms/static/js/views/assets.js b/cms/static/js/views/assets.js index fe58c11aa4..db15583a62 100644 --- a/cms/static/js/views/assets.js +++ b/cms/static/js/views/assets.js @@ -156,8 +156,8 @@ define(["jquery", "underscore", "gettext", "js/models/asset", "js/views/paging", var error = gettext("File {filename} exceeds maximum size of {maxFileSizeInMBs} MB") .replace("{filename}", filename) .replace("{maxFileSizeInMBs}", self.maxFileSizeInMBs) - - // disable second part of message for any falsy value, + + // disable second part of message for any falsy value, // which can be null or an empty string if(self.maxFileSizeRedirectUrl) { var instructions = gettext("Please follow the instructions here to upload a file elsewhere and link to it: {maxFileSizeRedirectUrl}") diff --git a/cms/static/js/views/components/add_xblock.js b/cms/static/js/views/components/add_xblock.js index 2ee14d12e8..658a73be0a 100644 --- a/cms/static/js/views/components/add_xblock.js +++ b/cms/static/js/views/components/add_xblock.js @@ -60,7 +60,7 @@ define(["jquery", "underscore", "gettext", "js/views/baseview", "js/views/utils/ event.preventDefault(); this.closeNewComponent(event); ViewUtils.runOperationShowingMessage( - gettext('Adding…'), + gettext('Adding'), _.bind(this.options.createComponent, this, saveData, element) ).always(function() { // Restore the scroll position of the buttons so that the new diff --git a/cms/static/js/views/container.js b/cms/static/js/views/container.js index a99993fe5d..97f87ae83e 100644 --- a/cms/static/js/views/container.js +++ b/cms/static/js/views/container.js @@ -39,7 +39,7 @@ define(["jquery", "underscore", "js/views/xblock", "js/utils/module", "gettext", } saving = new NotificationView.Mini({ - title: gettext('Saving…') + title: gettext('Saving') }); saving.show(); diff --git a/cms/static/js/views/course_info_handout.js b/cms/static/js/views/course_info_handout.js index 646e326b03..a1b968177c 100644 --- a/cms/static/js/views/course_info_handout.js +++ b/cms/static/js/views/course_info_handout.js @@ -56,7 +56,7 @@ define(["js/views/baseview", "codemirror", "js/views/feedback_notification", "js if ($('.CodeMirror-lines').find('.cm-error').length == 0){ this.model.set('data', this.$codeMirror.getValue()); var saving = new NotificationView.Mini({ - title: gettext('Saving…') + title: gettext('Saving') }); saving.show(); this.model.save({}, { diff --git a/cms/static/js/views/course_info_update.js b/cms/static/js/views/course_info_update.js index 255f8b69f4..9bedeca26f 100644 --- a/cms/static/js/views/course_info_update.js +++ b/cms/static/js/views/course_info_update.js @@ -77,7 +77,7 @@ define(["js/views/baseview", "codemirror", "js/models/course_update", targetModel.set({ date : this.dateEntry(event).val(), content : this.$codeMirror.getValue() }); // push change to display, hide the editor, submit the change var saving = new NotificationView.Mini({ - title: gettext('Saving…') + title: gettext('Saving') }); saving.show(); var ele = this.modelDom(event); @@ -145,7 +145,7 @@ define(["js/views/baseview", "codemirror", "js/models/course_update", }); self.modelDom(event).remove(); var deleting = new NotificationView.Mini({ - title: gettext('Deleting…') + title: gettext('Deleting') }); deleting.show(); targetModel.destroy({ diff --git a/cms/static/js/views/edit_textbook.js b/cms/static/js/views/edit_textbook.js index e6033a3f62..403ce4c917 100644 --- a/cms/static/js/views/edit_textbook.js +++ b/cms/static/js/views/edit_textbook.js @@ -60,7 +60,7 @@ define(["js/views/baseview", "underscore", "jquery", "js/views/edit_chapter", "j this.setValues(); if(!this.model.isValid()) { return; } var saving = new NotificationView.Mini({ - title: gettext("Saving") + "…" + title: gettext("Saving") }).show(); var that = this; this.model.save({}, { diff --git a/cms/static/js/views/group_configuration_edit.js b/cms/static/js/views/group_configuration_edit.js index 8ffc5613d9..3c5c59591f 100644 --- a/cms/static/js/views/group_configuration_edit.js +++ b/cms/static/js/views/group_configuration_edit.js @@ -113,7 +113,7 @@ function(BaseView, _, $, gettext, GroupEdit, ViewUtils) { } ViewUtils.runOperationShowingMessage( - gettext('Saving') + '…', + gettext('Saving'), function () { var dfd = $.Deferred(); diff --git a/cms/static/js/views/group_configuration_item.js b/cms/static/js/views/group_configuration_item.js index 90b407d5c1..2b2e192d1d 100644 --- a/cms/static/js/views/group_configuration_item.js +++ b/cms/static/js/views/group_configuration_item.js @@ -41,7 +41,7 @@ define([ gettext('Delete'), function() { return ViewUtils.runOperationShowingMessage( - gettext('Deleting') + '…', + gettext('Deleting'), function () { return self.model.destroy({ wait: true }); } diff --git a/cms/static/js/views/modals/edit_xblock.js b/cms/static/js/views/modals/edit_xblock.js index ef2de588a0..65d97ad636 100644 --- a/cms/static/js/views/modals/edit_xblock.js +++ b/cms/static/js/views/modals/edit_xblock.js @@ -150,7 +150,7 @@ define(["jquery", "underscore", "gettext", "js/views/modals/base_modal", "js/vie data = editorView.getXModuleData(); event.preventDefault(); if (data) { - ViewUtils.runOperationShowingMessage(gettext('Saving…'), + ViewUtils.runOperationShowingMessage(gettext('Saving'), function() { return xblockInfo.save(data); }).done(function() { diff --git a/cms/static/js/views/overview.js b/cms/static/js/views/overview.js index ee50094b2e..7bff7a16c0 100644 --- a/cms/static/js/views/overview.js +++ b/cms/static/js/views/overview.js @@ -75,7 +75,7 @@ define(["domReady", "jquery", "jquery.ui", "underscore", "gettext", "js/views/fe }); var saving = new NotificationView.Mini({ - title: gettext("Saving…") + title: gettext("Saving") }); saving.show(); // call into server to commit the new order diff --git a/cms/static/js/views/overview_assignment_grader.js b/cms/static/js/views/overview_assignment_grader.js index e4abd11b64..285103d151 100644 --- a/cms/static/js/views/overview_assignment_grader.js +++ b/cms/static/js/views/overview_assignment_grader.js @@ -68,7 +68,7 @@ define(["js/views/baseview", "underscore", "gettext", "js/models/assignment_grad this.removeMenu(e); var saving = new NotificationView.Mini({ - title: gettext('Saving') + '…' + title: gettext('Saving') }); saving.show(); diff --git a/cms/static/js/views/pages/container.js b/cms/static/js/views/pages/container.js index 5938217888..71619551cd 100644 --- a/cms/static/js/views/pages/container.js +++ b/cms/static/js/views/pages/container.js @@ -216,7 +216,7 @@ define(["jquery", "underscore", "gettext", "js/views/pages/base_page", "js/views // for xblocks that can't be replaced inline, the entire parent will be refreshed. var self = this, parent = xblockElement.parent(); - ViewUtils.runOperationShowingMessage(gettext('Duplicating…'), + ViewUtils.runOperationShowingMessage(gettext('Duplicating'), function() { var scrollOffset = ViewUtils.getScrollOffset(xblockElement), placeholderElement = self.createPlaceholderElement().insertAfter(xblockElement), diff --git a/cms/static/js/views/pages/container_subviews.js b/cms/static/js/views/pages/container_subviews.js index 23a34635fd..df77759876 100644 --- a/cms/static/js/views/pages/container_subviews.js +++ b/cms/static/js/views/pages/container_subviews.js @@ -131,7 +131,7 @@ define(["jquery", "underscore", "gettext", "js/views/baseview", "js/views/utils/ if (e && e.preventDefault) { e.preventDefault(); } - ViewUtils.runOperationShowingMessage(gettext('Publishing…'), + ViewUtils.runOperationShowingMessage(gettext('Publishing'), function () { return xblockInfo.save({publish: 'make_public'}, {patch: true}); }).always(function() { @@ -150,7 +150,7 @@ define(["jquery", "underscore", "gettext", "js/views/baseview", "js/views/utils/ gettext("Are you sure you want to revert to the last published version of the unit? You cannot undo this action."), gettext("Discard Changes"), function () { - ViewUtils.runOperationShowingMessage(gettext('Discarding Changes…'), + ViewUtils.runOperationShowingMessage(gettext('Discarding Changes'), function () { return xblockInfo.save({publish: 'discard_changes'}, {patch: true}); }).always(function() { @@ -193,20 +193,20 @@ define(["jquery", "underscore", "gettext", "js/views/baseview", "js/views/utils/ this.checkStaffLock(enableStaffLock); if (enableStaffLock && !hasInheritedStaffLock) { - ViewUtils.runOperationShowingMessage(gettext('Hiding from Students…'), + ViewUtils.runOperationShowingMessage(gettext('Hiding from Students'), _.bind(saveAndPublishStaffLock, self)); } else if (enableStaffLock && hasInheritedStaffLock) { - ViewUtils.runOperationShowingMessage(gettext('Explicitly Hiding from Students…'), + ViewUtils.runOperationShowingMessage(gettext('Explicitly Hiding from Students'), _.bind(saveAndPublishStaffLock, self)); } else if (!enableStaffLock && hasInheritedStaffLock) { - ViewUtils.runOperationShowingMessage(gettext('Inheriting Student Visibility…'), + ViewUtils.runOperationShowingMessage(gettext('Inheriting Student Visibility'), _.bind(saveAndPublishStaffLock, self)); } else { ViewUtils.confirmThenRunOperation(gettext("Make Visible to Students"), gettext("If the unit was previously published and released to students, any changes you made to the unit when it was hidden will now be visible to students. Do you want to proceed?"), gettext("Make Visible to Students"), function() { - ViewUtils.runOperationShowingMessage(gettext('Making Visible to Students…'), + ViewUtils.runOperationShowingMessage(gettext('Making Visible to Students'), _.bind(saveAndPublishStaffLock, self)); }, function() { diff --git a/cms/static/js/views/show_textbook.js b/cms/static/js/views/show_textbook.js index 2483d6dcc3..795bc2f4d7 100644 --- a/cms/static/js/views/show_textbook.js +++ b/cms/static/js/views/show_textbook.js @@ -37,7 +37,7 @@ define(["js/views/baseview", "underscore", "gettext", "js/views/feedback_notific click: function(view) { view.hide(); var delmsg = new NotificationView.Mini({ - title: gettext("Deleting") + "…" + title: gettext("Deleting") }).show(); textbook.destroy({ complete: function() { diff --git a/cms/static/js/views/utils/xblock_utils.js b/cms/static/js/views/utils/xblock_utils.js index 3fe68f90bd..660212445a 100644 --- a/cms/static/js/views/utils/xblock_utils.js +++ b/cms/static/js/views/utils/xblock_utils.js @@ -44,7 +44,7 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils", "js/util var parentLocator = target.data('parent'), category = target.data('category'), displayName = target.data('default-name'); - return ViewUtils.runOperationShowingMessage(gettext('Adding…'), + return ViewUtils.runOperationShowingMessage(gettext('Adding'), function() { var addOperation = $.Deferred(); analytics.track('Created a ' + category, { @@ -82,7 +82,7 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils", "js/util ), interpolate(gettext('Yes, delete this %(xblock_type)s'), { xblock_type: xblockType }, true), function() { - ViewUtils.runOperationShowingMessage(gettext('Deleting…'), + ViewUtils.runOperationShowingMessage(gettext('Deleting'), function() { return $.ajax({ type: 'DELETE', @@ -112,7 +112,7 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils", "js/util */ updateXBlockField = function(xblockInfo, fieldName, newValue) { var requestData = createUpdateRequestData(fieldName, newValue); - return ViewUtils.runOperationShowingMessage(gettext('Saving…'), + return ViewUtils.runOperationShowingMessage(gettext('Saving'), function() { return xblockInfo.save(requestData, { patch: true }); }); @@ -127,7 +127,7 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils", "js/util */ updateXBlockFields = function(xblockInfo, xblockData, options) { options = _.extend({}, { patch: true }, options); - return ViewUtils.runOperationShowingMessage(gettext('Saving…'), + return ViewUtils.runOperationShowingMessage(gettext('Saving'), function() { return xblockInfo.save(xblockData, options); } diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html index 8981cd4f2a..f6967aff7a 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -53,7 +53,7 @@
-

${_("Loading…")}

+

${_("Loading")}

diff --git a/cms/templates/container.html b/cms/templates/container.html index 574d0c7ae1..2bcd978ba3 100644 --- a/cms/templates/container.html +++ b/cms/templates/container.html @@ -100,7 +100,7 @@ from django.utils.translation import ugettext as _
-

${_("Loading...")}

+

${_("Loading")}