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

Merge pull request #1849 from ONLYOFFICE/fix/bug-45622

Browse source 
For Bug 45622
This commit is contained in:
Julia Radzhabova 2022-07-12 14:16:06 +03:00 committed by GitHub
parent 4e43a14ffd d1d3275331
commit 98a418f7e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -310,6 +310,13 @@ define([
'<tr class="edit">',
'<td colspan="2"><button type="button" class="btn btn-text-default" id="fms-btn-auto-correct" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.txtAutoCorrect %></button></div></td>',
'</tr>',
'<tr class ="edit divider-group"></tr>',
'<tr class="edit">',
'<td colspan="2" class="group-name"><label><%= scope.txtCalculating %></label></td>',
'</tr>',
'<tr class="edit">',
'<td colspan="2"><span id="fms-chb-date-1904"></span></td>',
'</tr>',
'<tr class ="edit divider-group"></tr>',
'<tr class="fms-btn-apply">',
'<td style="padding-top:15px; padding-bottom: 15px;"><button class="btn normal dlg-btn primary" data-hint="3" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
@ -692,6 +699,14 @@ define([
dataHintOffset: 'small'
});
this.chDateSystem = new Common.UI.CheckBox({
el: $markup.findById('#fms-chb-date-1904'),
labelText: this.strDateFormat1904,
dataHint: '2',
dataHintDirection: 'left',
dataHintOffset: 'small'
});
this.btnAutoCorrect = new Common.UI.Button({
el: $markup.findById('#fms-btn-auto-correct')
});
@ -909,6 +924,7 @@ define([
this.chIgnoreUppercase.setValue(Common.Utils.InternalSettings.get("sse-spellcheck-ignore-uppercase-words"));
this.chIgnoreNumbers.setValue(Common.Utils.InternalSettings.get("sse-spellcheck-ignore-numbers-words"));
this.chDateSystem.setValue(this.api.asc_getDate1904());
}
},
@ -990,6 +1006,9 @@ define([
this.menu.fireEvent('spellcheck:apply', [this.menu]);
}
}
if (this.mode.isEdit)
this.api.asc_setDate1904(this.chDateSystem.isChecked());
},
updateRegionalExample: function(landId) {
@ -1148,7 +1167,9 @@ define([
txtAutoCorrect: 'AutoCorrect options...',
txtFastTip: 'Real-time co-editing. All changes are saved automatically',
txtStrictTip: 'Use the \'Save\' button to sync the changes you and others make',
strShowOthersChanges: 'Show changes from other users'
strShowOthersChanges: 'Show changes from other users',
txtCalculating: 'Calculating',
strDateFormat1904: 'Use 1904 date system'
}, SSE.Views.FileMenuPanels.MainSettingsGeneral || {}));

2
apps/spreadsheeteditor/main/locale/en.json
View file

@ -2212,6 +2212,8 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWorkspace": "Workspace",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtZh": "Chinese",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCalculating": "Calculating",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strDateFormat1904": "Use 1904 date system",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.strShowOthersChanges": "Show changes from other users",
"SSE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Warning",
"SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "With password",