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

[SSE] Fix Bug 54930

Browse source
This commit is contained in:
ShimaginAndrey 2022-02-08 11:18:35 +03:00
parent 8c35514ced
commit 7558acdd76
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/spreadsheeteditor/mobile/src/controller/add/AddFunction.jsx
View file

@ -15,6 +15,11 @@ class _FunctionGroups extends Component {
this.api = Common.EditorApi.get(); this.api = Common.EditorApi.get();
this.init(); this.init();
}); });
Common.Notifications.on('changeRegSettings', () => {
this.api = Common.EditorApi.get();
this.init();
});
} }
componentDidMount() { componentDidMount() {
Common.Notifications.on('document:ready', () => { Common.Notifications.on('document:ready', () => {
@ -46,7 +51,8 @@ class _FunctionGroups extends Component {
jsonDesc = data; jsonDesc = data;
} }
const grouparr = this.api.asc_getFormulasInfo(); const grouparr = this.api.asc_getFormulasInfo();
this.props.storeFunctions.initFunctions(grouparr, jsonDesc); const separator = this.api.asc_getFunctionArgumentSeparator();
this.props.storeFunctions.initFunctions(grouparr, jsonDesc, separator);
}; };
fetch(`locale/l10n/functions/${this._editorLang}_desc.json`) fetch(`locale/l10n/functions/${this._editorLang}_desc.json`)

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

@ -85,6 +85,7 @@ class ApplicationSettingsController extends Component {
LocalStorage.setItem("sse-settings-regional", regCode); LocalStorage.setItem("sse-settings-regional", regCode);
this.initRegSettings(); this.initRegSettings();
if (regCode!==null) api.asc_setLocale(+regCode); if (regCode!==null) api.asc_setLocale(+regCode);
Common.Notifications.trigger('changeRegSettings');
} }
render() { render() {

8
apps/spreadsheeteditor/mobile/src/store/functions.js
View file

@ -10,11 +10,11 @@ export class storeFunctions {
functions = {}; functions = {};
initFunctions (groups, data) { initFunctions (groups, data, separator) {
this.functions = this.getFunctions(groups, data); this.functions = this.getFunctions(groups, data, separator);
} }
getFunctions (groups, data) { getFunctions (groups, data, separator) {
const functions = {}; const functions = {};
for (let g in groups) { for (let g in groups) {
const group = groups[g]; const group = groups[g];
@ -28,7 +28,7 @@ export class storeFunctions {
type: _name, type: _name,
group: groupname, group: groupname,
caption: func.asc_getLocaleName(), caption: func.asc_getLocaleName(),
args: (data && data[_name]) ? data[_name].a : '', args: ((data && data[_name]) ? data[_name].a : '').replace(/[,;]/g, separator),
descr: (data && data[_name]) ? data[_name].d : '' descr: (data && data[_name]) ? data[_name].d : ''
}; };
} }