Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[all] fix bug 47095

Browse source
This commit is contained in:
Maxim Kadushkin 2020-11-27 11:39:38 +03:00
parent 89c68bb64e
commit 4348ef2baf
3 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apps/common/main/lib/util/utils.js
View file

@ -879,23 +879,24 @@ Common.Utils.warningDocumentIsLocked = function (opts) {
opts.disablefunc(true); opts.disablefunc(true);
var app = window.DE || window.PE || window.SSE; var app = window.DE || window.PE || window.SSE;
var tip = new Common.UI.SynchronizeTip({
extCls : 'simple', Common.UI.warning({
text : Common.Locale.get("warnFileLocked",{name:"Common.Translation", default:'Document is in use by another application. You can continue editing and save it as a copy.'}), msg: Common.Locale.get("warnFileLocked",{name:"Common.Translation", default: "You can't edit this file. Document is in use by another application."}),
textLink : Common.Locale.get("txtContinueEditing",{name:app.nameSpace + ".Views.SignatureSettings", default:'Edit anyway'}), buttons: [{
placement : 'document' value: 'view',
}); caption: Common.Locale.get("warnFileLockedBtnView",{name:"Common.Translation", default: "Open for viewing"})
tip.on({ }, {
'dontshowclick': function() { value: 'edit',
if ( opts.disablefunc ) opts.disablefunc(false); caption: Common.Locale.get("warnFileLockedBtnEdit",{name:"Common.Translation", default: "Create a copy"})
app.getController('Main').api.asc_setIsReadOnly(false); }],
this.close(); primary: 'view',
}, callback: function(btn){
'closeclick': function() { if (btn == 'edit') {
this.close(); if ( opts.disablefunc ) opts.disablefunc(false);
app.getController('Main').api.asc_setIsReadOnly(false);
}
} }
}); });
tip.show();
}; };
jQuery.fn.extend({ jQuery.fn.extend({

4
apps/documenteditor/main/locale/en.json
View file

@ -84,7 +84,9 @@
"Common.define.chartData.textPoint": "XY (Scatter)", "Common.define.chartData.textPoint": "XY (Scatter)",
"Common.define.chartData.textStock": "Stock", "Common.define.chartData.textStock": "Stock",
"Common.define.chartData.textSurface": "Surface", "Common.define.chartData.textSurface": "Surface",
"Common.Translation.warnFileLocked": "The file is being edited in another app. You can continue editing and save it as a copy.", "Common.Translation.warnFileLocked": "You can't edit this file because it's being edited in another app.",
"Common.Translation.warnFileLockedBtnView": "Open for viewing",
"Common.Translation.warnFileLockedBtnEdit": "Create a copy",
"Common.UI.Calendar.textApril": "April", "Common.UI.Calendar.textApril": "April",
"Common.UI.Calendar.textAugust": "August", "Common.UI.Calendar.textAugust": "August",
"Common.UI.Calendar.textDecember": "December", "Common.UI.Calendar.textDecember": "December",

4
apps/documenteditor/main/locale/ru.json
View file

@ -84,7 +84,9 @@
"Common.define.chartData.textPoint": "Точечная", "Common.define.chartData.textPoint": "Точечная",
"Common.define.chartData.textStock": "Биржевая", "Common.define.chartData.textStock": "Биржевая",
"Common.define.chartData.textSurface": "Поверхность", "Common.define.chartData.textSurface": "Поверхность",
"Common.Translation.warnFileLocked": "Файл редактируется в другом приложении. Вы можете продолжить редактирование и сохранить его как копию.", "Common.Translation.warnFileLocked": "Вы не можете редактировать этот файл, потому что он уже редактируется в другом приложении.",
"Common.Translation.warnFileLockedBtnView": "Открыть на просмотр",
"Common.Translation.warnFileLockedBtnEdit": "Создать копию",
"Common.UI.Calendar.textApril": "Апрель", "Common.UI.Calendar.textApril": "Апрель",
"Common.UI.Calendar.textAugust": "Август", "Common.UI.Calendar.textAugust": "Август",
"Common.UI.Calendar.textDecember": "Декабрь", "Common.UI.Calendar.textDecember": "Декабрь",