From 5ded646db0126f03f2d0db9f498bbd39caeff25d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 14 Mar 2019 17:03:32 -0600
Subject: [PATCH] Warn that members won't be autojoined to upgraded rooms

Fixes https://github.com/vector-im/riot-web/issues/8173

Wording is questionable though.
---
 src/components/views/rooms/RoomUpgradeWarningBar.js | 6 ++++++
 src/i18n/strings/en_EN.json                         | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.js b/src/components/views/rooms/RoomUpgradeWarningBar.js
index 3a11f46e51..32969cdd3d 100644
--- a/src/components/views/rooms/RoomUpgradeWarningBar.js
+++ b/src/components/views/rooms/RoomUpgradeWarningBar.js
@@ -72,6 +72,12 @@ module.exports = React.createClass({
         return (
             <div className="mx_RoomUpgradeWarningBar">
                 {upgradeText}
+                <div className="mx_RoomUpgradeWarningBar_body">
+                    {_t(
+                        "Members of the room will be required to click a link to join the " +
+                        "new room. No one will be automatically joined or invited to the new room.",
+                    )}
+                </div>
                 <div className="mx_RoomUpgradeWarningBar_small">
                     {_t("Only room administrators will see this warning")}
                 </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2bda11a1dd..bfb8828fd3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -581,6 +581,7 @@
     "Camera": "Camera",
     "Voice & Video": "Voice & Video",
     "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
+    "Members of the room will be required to click a link to join the new room. No one will be automatically joined or invited to the new room.": "Members of the room will be required to click a link to join the new room. No one will be automatically joined or invited to the new room.",
     "Upgrade room to version %(ver)s": "Upgrade room to version %(ver)s",
     "Room information": "Room information",
     "Internal room ID:": "Internal room ID:",