Project

General

Profile

« Previous | Next » 

Revision ad01d4d2

Added by Walden Raines over 10 years ago

fixes #3984 - use __ instead of _ for i18n to avoid conflict with underscore.js

View differences:

app/assets/javascripts/application.js
if (status == "error") {
$(div).html('<div class="alert alert-warning alert-dismissable">' +
'<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>' +
_('Sorry but no templates were configured.') + '</div>');
__('Sorry but no templates were configured.') + '</div>');
}
});
}
......
var query = encodeURI($("#search").val());
var url = $("#bookmark").attr('data-url');
$("#bookmarks-modal .modal-body").empty();
$("#bookmarks-modal .modal-body").append("<span id='loading'>" + _('Loading ...') + "</span>");
$("#bookmarks-modal .modal-body").append("<span id='loading'>" + __('Loading ...') + "</span>");
$("#bookmarks-modal .modal-body").load(url + '&query=' + query + ' form',
function(response, status, xhr) {
$("#loading").hide();
......
var url = $(this).attr('data-ajax-url');
$(this).load(url, function(response, status, xhr) {
if (status == "error") {
$(this).closest(".tab-content").find("#spinner").html(_('Failed to fetch: ') + xhr.status + " " + xhr.statusText);
$(this).closest(".tab-content").find("#spinner").html(__('Failed to fetch: ') + xhr.status + " " + xhr.statusText);
}
});
});

Also available in: Unified diff