Merge branch 'release/v8.2.0' of git.onlyoffice.com:ONLYOFFICE/web-ap…

…ps into release/v8.2.0
ONLYOFFICE · Sep 18, 2024 · b903384 · b903384
2 parents 4b2989e + 737a824
commit b903384
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
@@ -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();
@@ -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);
             }

diff --git a/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx b/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx
@@ -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}`);
     }