[DE] For bug 59618
This commit is contained in:
parent
5067a87300
commit
d2e30f63e1
|
@ -1983,6 +1983,26 @@ define([
|
||||||
config.msg = this.errorPasswordIsNotCorrect;
|
config.msg = this.errorPasswordIsNotCorrect;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case Asc.c_oAscError.ID.InconsistentOpenError:
|
||||||
|
errData = {
|
||||||
|
get_Value: function() {
|
||||||
|
return 'xlsx';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
config.maxwidth = 600;
|
||||||
|
var errvalue = errData ? errData.get_Value() : '';
|
||||||
|
if (errvalue === 'pdf')
|
||||||
|
config.msg = this.errorInconsistentExtPdf.replace('%1', this.document.fileType || '');
|
||||||
|
else if (errvalue === 'docx')
|
||||||
|
config.msg = this.errorInconsistentExtDocx.replace('%1', this.document.fileType || '');
|
||||||
|
else if (errvalue === 'xlsx')
|
||||||
|
config.msg = this.errorInconsistentExtXlsx.replace('%1', this.document.fileType || '');
|
||||||
|
else if (errvalue === 'pptx')
|
||||||
|
config.msg = this.errorInconsistentExtPptx.replace('%1', this.document.fileType || '');
|
||||||
|
else
|
||||||
|
config.msg = this.errorInconsistentExt;
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
|
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
|
||||||
break;
|
break;
|
||||||
|
@ -3287,7 +3307,12 @@ define([
|
||||||
errorPasswordIsNotCorrect: 'The password you supplied is not correct.<br>Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.',
|
errorPasswordIsNotCorrect: 'The password you supplied is not correct.<br>Verify that the CAPS LOCK key is off and be sure to use the correct capitalization.',
|
||||||
confirmMaxChangesSize: 'The size of actions exceeds the limitation set for your server.<br>Press "Undo" to cancel your last action or press "Continue" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).',
|
confirmMaxChangesSize: 'The size of actions exceeds the limitation set for your server.<br>Press "Undo" to cancel your last action or press "Continue" to keep action locally (you need to download the file or copy its content to make sure nothing is lost).',
|
||||||
textUndo: 'Undo',
|
textUndo: 'Undo',
|
||||||
textContinue: 'Continue'
|
textContinue: 'Continue',
|
||||||
|
errorInconsistentExtDocx: 'An error has occurred while opening the file.<br>The file content corresponds to text documents (e.g. docx), but the file has the inconsistent extension: %1.',
|
||||||
|
errorInconsistentExtXlsx: 'An error has occurred while opening the file.<br>The file content corresponds to spreadsheets (e.g. xlsx), but the file has the inconsistent extension: %1.',
|
||||||
|
errorInconsistentExtPptx: 'An error has occurred while opening the file.<br>The file content corresponds to presentations (e.g. pptx), but the file has the inconsistent extension: %1.',
|
||||||
|
errorInconsistentExtPdf: 'An error has occurred while opening the file.<br>The file content corresponds to one of the following formats: pdf/djvu/xps/oxps, but the file has the inconsistent extension: %1.',
|
||||||
|
errorInconsistentExt: 'An error has occurred while opening the file.<br>The file content does not match the file extension.'
|
||||||
}
|
}
|
||||||
})(), DE.Controllers.Main || {}))
|
})(), DE.Controllers.Main || {}))
|
||||||
});
|
});
|
Loading…
Reference in a new issue