Merge pull request 'fix bug 71024' (#92) from fix/bug-71024 into hotf…

…ix/v8.2.1
ONLYOFFICE · Oct 23, 2024 · 2022414 · 2022414
2 parents a228c58 + bad7d7e
commit 2022414
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/documenteditor/mobile/src/view/Encoding.jsx b/apps/documenteditor/mobile/src/view/Encoding.jsx
@@ -7,7 +7,7 @@ const PageEncoding = props => {
     const { t } = useTranslation();
     const _t = t("Settings", { returnObjects: true });
     const encodeData = props.encodeData;
-    const [stateEncoding, setStateEncoding] = useState(props.valueEncoding);
+    const [stateEncoding, setStateEncoding] = useState(props.valueEncoding === -1 ? encodeData.find(encoding => encoding.lcid === 65001).value : props.valueEncoding);
     const getIndexNameEncoding = () => encodeData.findIndex(encoding => encoding.value === stateEncoding);
     const nameEncoding = encodeData[getIndexNameEncoding()].displayValue;
     const mode = props.mode;

diff --git a/apps/spreadsheeteditor/mobile/src/view/Encoding.jsx b/apps/spreadsheeteditor/mobile/src/view/Encoding.jsx
@@ -9,7 +9,7 @@ const PageEncoding = props => {
     const encodeData = props.encodeData;
     const valuesDelimeter = props.valuesDelimeter;
     const namesDelimeter = props.namesDelimeter;
-    const [stateEncoding, setStateEncoding] = useState(props.valueEncoding);
+    const [stateEncoding, setStateEncoding] = useState(props.valueEncoding === -1 ? encodeData.find(encoding => encoding.lcid === 65001).value : props.valueEncoding);
     const [stateDelimeter, setStateDelimeter] = useState(props.valueDelimeter);
     const getIndexNameEncoding = () => encodeData.findIndex(encoding => encoding.value === stateEncoding);
     const nameEncoding = encodeData[getIndexNameEncoding()].displayValue;