From f20920718a1d566bcee54727bd9e4172dde2ac24 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 14 Aug 2018 14:28:30 +0100
Subject: [PATCH 1/2] Show room version number in room settings

Also change wording of the Room ID bit to match

Requires https://github.com/matrix-org/matrix-js-sdk/pull/689
For https://github.com/vector-im/riot-web/issues/7164
---
 src/components/views/rooms/RoomSettings.js | 3 ++-
 src/i18n/strings/en_EN.json                | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 0ccfa23bf3..f30004059b 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -1039,7 +1039,8 @@ module.exports = React.createClass({
 
                 <h3>{ _t('Advanced') }</h3>
                 <div className="mx_RoomSettings_settings">
-                    { _t('This room\'s internal ID is') } <code>{ this.props.room.roomId }</code>
+                    { _t('Internal room ID: ') } <code>{ this.props.room.roomId }</code><br />
+                    { _t('Room version number: ') } <code>{ this.props.room.getVersion() }</code>
                 </div>
             </div>
         );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6fe775770c..08c7ae086d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -540,7 +540,8 @@
     "Members only (since they joined)": "Members only (since they joined)",
     "Permissions": "Permissions",
     "Advanced": "Advanced",
-    "This room's internal ID is": "This room's internal ID is",
+    "Internal room ID: ": "Internal room ID: ",
+    "Room version number: ": "Room version number: ",
     "Add a topic": "Add a topic",
     "Search…": "Search…",
     "This Room": "This Room",

From c736ae7efbe76c290e1fea43d5b338c5891485ee Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 14 Aug 2018 16:53:34 +0100
Subject: [PATCH 2/2] Copyright

---
 src/components/views/rooms/RoomSettings.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index f30004059b..7a78d205b9 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.