matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801

Browse Source
This commit is contained in:
David Baker
2017-05-23 15:16:31 +01:00
parent 46bb29a3af
commit d419c42a4f
73 changed files with 4660 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Notifier.js
View File

@ -21,6 +21,7 @@ import TextForEvent from './TextForEvent';
import Avatar from './Avatar';
import dis from './dispatcher';
import sdk from './index';
import _t from 'counterpart-riot';
import Modal from './Modal';
/*
@ -134,14 +135,13 @@ const Notifier = {
if (result !== 'granted') {
// The permission request was dismissed or denied
const description = result === 'denied'
? 'Riot does not have permission to send you notifications'
+ ' - please check your browser settings'
: 'Riot was not given permission to send notifications'
+ ' - please try again';
? _t('Riot does not have permission to send you notifications - please check your browser settings')
: _t('Riot was not given permission to send notifications - please try again');
const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
Modal.createDialog(ErrorDialog, {
title: 'Unable to enable Notifications',
title: _t('Unable to enable Notifications'),
description,
button: _t("OK"),
});
return;
}