From 864e71798d22b05476b63f2038aebb010a89bebd Mon Sep 17 00:00:00 2001
From: Maxim Khlobystov <maxim.khlobystov@gmail.com>
Date: Fri, 24 Nov 2017 20:26:03 +0000
Subject: [PATCH] Fixed the default locale issue.
---
.../submenus/application/component.jsx | 33 +++++++++----------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
index 0c1600336b..0d7d752d71 100644
--- a/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
@@ -183,23 +183,22 @@ class ApplicationMenu extends BaseMenu {
</div>
<div className={styles.col}>
<label aria-labelledby="changeLangLabel" className={cx(styles.formElement, styles.pullContentRight)}>
- <select
- defaultValue={this.formatLocale(this.state.settings.locale)}
- className={styles.select}
- onChange={this.handleSelectChange.bind(this, 'locale', availableLocales)}
- >
- <option disabled>
- { availableLocales &&
- availableLocales.length ?
- intl.formatMessage(intlMessages.languageOptionLabel) :
- intl.formatMessage(intlMessages.noLocaleOptionLabel) }
- </option>
- {availableLocales ? availableLocales.map((locale, index) =>
- (<option key={index} value={locale.locale}>
- {locale.name}
- </option>),
- ) : null }
- </select>
+ { availableLocales && availableLocales.length > 0 ?
+ <select
+ defaultValue={this.formatLocale(this.state.settings.locale)}
+ className={styles.select}
+ onChange={this.handleSelectChange.bind(this, 'locale', availableLocales)}
+ >
+ <option disabled>
+ { intl.formatMessage(intlMessages.languageOptionLabel) }
+ </option>
+ { availableLocales.map((locale, index) =>
+ (<option key={index} value={locale.locale}>
+ {locale.name}
+ </option>),
+ ) }
+ </select>
+ : null }
</label>
<div
id="changeLangLabel"
--
GitLab