upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2265 from mattermost/preview-loc-fix

Browse source 
Fix missing preview strings for a language showing up as the id not the defaut messsage
This commit is contained in:
Corey Hulen 2016-02-26 08:20:16 -08:00
commit ce5ea641aa
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
web/react/components/user_settings/user_settings_advanced.jsx
View file

@ -47,6 +47,10 @@ const holders = defineMessages({
EMBED_PREVIEW: {
id: 'user.settings.advance.embed_preview',
defaultMessage: 'Show preview snippet of links below message'
},
EMBED_TOGGLE: {
id: 'user.settings.advance.embed_toggle',
defaultMessage: 'Show toggle for all embed previews'
}
});
@ -240,7 +244,7 @@ class AdvancedSettingsDisplay extends React.Component {
this.toggleFeature(feature.label, e.target.checked);
}}
/>
{formatMessage({id: 'user.settings.advance.' + feature.label})}
{formatMessage(holders[key])}
</label>
</div>
</div>
@ -334,4 +338,4 @@ AdvancedSettingsDisplay.propTypes = {
collapseModal: React.PropTypes.func.isRequired
};
export default injectIntl(AdvancedSettingsDisplay);
export default injectIntl(AdvancedSettingsDisplay);