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

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

Browse source
This commit is contained in:
SergeyEzhin 2021-02-25 17:11:02 +03:00
parent 2c44e7f3a3 f6ae276b6b
commit 9bb4c5fbaa
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/common/main/lib/util/LanguageInfo.js
View file

@ -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() {

11
apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx
View file

@ -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) {

1
apps/spreadsheeteditor/mobile/src/page/app.jsx
View file

@ -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'