summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings
diff options
context:
space:
mode:
authorElias Nahum <nahumhbl@gmail.com>2016-08-08 15:07:34 -0500
committerElias Nahum <nahumhbl@gmail.com>2016-08-08 15:07:34 -0500
commit415145d62fd5195fc03759b5b4ed42c255529d7b (patch)
tree11e7149396fdbff3efc6c06c536ada1f2a89bd64 /webapp/components/user_settings
parent5e2b4d1282dc374b54ca2c77fbf84c6533ce8519 (diff)
parent09d98b486e8245ae84a452331e36e2978a6d01ab (diff)
downloadchat-415145d62fd5195fc03759b5b4ed42c255529d7b.tar.gz
chat-415145d62fd5195fc03759b5b4ed42c255529d7b.tar.bz2
chat-415145d62fd5195fc03759b5b4ed42c255529d7b.zip
Merge branch 'release-3.3'
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r--webapp/components/user_settings/user_settings_notifications.jsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx
index 336e614f9..e0e3bf979 100644
--- a/webapp/components/user_settings/user_settings_notifications.jsx
+++ b/webapp/components/user_settings/user_settings_notifications.jsx
@@ -393,7 +393,7 @@ class NotificationsTab extends React.Component {
return (
<SettingItemMin
- title={Utils.localizeMessage('user.settings.notification.push', 'Mobile push notifications')}
+ title={Utils.localizeMessage('user.settings.notifications.push', 'Mobile push notifications')}
describe={describe}
updateSection={handleUpdateDesktopSection}
/>
@@ -430,7 +430,7 @@ class NotificationsTab extends React.Component {
onChange={this.handleNotifyRadio.bind(this, 'all')}
/>
<FormattedMessage
- id='user.settings.notification.allActivity'
+ id='user.settings.notifications.allActivity'
defaultMessage='For all activity'
/>
</label>
@@ -596,7 +596,7 @@ class NotificationsTab extends React.Component {
if (!this.state.soundNeeded) {
describe = (
<FormattedMessage
- id='user.settings.notification.soundConfig'
+ id='user.settings.notifications.soundConfig'
defaultMessage='Please configure notification sounds in your browser settings'
/>
);