Commit 24788cba authored by Sergey Luzyanin's avatar Sergey Luzyanin

Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop

parents ee46ce37 77e6fff9
...@@ -166,6 +166,7 @@ ...@@ -166,6 +166,7 @@
cIF.prototype.constructor = cIF; cIF.prototype.constructor = cIF;
cIF.prototype.argumentsMin = 1; cIF.prototype.argumentsMin = 1;
cIF.prototype.argumentsMax = 3; cIF.prototype.argumentsMax = 3;
cIF.prototype.numFormat = AscCommonExcel.cNumFormatNone;
cIF.prototype.Calculate = function (arg) { cIF.prototype.Calculate = function (arg) {
var arg0 = arg[0], arg1 = arg[1], arg2 = arg[2]; var arg0 = arg[0], arg1 = arg[1], arg2 = arg[2];
......
...@@ -3740,7 +3740,7 @@ function setCurrentCultureInfo(val) { ...@@ -3740,7 +3740,7 @@ function setCurrentCultureInfo(val) {
case '4': case '4':
case '5': case '5':
if (year > 0) { if (year > 0) {
dateElems.push('y'.repeat(month)); dateElems.push('y'.repeat(year));
} }
break; break;
} }
......
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