Commit 37d965d6 by David Baumgold

Merge pull request #6629 from edx/remove-ellipses

Remove all ellipses
parents 54250935 c4a7d770
......@@ -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)
......
......@@ -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',
......
......@@ -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()
......
......@@ -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();
......
......@@ -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');
......
......@@ -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.
......
......@@ -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}")
......
......@@ -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
......
......@@ -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();
......
......@@ -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({}, {
......
......@@ -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({
......
......@@ -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({}, {
......
......@@ -113,7 +113,7 @@ function(BaseView, _, $, gettext, GroupEdit, ViewUtils) {
}
ViewUtils.runOperationShowingMessage(
gettext('Saving') + '…',
gettext('Saving'),
function () {
var dfd = $.Deferred();
......
......@@ -41,7 +41,7 @@ define([
gettext('Delete'),
function() {
return ViewUtils.runOperationShowingMessage(
gettext('Deleting') + '…',
gettext('Deleting'),
function () {
return self.model.destroy({ wait: true });
}
......
......@@ -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() {
......
......@@ -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
......
......@@ -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();
......
......@@ -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),
......
......@@ -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() {
......
......@@ -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() {
......
......@@ -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);
}
......
......@@ -53,7 +53,7 @@
<article class="content-primary" role="main">
<div class="wrapper-assets" />
<div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading&hellip;")}</span></p>
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading")}</span></p>
</div>
</article>
......
......@@ -100,7 +100,7 @@ from django.utils.translation import ugettext as _
<section class="wrapper-xblock level-page is-hidden studio-xblock-wrapper" data-locator="${xblock_locator | h}" data-course-key="${xblock_locator.course_key | h}">
</section>
<div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading...")}</span></p>
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading")}</span></p>
</div>
</article>
<aside class="content-supplementary" role="complementary">
......
......@@ -111,7 +111,7 @@ from contentstore.utils import reverse_usage_url
</article>
</div>
<div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading...")}</span></p>
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">${_("Loading")}</span></p>
</div>
</article>
<aside class="content-supplementary" role="complementary">
......
......@@ -44,7 +44,7 @@
</article>
</div>
<div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading...</span></p>
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading</span></p>
</div>
</article>
<aside class="content-supplementary" role="complementary">
......
......@@ -20,7 +20,7 @@
<section class="content">
<article class="content-primary" role="main">
<div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading...</span></p>
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading</span></p>
</div>
</article>
<aside class="content-supplementary" role="complementary"></aside>
......
......@@ -61,7 +61,7 @@
<article class="content-primary">
<div class="ui-loading">
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading...</span></p>
<p><span class="spin"><i class="icon fa fa-refresh"></i></span> <span class="copy">Loading</span></p>
</div>
<div class="no-container-content">
<p>This page has no content yet.</p>
......
......@@ -751,7 +751,7 @@ from django.core.urlresolvers import reverse
<div class="ui-loading is-hidden">
<p><span class="spin">
<i class="icon fa fa-refresh"></i></span>
<span class="copy">Loading &hellip;</span>
<span class="copy">Loading</span>
</p>
</div>
......
......@@ -8,7 +8,7 @@ window.SplitTestAuthorView = function (runtime, element) {
runtime.notify('save', {
state: 'start',
element: element,
message: gettext('Creating missing groups&hellip;')
message: gettext('Creating missing groups')
});
$.post(runtime.handlerUrl(element, 'add_missing_groups')).done(function() {
runtime.notify('save', {
......
......@@ -340,7 +340,7 @@ browser and pasting the output. When that file changes, this one should be rege
Add a clear and descriptive title to encourage participation.
</span>
</div>
<div class="post-field js-post-body editor" name="body" data-placeholder="Enter your question or comment"></div>
<div class="post-field js-post-body editor" name="body" data-placeholder="Enter your question or comment"></div>
<div class="post-options">
<label class="post-option is-enabled">
<input type="checkbox" name="follow" class="post-option-input js-follow" checked>
......
......@@ -67,7 +67,7 @@ class DataDownload
# Dynamically generate slickgrid table for displaying student profile information
@clear_display()
@$download_display_table.text gettext('Loading...')
@$download_display_table.text gettext('Loading')
# fetch user list
$.ajax
......
......@@ -68,7 +68,7 @@ class Extensions
@$show_unit_extensions.click =>
@clear_display()
@$grid_table.text 'Loading...'
@$grid_table.text 'Loading'
@$url_input = @$section.find("#view-granted-extensions select[name='url']")
url = @$show_unit_extensions.data 'endpoint'
......@@ -83,7 +83,7 @@ class Extensions
@$show_student_extensions.click =>
@clear_display()
@$grid_table.text 'Loading...'
@$grid_table.text 'Loading'
url = @$show_student_extensions.data 'endpoint'
@$student_input = @$section.find("#view-granted-extensions input[name='student']")
......
......@@ -477,14 +477,14 @@ function goto( mode)
<div class="metrics-tooltip" id="metric_tooltip_${i}"></div>
<div class="metrics-left" id="metric_opened_${i}">
<h3>${_("Count of Students that Opened a Subsection")}</h3>
<p class="loading"><i class="icon fa fa-spinner fa-spin fa-large"></i>${_("Loading...")}</p>
<p class="loading"><i class="icon fa fa-spinner fa-spin fa-large"></i>${_("Loading")}</p>
</div>
<div class="metrics-right" id="metric_grade_${i}">
<h3>${_("Grade Distribution per Problem")}</h3>
%if not metrics_results['section_has_problem'][i]:
<p>${_("There are no problems in this section.")}</p>
%else:
<p class="loading"><i class="icon fa fa-spinner fa-spin fa-large"></i>${_("Loading...")}</p>
<p class="loading"><i class="icon fa fa-spinner fa-spin fa-large"></i>${_("Loading")}</p>
%endif
</div>
</div>
......
......@@ -411,7 +411,7 @@
${_("Add a clear and descriptive title to encourage participation.")}
</span>
</div>
<div class="post-field js-post-body editor" name="body" data-placeholder="${_(u'Enter your question or comment…')}"></div>
<div class="post-field js-post-body editor" name="body" data-placeholder="${_('Enter your question or comment')}"></div>
<div class="post-options">
<label class="post-option is-enabled">
<input type="checkbox" name="follow" class="post-option-input js-follow" checked>
......
......@@ -150,7 +150,7 @@
var nothingText = "${_('There are no problems in this section.')}";
var loadingText = "${_('Loading...')}";
var loadingText = "${_('Loading')}";
var nothingP = '<p class="nothing">' + nothingText + '</p>';
var loading = '<p class="loading"><i class="icon fa fa-spinner fa-spin fa-large"></i>' + loadingText + '</p>';
......
......@@ -109,7 +109,7 @@
$submitButton.
addClass('is-disabled').
prop('disabled', true).
text("${_(u'Processing your account information')}");
text("${_(u'Processing your account information')}");
}
}
......
......@@ -42,7 +42,7 @@
$(function() {
var form = $("#disable-form");
$("#submit-form").click(function(){
$("#account-change-status").text("${_('working...')}");
$("#account-change-status").text("${_('working')}");
$.ajax({
type: "POST",
url: form.attr('action'),
......
......@@ -80,7 +80,7 @@
addClass('is-disabled').
attr('aria-disabled', true).
prop('disabled', true).
text("${_(u'Processing your account information …')}");
text("${_('Processing your account information')}");
}
}
</script>
......
......@@ -88,7 +88,7 @@
$submitButton.
addClass('is-disabled').
prop('disabled', true).
text("${_(u'Processing your account information…')}");
text("${_('Processing your account information')}");
}
}
</script>
......
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