Merge branch 'main' into 1078-language-select-disable-warning

diff --git a/src/shared/components/common/language-select.tsx b/src/shared/components/common/language-select.tsx
index 372d372ad05eff68ef2d992ef70d7bed263f5af0..fac3216f8dd5f267f773df1e664beb0bb01d776d 100644 (file)
--- a/src/shared/components/common/language-select.tsx
+++ b/src/shared/components/common/language-select.tsx
@@ -16,6 +16,7 @@ interface LanguageSelectProps {
   showSite?: boolean;
   iconVersion?: boolean;
   disabled?: boolean;
+  showLanguageWarning?: boolean;
 }
 
 export class LanguageSelect extends Component<LanguageSelectProps, any> {
@@ -49,7 +50,7 @@ export class LanguageSelect extends Component<LanguageSelectProps, any> {
       this.selectBtn
     ) : (
       <div>
-        {this.props.multiple && (
+        {this.props.multiple && this.props.showLanguageWarning && (
           <div className="alert alert-warning" role="alert">
             {i18n.t("undetermined_language_warning")}
           </div>

diff --git a/src/shared/components/person/settings.tsx b/src/shared/components/person/settings.tsx
index a40b90491b5f3a10bd5382d62f0e1fe5ad89377a..40878f37fddc4fa93b3d751bc57e5458306247a9 100644 (file)
--- a/src/shared/components/person/settings.tsx
+++ b/src/shared/components/person/settings.tsx
@@ -604,6 +604,7 @@ export class Settings extends Component<any, SettingsState> {
             siteLanguages={this.state.siteRes.discussion_languages}
             selectedLanguageIds={selectedLangs}
             multiple={true}
+            showLanguageWarning={true}
             showSite
             onChange={this.handleDiscussionLanguageChange}
           />