Skip to content

Commit

Permalink
Merge pull request 'fix/bugfix' (#30) from fix/bugfix into release/v8…
Browse files Browse the repository at this point in the history
….2.0
  • Loading branch information
Julia Radzhabova committed Sep 18, 2024
2 parents 61fdb33 + d7501fc commit 737a824
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
9 changes: 6 additions & 3 deletions apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,10 @@ define([], function () {
restoreMenuHeightAndTop: 110,
editable : false,
cls : 'input-group-nr',
data : regdata
data : regdata,
dataHint : '2',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}).on('selected', function(combo, record) {
me.updateRegionalExample(record.value);
var isBaseSettings = me.chSeparator.getValue();
Expand Down Expand Up @@ -1283,8 +1286,8 @@ define([], function () {
info.asc_setSymbol(landId);
var arr = this.api.asc_getFormatCells(info); // all formats
text = this.api.asc_getLocaleExample(arr[4], 1000.01, landId);
text = text + ' ' + this.api.asc_getLocaleExample(arr[5], Asc.cDate().getExcelDateWithTime(), landId);
text = text + ' ' + this.api.asc_getLocaleExample(arr[7], Asc.cDate().getExcelDateWithTime(), landId);
text = text + ' ' + this.api.asc_getLocaleExample(arr[5], Asc.cDate().getExcelDateWithTime(true), landId);
text = text + ' ' + this.api.asc_getLocaleExample(arr[7], Asc.cDate().getExcelDateWithTime(true), landId);
}
$('#fms-lbl-reg-settings').text(_.isEmpty(text) ? '' : this.strRegSettingsEx + text);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ class ApplicationSettingsController extends Component {

const arr = api.asc_getFormatCells(info);
const text4 = api.asc_getLocaleExample(arr[4], 1000.01, regCode),
text5 = api.asc_getLocaleExample(arr[5], Asc.cDate().getExcelDateWithTime(), regCode),
text6 = api.asc_getLocaleExample(arr[7], Asc.cDate().getExcelDateWithTime(), regCode);
text5 = api.asc_getLocaleExample(arr[5], Asc.cDate().getExcelDateWithTime(true), regCode),
text6 = api.asc_getLocaleExample(arr[7], Asc.cDate().getExcelDateWithTime(true), regCode);

this.props.storeApplicationSettings.setRegExample(`${text4} ${text5} ${text6}`);
}
Expand Down

0 comments on commit 737a824

Please sign in to comment.