From bfb313ce9d153c09269c5f76861743bd52324fa9 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 2 Jun 2017 14:13:33 +0100 Subject: [PATCH 1/3] riot-bot only if english please --- src/components/structures/MatrixChat.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 2c79a4c87c..0dedc02270 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -38,7 +38,7 @@ import PageTypes from '../../PageTypes'; import createRoom from "../../createRoom"; import * as UDEHandler from '../../UnknownDeviceErrorHandler'; -import { _t } from '../../languageHandler'; +import { _t, getCurrentLanguage } from '../../languageHandler'; module.exports = React.createClass({ displayName: 'MatrixChat', @@ -795,7 +795,7 @@ module.exports = React.createClass({ this._teamToken = teamToken; dis.dispatch({action: 'view_home_page'}); } else if (this._is_registered) { - if (this.props.config.welcomeUserId) { + if (this.props.config.welcomeUserId && getCurrentLanguage().startsWith("en")) { createRoom({dmUserId: this.props.config.welcomeUserId}); return; } From 77f490814ad15e5b32faa5eca1eb895bc05fb662 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 2 Jun 2017 14:23:29 +0100 Subject: [PATCH 2/3] Prepare changelog for v0.9.0 --- CHANGELOG.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7102c43f24..d9d39f0dfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +Changes in [0.9.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.0) (2017-06-02) +=================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.0-rc.2...v0.9.0) + + * sync pt with pt_BR + [\#1009](https://github.com/matrix-org/matrix-react-sdk/pull/1009) + * Update from Weblate. + [\#1008](https://github.com/matrix-org/matrix-react-sdk/pull/1008) + * Update from Weblate. + [\#1003](https://github.com/matrix-org/matrix-react-sdk/pull/1003) + * allow hiding redactions, restoring old behaviour + [\#1004](https://github.com/matrix-org/matrix-react-sdk/pull/1004) + * Add missing translations + [\#1005](https://github.com/matrix-org/matrix-react-sdk/pull/1005) + Changes in [0.9.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.9.0-rc.2) (2017-06-02) ============================================================================================================= [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.9.0-rc.1...v0.9.0-rc.2) From 9e0aca534c0be130dbf442c36227872770c29916 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 2 Jun 2017 14:23:30 +0100 Subject: [PATCH 3/3] v0.9.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b00a57d52..6afec3400b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.9.0-rc.2", + "version": "0.9.0", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {