IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-7 adding loc feature to preview

Browse Source
This commit is contained in:
=Corey Hulen
2016-01-22 09:27:27 -06:00
parent da1d52d546
commit 058d6b2467
2 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
web/react/components/user_settings/user_settings_display.jsx
View File

@@ -5,6 +5,7 @@ import {savePreferences} from '../../utils/client.jsx';
import SettingItemMin from '../setting_item_min.jsx';
import SettingItemMax from '../setting_item_max.jsx';
import Constants from '../../utils/constants.jsx';
const PreReleaseFeatures = Constants.PRE_RELEASE_FEATURES;
import PreferenceStore from '../../stores/preference_store.jsx';
import ManageLanguages from './manage_languages.jsx';
import * as Utils from '../../utils/utils.jsx';
@@ -294,44 +295,46 @@ export default class UserSettingsDisplay extends React.Component {
);
}
if (this.props.activeSection === 'languages') {
var inputs = [];
inputs.push(
<ManageLanguages
user={this.props.user}
key='languages-ui'
/>
);
if (Utils.isFeatureEnabled(PreReleaseFeatures.LOC_PREVIEW)) {
if (this.props.activeSection === 'languages') {
var inputs = [];
inputs.push(
<ManageLanguages
user={this.props.user}
key='languages-ui'
/>
);
languagesSection = (
<SettingItemMax
title={'Language'}
width='medium'
inputs={inputs}
updateSection={(e) => {
this.updateSection('');
e.preventDefault();
}}
/>
);
} else {
var locale = 'English';
Utils.languages().forEach((l) => {
if (l.value === this.props.user.locale) {
locale = l.name;
}
});
languagesSection = (
<SettingItemMax
title={'Language'}
width='medium'
inputs={inputs}
updateSection={(e) => {
this.updateSection('');
e.preventDefault();
}}
/>
);
} else {
var locale = 'English';
Utils.languages().forEach((l) => {
if (l.value === this.props.user.locale) {
locale = l.name;
}
});
languagesSection = (
<SettingItemMin
title={'Language'}
width='medium'
describe={locale}
updateSection={() => {
this.updateSection('languages');
}}
/>
);
languagesSection = (
<SettingItemMin
title={'Language'}
width='medium'
describe={locale}
updateSection={() => {
this.updateSection('languages');
}}
/>
);
}
}
return (
@@ -367,7 +370,6 @@ export default class UserSettingsDisplay extends React.Component {
{nameFormatSection}
<div className='divider-dark'/>
{languagesSection}
<div className='divider-dark'/>
</div>
</div>
);

4
web/react/utils/constants.jsx
View File

@@ -451,6 +451,10 @@ export default {
EMBED_PREVIEW: {
label: 'embed_preview',
description: 'Show preview snippet of links below message'
},
LOC_PREVIEW: {
label: 'loc_preview',
description: 'Show user language in display settings'
}
},
OVERLAY_TIME_DELAY: 400,