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

Fix missing preview strings for a language showing up as the id not the defaut messsage
Этот коммит содержится в:
Corey Hulen
2016-02-26 08:20:16 -08:00
родитель 53d0bce1da 2c03b7f1c1
Коммит ce5ea641aa

Просмотреть файл

@@ -47,6 +47,10 @@ const holders = defineMessages({
EMBED_PREVIEW: { EMBED_PREVIEW: {
id: 'user.settings.advance.embed_preview', id: 'user.settings.advance.embed_preview',
defaultMessage: 'Show preview snippet of links below message' 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); this.toggleFeature(feature.label, e.target.checked);
}} }}
/> />
{formatMessage({id: 'user.settings.advance.' + feature.label})} {formatMessage(holders[key])}
</label> </label>
</div> </div>
</div> </div>