[SSE] Fix Bug 54930
This commit is contained in:
parent
8c35514ced
commit
7558acdd76
|
@ -15,6 +15,11 @@ class _FunctionGroups extends Component {
|
|||
this.api = Common.EditorApi.get();
|
||||
this.init();
|
||||
});
|
||||
|
||||
Common.Notifications.on('changeRegSettings', () => {
|
||||
this.api = Common.EditorApi.get();
|
||||
this.init();
|
||||
});
|
||||
}
|
||||
componentDidMount() {
|
||||
Common.Notifications.on('document:ready', () => {
|
||||
|
@ -46,7 +51,8 @@ class _FunctionGroups extends Component {
|
|||
jsonDesc = data;
|
||||
}
|
||||
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`)
|
||||
|
|
|
@ -85,6 +85,7 @@ class ApplicationSettingsController extends Component {
|
|||
LocalStorage.setItem("sse-settings-regional", regCode);
|
||||
this.initRegSettings();
|
||||
if (regCode!==null) api.asc_setLocale(+regCode);
|
||||
Common.Notifications.trigger('changeRegSettings');
|
||||
}
|
||||
|
||||
render() {
|
||||
|
|
|
@ -10,11 +10,11 @@ export class storeFunctions {
|
|||
|
||||
functions = {};
|
||||
|
||||
initFunctions (groups, data) {
|
||||
this.functions = this.getFunctions(groups, data);
|
||||
initFunctions (groups, data, separator) {
|
||||
this.functions = this.getFunctions(groups, data, separator);
|
||||
}
|
||||
|
||||
getFunctions (groups, data) {
|
||||
getFunctions (groups, data, separator) {
|
||||
const functions = {};
|
||||
for (let g in groups) {
|
||||
const group = groups[g];
|
||||
|
@ -28,7 +28,7 @@ export class storeFunctions {
|
|||
type: _name,
|
||||
group: groupname,
|
||||
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 : ''
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue