From 8184e33c9f0143f7df0201449b9738ba2440bd78 Mon Sep 17 00:00:00 2001
From: Jay Sitter <jay@jaysitter.com>
Date: Sat, 24 Jun 2023 00:03:49 -0400
Subject: [PATCH] fix: Fix up some interface language logic and design

---
 src/shared/components/comment/comment-form.tsx   |  7 +------
 src/shared/components/common/language-select.tsx |  2 +-
 src/shared/components/post/post-form.tsx         |  7 +------
 src/shared/utils/app/user-interface-language.ts  | 14 +++++---------
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/shared/components/comment/comment-form.tsx b/src/shared/components/comment/comment-form.tsx
index 5cce2b53..c9937c62 100644
--- a/src/shared/components/comment/comment-form.tsx
+++ b/src/shared/components/comment/comment-form.tsx
@@ -41,12 +41,7 @@ export class CommentForm extends Component<CommentFormProps, any> {
           : undefined
         : undefined;
 
-    const userInterfaceLangId = !UserService.Instance.myUserInfo
-      ? 0
-      : getUserInterfaceLangId({
-          myUserInfo: UserService.Instance.myUserInfo,
-          allLanguages: this.props.allLanguages,
-        });
+    const userInterfaceLangId = getUserInterfaceLangId(this.props.allLanguages);
 
     return (
       <div
diff --git a/src/shared/components/common/language-select.tsx b/src/shared/components/common/language-select.tsx
index c74f24cd..03d868be 100644
--- a/src/shared/components/common/language-select.tsx
+++ b/src/shared/components/common/language-select.tsx
@@ -49,7 +49,7 @@ export class LanguageSelect extends Component<LanguageSelectProps, any> {
     return this.props.iconVersion ? (
       this.selectBtn
     ) : (
-      <div className="language-select mb-3">
+      <div className="language-select row mb-3">
         <label
           className={classNames(
             "col-form-label",
diff --git a/src/shared/components/post/post-form.tsx b/src/shared/components/post/post-form.tsx
index 780ea797..ebea4324 100644
--- a/src/shared/components/post/post-form.tsx
+++ b/src/shared/components/post/post-form.tsx
@@ -326,12 +326,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
   render() {
     const url = this.state.form.url;
 
-    const userInterfaceLangId = !UserService.Instance.myUserInfo
-      ? 0
-      : getUserInterfaceLangId({
-          myUserInfo: UserService.Instance.myUserInfo,
-          allLanguages: this.props.allLanguages,
-        });
+    const userInterfaceLangId = getUserInterfaceLangId(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 707526d7..ff2e4390 100644
--- a/src/shared/utils/app/user-interface-language.ts
+++ b/src/shared/utils/app/user-interface-language.ts
@@ -1,13 +1,9 @@
-import { Language, MyUserInfo } from "lemmy-js-client";
+import { Language } from "lemmy-js-client";
 import { I18NextService } from "../../services/I18NextService";
 
-export default function getUserInterfaceLanguageId({
-  myUserInfo,
-  allLanguages,
-}: {
-  myUserInfo: MyUserInfo;
-  allLanguages: Language[];
-}): number {
+export default function getUserInterfaceLangId(
+  allLanguages: Language[]
+): number {
   // Get the string of the browser- or user-defined language, like en-US
   const i18nLang = I18NextService.i18n.language;
 
@@ -18,5 +14,5 @@ export default function getUserInterfaceLanguageId({
   });
 
   // Return the ID of that language object, or "0" for Undetermined
-  return userLang.id || 0;
+  return userLang?.id || 0;
 }