summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2016-02-26 11:06:57 -0500
committerJoramWilander <jwawilander@gmail.com>2016-02-26 11:06:57 -0500
commit2c03b7f1c182b712d87ced58a6ae20ddef0b8cf6 (patch)
tree0b103ed36ffd80b49ec37aaf84641c9834bc534a /web/react/components/user_settings
parentf3da4ee3d728d7b4d8f39a4fca58705f3c06b8b5 (diff)
downloadchat-2c03b7f1c182b712d87ced58a6ae20ddef0b8cf6.tar.gz
chat-2c03b7f1c182b712d87ced58a6ae20ddef0b8cf6.tar.bz2
chat-2c03b7f1c182b712d87ced58a6ae20ddef0b8cf6.zip
Fix missing preview strings for a language showing up as the id not the defaut messsage
Diffstat (limited to 'web/react/components/user_settings')
-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);