Commit f507e4f9 authored by Weblate's avatar Weblate

Merge remote-tracking branch 'origin/master'

parents 623b49cb a7802a74
......@@ -31,7 +31,7 @@
{{ unit.1.checksum }}
{{ unit.1.target }}
<br />
{{ unit.1.fuzzy }}<label for="id_{{ unit.0.checksum }}_fuzzy">{% trans "Fuzzy" context "Message is fuzzy" %}</label>
{{ unit.1.fuzzy }} <label for="id_{{ unit.0.checksum }}_fuzzy">{% trans "Fuzzy" context "Message is fuzzy" %}</label>
</form>
</td>
</tr>
......
......@@ -182,14 +182,15 @@ function zen_editor(e) {
$row.addClass('translation-modified');
var form = $row.find('form');
$('#loading-' + checksum).show();
var statusdiv = $('#status-' + checksum).hide();
var loadingdiv = $('#loading-' + checksum).show();
$.post(
form.attr('action'),
form.serialize(),
function (data) {
var messages = $('<div>' + data + '</div>');
var statusdiv = $('#status-' + checksum);
$('#loading-' + checksum).hide();
loadingdiv.hide();
statusdiv.show();
if (messages.find('.alert-danger').length > 0) {
statusdiv.attr('class', 'glyphicon-remove-sign text-danger');
} else if (messages.find('.alert-warning').length > 0) {
......@@ -199,10 +200,13 @@ function zen_editor(e) {
} else {
statusdiv.attr('class', 'glyphicon-ok-sign text-success');
}
statusdiv.addClass('glyphicon').tooltip({
'html': true,
'title': data
});
statusdiv.addClass('glyphicon').tooltip('destroy');
if (data.trim() !== '') {
statusdiv.tooltip({
'html': true,
'title': data
});
};
$row.removeClass('translation-modified').addClass('translation-saved');
}
);
......
......@@ -302,6 +302,7 @@ class TranslationForm(ChecksumForm):
),
'fuzzy': unit.fuzzy,
}
kwargs['auto_id'] = 'id_{0}_%s'.format(unit.checksum)
tabindex = kwargs.pop('tabindex', 100)
super(TranslationForm, self).__init__(
translation, *args, **kwargs
......
......@@ -27,6 +27,7 @@ from whoosh.filedb.filestore import FileStorage
from whoosh import qparser
from django.db.models.signals import post_syncdb
from django.db.utils import IntegrityError
from django.db import transaction
from weblate import appsettings
from whoosh.writing import AsyncWriter, BufferedWriter
from django.dispatch import receiver
......@@ -158,10 +159,11 @@ def update_index_unit(unit, source=True):
if appsettings.OFFLOAD_INDEXING:
from weblate.trans.models.search import IndexUpdate
try:
IndexUpdate.objects.create(
unit=unit,
source=source,
)
with transaction.atomic():
IndexUpdate.objects.create(
unit=unit,
source=source,
)
except IntegrityError:
update = IndexUpdate.objects.get(unit=unit)
if not update.source and source:
......
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