Merge branch 'feature/mobile-apps-on-reactjs-se-edit-settings' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs-se-edit-settings
This commit is contained in:
commit
9bb4c5fbaa
|
@ -38,10 +38,11 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (Common === undefined) {
|
if ( window.Common === undefined ) {
|
||||||
var Common = {};
|
window.Common = {};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: move to Common.Utils
|
||||||
Common.util = Common.util||{};
|
Common.util = Common.util||{};
|
||||||
|
|
||||||
Common.util.LanguageInfo = new(function() {
|
Common.util.LanguageInfo = new(function() {
|
||||||
|
|
|
@ -20,13 +20,12 @@ class ApplicationSettingsController extends Component {
|
||||||
info.asc_setType(Asc.c_oAscNumFormatType.None);
|
info.asc_setType(Asc.c_oAscNumFormatType.None);
|
||||||
info.asc_setSymbol(regSettings);
|
info.asc_setSymbol(regSettings);
|
||||||
|
|
||||||
let arr = api.asc_getFormatCells(info);
|
const arr = api.asc_getFormatCells(info);
|
||||||
let text = api.asc_getLocaleExample(arr[4], 1000.01, regSettings);
|
const text4 = api.asc_getLocaleExample(arr[4], 1000.01, regSettings),
|
||||||
|
text5 = api.asc_getLocaleExample(arr[5], Asc.cDate().getExcelDateWithTime(), regSettings),
|
||||||
|
text6 = api.asc_getLocaleExample(arr[6], Asc.cDate().getExcelDateWithTime(), regSettings);
|
||||||
|
|
||||||
text = text + ' ' + api.asc_getLocaleExample(arr[5], Asc.cDate().getExcelDateWithTime(), regSettings);
|
this.textRegSettingsExample = `${text4} ${text5} ${text6}`;
|
||||||
text = text + ' ' + api.asc_getLocaleExample(arr[6], Asc.cDate().getExcelDateWithTime(), regSettings);
|
|
||||||
|
|
||||||
this.textRegSettingsExample = text;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onChangeDisplayComments(displayComments) {
|
onChangeDisplayComments(displayComments) {
|
||||||
|
|
|
@ -8,6 +8,7 @@ import { f7ready } from 'framework7-react';
|
||||||
import routes from '../router/routes.js';
|
import routes from '../router/routes.js';
|
||||||
|
|
||||||
import '../../../../common/main/lib/util/utils.js';
|
import '../../../../common/main/lib/util/utils.js';
|
||||||
|
import '../../../../common/main/lib/util/LanguageInfo.js';
|
||||||
import Notifications from '../../../../common/mobile/utils/notifications.js'
|
import Notifications from '../../../../common/mobile/utils/notifications.js'
|
||||||
import {MainController} from '../controller/Main';
|
import {MainController} from '../controller/Main';
|
||||||
import {Device} from '../../../../common/mobile/utils/device'
|
import {Device} from '../../../../common/mobile/utils/device'
|
||||||
|
|
Loading…
Reference in a new issue