From: Jay Sitter <jay@jaysitter.com>
Date: Fri, 23 Jun 2023 21:21:10 +0000 (-0400)
Subject: fix: Fix language selection bug
X-Git-Url: http://these/git/%22https:/join-lemmy.org/static/%7B%60%24%7BrepoUrl%7D?a=commitdiff_plain;h=ccf0a6dbaa86fbc755cdfcce2481eebac338b768;p=lemmy-ui.git

fix: Fix language selection bug
---

diff --git a/src/shared/components/comment/comment-form.tsx b/src/shared/components/comment/comment-form.tsx
index 0226e23..5cce2b5 100644
--- a/src/shared/components/comment/comment-form.tsx
+++ b/src/shared/components/comment/comment-form.tsx
@@ -41,10 +41,12 @@ export class CommentForm extends Component<CommentFormProps, any> {
           : undefined
         : undefined;
 
-    const userInterfaceLangId = getUserInterfaceLangId({
-      myUserInfo: UserService.Instance.myUserInfo,
-      allLanguages: this.props.allLanguages,
-    });
+    const userInterfaceLangId = !UserService.Instance.myUserInfo
+      ? 0
+      : getUserInterfaceLangId({
+          myUserInfo: UserService.Instance.myUserInfo,
+          allLanguages: this.props.allLanguages,
+        });
 
     return (
       <div
diff --git a/src/shared/components/common/markdown-textarea.tsx b/src/shared/components/common/markdown-textarea.tsx
index 97d1d14..119913d 100644
--- a/src/shared/components/common/markdown-textarea.tsx
+++ b/src/shared/components/common/markdown-textarea.tsx
@@ -260,8 +260,12 @@ export class MarkdownTextArea extends Component<
               <LanguageSelect
                 iconVersion
                 allLanguages={this.props.allLanguages}
+                // Only set the selected language ID if it exists as an option
+                // in the dropdown; otherwise, set it to 0 (Undetermined)
                 selectedLanguageIds={
-                  languageId ? Array.of(languageId) : undefined
+                  languageId && this.props.siteLanguages.includes(languageId)
+                    ? Array.of(languageId)
+                    : [0]
                 }
                 siteLanguages={this.props.siteLanguages}
                 onChange={this.handleLanguageChange}
diff --git a/src/shared/components/post/post-form.tsx b/src/shared/components/post/post-form.tsx
index f14eac7..780ea79 100644
--- a/src/shared/components/post/post-form.tsx
+++ b/src/shared/components/post/post-form.tsx
@@ -326,10 +326,12 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
   render() {
     const url = this.state.form.url;
 
-    const userInterfaceLangId = getUserInterfaceLangId({
-      myUserInfo: UserService.Instance.myUserInfo,
-      allLanguages: this.props.allLanguages,
-    });
+    const userInterfaceLangId = !UserService.Instance.myUserInfo
+      ? 0
+      : getUserInterfaceLangId({
+          myUserInfo: UserService.Instance.myUserInfo,
+          allLanguages: this.props.allLanguages,
+        });
 
     return (
       <form className="post-form" onSubmit={linkEvent(this, handlePostSubmit)}>
diff --git a/src/shared/utils/app/user-interface-language.ts b/src/shared/utils/app/user-interface-language.ts
index 5ccd61c..707526d 100644
--- a/src/shared/utils/app/user-interface-language.ts
+++ b/src/shared/utils/app/user-interface-language.ts
@@ -17,6 +17,6 @@ export default function getUserInterfaceLanguageId({
     return i18nLang.indexOf(lang.code) === 0;
   });
 
-  // Return the ID of that language object
+  // Return the ID of that language object, or "0" for Undetermined
   return userLang.id || 0;
 }