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

Bug 43789

Browse source
This commit is contained in:
Julia Radzhabova 2019-12-09 10:49:39 +03:00
parent 5f57bba30f
commit 555e3f1803
6 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -952,7 +952,7 @@ define([
if (this.coreProps) { if (this.coreProps) {
var value = this.coreProps.asc_getCreated(); var value = this.coreProps.asc_getCreated();
if (value) if (value)
this.lblDate.text(value.toLocaleString()); this.lblDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
this._ShowHideInfoItem(this.lblDate, !!value); this._ShowHideInfoItem(this.lblDate, !!value);
} }
}, },
@ -978,7 +978,7 @@ define([
var visible = false; var visible = false;
value = props.asc_getModified(); value = props.asc_getModified();
if (value) if (value)
this.lblModifyDate.text(value.toLocaleString()); this.lblModifyDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
visible = this._ShowHideInfoItem(this.lblModifyDate, !!value) || visible; visible = this._ShowHideInfoItem(this.lblModifyDate, !!value) || visible;
value = props.asc_getLastModifiedBy(); value = props.asc_getLastModifiedBy();
if (value) if (value)

8
apps/documenteditor/mobile/app/controller/Settings.js
View file

@ -86,7 +86,8 @@ define([
_fileKey, _fileKey,
templateInsert, templateInsert,
_metricText = Common.Utils.Metric.getCurrentMetricName(), _metricText = Common.Utils.Metric.getCurrentMetricName(),
_isEdit; _isEdit,
_lang;
var mm2Cm = function(mm) { var mm2Cm = function(mm) {
return parseFloat((mm/10.).toFixed(2)); return parseFloat((mm/10.).toFixed(2));
@ -149,6 +150,7 @@ define([
_isReviewOnly = mode.isReviewOnly; _isReviewOnly = mode.isReviewOnly;
_fileKey = mode.fileKey; _fileKey = mode.fileKey;
_isEdit = mode.isEdit; _isEdit = mode.isEdit;
_lang = mode.lang;
}, },
initEvents: function () { initEvents: function () {
@ -436,11 +438,11 @@ define([
value = props.asc_getDescription(); value = props.asc_getDescription();
value ? $('#settings-doc-comment').html(value) : $('.display-comment').remove(); value ? $('#settings-doc-comment').html(value) : $('.display-comment').remove();
value = props.asc_getModified(); value = props.asc_getModified();
value ? $('#settings-doc-last-mod').html(value.toLocaleString()) : $('.display-last-mode').remove(); value ? $('#settings-doc-last-mod').html(value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(_lang, {timeStyle: 'short'})) : $('.display-last-mode').remove();
value = props.asc_getLastModifiedBy(); value = props.asc_getLastModifiedBy();
value ? $('#settings-doc-mod-by').html(value) : $('.display-mode-by').remove(); value ? $('#settings-doc-mod-by').html(value) : $('.display-mode-by').remove();
value = props.asc_getCreated(); value = props.asc_getCreated();
value ? $('#settings-doc-date').html(value.toLocaleString()) : $('.display-created-date').remove(); value ? $('#settings-doc-date').html(value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(_lang, {timeStyle: 'short'})) : $('.display-created-date').remove();
value = props.asc_getCreator(); value = props.asc_getCreator();
var templateCreator = ""; var templateCreator = "";
value && value.split(/\s*[,;]\s*/).forEach(function(item) { value && value.split(/\s*[,;]\s*/).forEach(function(item) {

4
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -827,7 +827,7 @@ define([
if (this.coreProps) { if (this.coreProps) {
var value = this.coreProps.asc_getCreated(); var value = this.coreProps.asc_getCreated();
if (value) if (value)
this.lblDate.text(value.toLocaleString()); this.lblDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
this._ShowHideInfoItem(this.lblDate, !!value); this._ShowHideInfoItem(this.lblDate, !!value);
} }
}, },
@ -853,7 +853,7 @@ define([
var visible = false; var visible = false;
value = props.asc_getModified(); value = props.asc_getModified();
if (value) if (value)
this.lblModifyDate.text(value.toLocaleString()); this.lblModifyDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
visible = this._ShowHideInfoItem(this.lblModifyDate, !!value) || visible; visible = this._ShowHideInfoItem(this.lblModifyDate, !!value) || visible;
value = props.asc_getLastModifiedBy(); value = props.asc_getLastModifiedBy();
if (value) if (value)

8
apps/presentationeditor/mobile/app/controller/Settings.js
View file

@ -57,7 +57,8 @@ define([
infoObj, infoObj,
modalView, modalView,
_licInfo, _licInfo,
templateInsert; templateInsert,
_lang;
var _slideSizeArr = [ var _slideSizeArr = [
[254, 190.5], [254, 143] [254, 190.5], [254, 143]
@ -96,6 +97,7 @@ define([
this.getView('Settings').setMode(mode); this.getView('Settings').setMode(mode);
if (mode.canBranding) if (mode.canBranding)
_licInfo = mode.customization; _licInfo = mode.customization;
_lang = mode.lang;
}, },
initEvents: function () { initEvents: function () {
@ -221,11 +223,11 @@ define([
value = props.asc_getDescription(); value = props.asc_getDescription();
value ? $('#settings-pe-comment').html(value) : $('.display-comment').remove(); value ? $('#settings-pe-comment').html(value) : $('.display-comment').remove();
value = props.asc_getModified(); value = props.asc_getModified();
value ? $('#settings-pe-last-mod').html(value.toLocaleString()) : $('.display-last-mode').remove(); value ? $('#settings-pe-last-mod').html(value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(_lang, {timeStyle: 'short'})) : $('.display-last-mode').remove();
value = props.asc_getLastModifiedBy(); value = props.asc_getLastModifiedBy();
value ? $('#settings-pe-mod-by').html(value) : $('.display-mode-by').remove(); value ? $('#settings-pe-mod-by').html(value) : $('.display-mode-by').remove();
value = props.asc_getCreated(); value = props.asc_getCreated();
value ? $('#settings-pe-date').html(value.toLocaleString()) : $('.display-created-date').remove(); value ? $('#settings-pe-date').html(value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(_lang, {timeStyle: 'short'})) : $('.display-created-date').remove();
value = props.asc_getCreator(); value = props.asc_getCreator();
var templateCreator = ""; var templateCreator = "";
value && value.split(/\s*[,;]\s*/).forEach(function(item) { value && value.split(/\s*[,;]\s*/).forEach(function(item) {

4
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -1469,7 +1469,7 @@ define([
if (this.coreProps) { if (this.coreProps) {
var value = this.coreProps.asc_getCreated(); var value = this.coreProps.asc_getCreated();
if (value) if (value)
this.lblDate.text(value.toLocaleString()); this.lblDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
this._ShowHideInfoItem(this.lblDate, !!value); this._ShowHideInfoItem(this.lblDate, !!value);
} }
}, },
@ -1495,7 +1495,7 @@ define([
var visible = false; var visible = false;
value = props.asc_getModified(); value = props.asc_getModified();
if (value) if (value)
this.lblModifyDate.text(value.toLocaleString()); this.lblModifyDate.text(value.toLocaleString(this.mode.lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(this.mode.lang, {timeStyle: 'short'}));
visible = this._ShowHideInfoItem(this.lblModifyDate, !!value) || visible; visible = this._ShowHideInfoItem(this.lblModifyDate, !!value) || visible;
value = props.asc_getLastModifiedBy(); value = props.asc_getLastModifiedBy();
if (value) if (value)

8
apps/spreadsheeteditor/mobile/app/controller/Settings.js
View file

@ -90,7 +90,8 @@ define([
_regDataCode = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0407 }, {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A }, _regDataCode = [{ value: 0x042C }, { value: 0x0402 }, { value: 0x0405 }, { value: 0x0407 }, {value: 0x0807}, { value: 0x0408 }, { value: 0x0C09 }, { value: 0x0809 }, { value: 0x0409 }, { value: 0x0C0A }, { value: 0x080A },
{ value: 0x040B }, { value: 0x040C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 }, { value: 0x040B }, { value: 0x040C }, { value: 0x0410 }, { value: 0x0411 }, { value: 0x0412 }, { value: 0x0426 }, { value: 0x0413 }, { value: 0x0415 }, { value: 0x0416 },
{ value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }], { value: 0x0816 }, { value: 0x0419 }, { value: 0x041B }, { value: 0x0424 }, { value: 0x081D }, { value: 0x041D }, { value: 0x041F }, { value: 0x0422 }, { value: 0x042A }, { value: 0x0804 }],
_regdata = []; _regdata = [],
_lang;
var mm2Cm = function(mm) { var mm2Cm = function(mm) {
@ -151,6 +152,7 @@ define([
this.getView('Settings').setMode(mode); this.getView('Settings').setMode(mode);
if (mode.canBranding) if (mode.canBranding)
_licInfo = mode.customization; _licInfo = mode.customization;
_lang = mode.lang;
}, },
initEvents: function () { initEvents: function () {
@ -291,11 +293,11 @@ define([
value = props.asc_getDescription(); value = props.asc_getDescription();
value ? $('#settings-sse-comment').html(value) : $('.display-comment').remove(); value ? $('#settings-sse-comment').html(value) : $('.display-comment').remove();
value = props.asc_getModified(); value = props.asc_getModified();
value ? $('#settings-sse-last-mod').html(value.toLocaleString()) : $('.display-last-mode').remove(); value ? $('#settings-sse-last-mod').html(value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(_lang, {timeStyle: 'short'})) : $('.display-last-mode').remove();
value = props.asc_getLastModifiedBy(); value = props.asc_getLastModifiedBy();
value ? $('#settings-sse-mod-by').html(value) : $('.display-mode-by').remove(); value ? $('#settings-sse-mod-by').html(value) : $('.display-mode-by').remove();
value = props.asc_getCreated(); value = props.asc_getCreated();
value ? $('#settings-sse-date').html(value.toLocaleString()) : $('.display-created-date').remove(); value ? $('#settings-sse-date').html(value.toLocaleString(_lang, {year: 'numeric', month: '2-digit', day: '2-digit'}) + ' ' + value.toLocaleString(_lang, {timeStyle: 'short'})) : $('.display-created-date').remove();
value = props.asc_getCreator(); value = props.asc_getCreator();
var templateCreator = ""; var templateCreator = "";
value && value.split(/\s*[,;]\s*/).forEach(function(item) { value && value.split(/\s*[,;]\s*/).forEach(function(item) {