Merge branch 'develop' into t3chguy/piwik

This commit is contained in:
Matthew Hodgson 2017-05-30 15:58:55 +01:00 committed by GitHub
commit 93a35dc07a
50 changed files with 1426 additions and 302 deletions

View file

@ -703,9 +703,9 @@ module.exports = React.createClass({
modal.close();
console.error("Failed to leave room " + roomId + " " + err);
Modal.createDialog(ErrorDialog, {
title: "Failed to leave room",
title: _t("Failed to leave room"),
description: (err && err.message ? err.message :
"Server may be unavailable, overloaded, or you hit a bug."),
_t("Server may be unavailable, overloaded, or you hit a bug.")),
});
});
}