summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-02-26 08:20:16 -0800
committerCorey Hulen <corey@hulen.com>2016-02-26 08:20:16 -0800
commitce5ea641aafa269aad44d1d3dd31db30e8fc2b04 (patch)
treec3151118cb287fc61065b4caa9e79cf957330171 /web
parent53d0bce1da190d45ffd8dbf4afcf7e8b2878bad5 (diff)
parent2c03b7f1c182b712d87ced58a6ae20ddef0b8cf6 (diff)
downloadchat-ce5ea641aafa269aad44d1d3dd31db30e8fc2b04.tar.gz
chat-ce5ea641aafa269aad44d1d3dd31db30e8fc2b04.tar.bz2
chat-ce5ea641aafa269aad44d1d3dd31db30e8fc2b04.zip
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
Diffstat (limited to 'web')
-rw-r--r--web/react/components/user_settings/user_settings_advanced.jsx8
1 files changed, 6 insertions, 2 deletions
diff --git a/web/react/components/user_settings/user_settings_advanced.jsx b/web/react/components/user_settings/user_settings_advanced.jsx
index e513f81d2..efaf63ada 100644
--- a/web/react/components/user_settings/user_settings_advanced.jsx
+++ b/web/react/components/user_settings/user_settings_advanced.jsx
@@ -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); \ No newline at end of file
+export default injectIntl(AdvancedSettingsDisplay);