diff --git a/apps/common/main/lib/util/LanguageInfo.js b/apps/common/main/lib/util/LanguageInfo.js index b672b15c6..7a6031c5b 100644 --- a/apps/common/main/lib/util/LanguageInfo.js +++ b/apps/common/main/lib/util/LanguageInfo.js @@ -38,10 +38,11 @@ * */ -if (Common === undefined) { - var Common = {}; +if ( window.Common === undefined ) { + window.Common = {}; } +// TODO: move to Common.Utils Common.util = Common.util||{}; Common.util.LanguageInfo = new(function() { diff --git a/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx b/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx index 17a307311..cf9f616eb 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx @@ -20,13 +20,12 @@ class ApplicationSettingsController extends Component { info.asc_setType(Asc.c_oAscNumFormatType.None); info.asc_setSymbol(regSettings); - let arr = api.asc_getFormatCells(info); - let text = api.asc_getLocaleExample(arr[4], 1000.01, regSettings); + const arr = api.asc_getFormatCells(info); + 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); - text = text + ' ' + api.asc_getLocaleExample(arr[6], Asc.cDate().getExcelDateWithTime(), regSettings); - - this.textRegSettingsExample = text; + this.textRegSettingsExample = `${text4} ${text5} ${text6}`; } onChangeDisplayComments(displayComments) { diff --git a/apps/spreadsheeteditor/mobile/src/page/app.jsx b/apps/spreadsheeteditor/mobile/src/page/app.jsx index fe83bfcab..83feeb19a 100644 --- a/apps/spreadsheeteditor/mobile/src/page/app.jsx +++ b/apps/spreadsheeteditor/mobile/src/page/app.jsx @@ -8,6 +8,7 @@ import { f7ready } from 'framework7-react'; import routes from '../router/routes.js'; import '../../../../common/main/lib/util/utils.js'; +import '../../../../common/main/lib/util/LanguageInfo.js'; import Notifications from '../../../../common/mobile/utils/notifications.js' import {MainController} from '../controller/Main'; import {Device} from '../../../../common/mobile/utils/device'