Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-02-04 00:18:01 +01:00
Code Issues Projects Releases Wiki Activity

fix(locale): Use navigator.language as default locale.

Browse Source
This commit is contained in:
Dave Dunkin 2018-10-20 11:31:24 -07:00
parent b744368720
commit d471abbbb0
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/component/user/show-user-component.jsx
View File

@ -26,9 +26,7 @@ export default class ShowUserComponent extends React.Component {
} }
updateLocale() { updateLocale() {
const locale = this.props.location const locale = (this.props.location && this.props.location.locale) || navigator.language;
? this.props.location.locale
: this.possibleLocales[this.possibleLocales.length - 1];
let index = this.possibleLocales.findIndex(v => v.value === locale); let index = this.possibleLocales.findIndex(v => v.value === locale);
index = (index + 1) % this.possibleLocales.length; index = (index + 1) % this.possibleLocales.length;
this.props.updateSettingLocation('locale', this.possibleLocales[index].value); this.props.updateSettingLocation('locale', this.possibleLocales[index].value);
@ -36,9 +34,7 @@ export default class ShowUserComponent extends React.Component {
render() { render() {
const email = this.props.profile ? this.props.profile.email : ''; const email = this.props.profile ? this.props.profile.email : '';
const locale = this.props.location const locale = (this.props.location && this.props.location.locale) || navigator.language;
? this.props.location.locale
: this.possibleLocales[this.possibleLocales.length - 1].value;
let foundLocale = this.possibleLocales.find(l => l.value === locale); let foundLocale = this.possibleLocales.find(l => l.value === locale);
const imageUrl = email ? this.props.profile.imageUrl : 'public/unknown-user.png'; const imageUrl = email ? this.props.profile.imageUrl : 'public/unknown-user.png';
const imageLocale = foundLocale ? `public/${foundLocale.image}.png` : `public/unknown-locale.png`; const imageLocale = foundLocale ? `public/${foundLocale.image}.png` : `public/unknown-locale.png`;