From ec01f6ffb121b0cb88c55ac9f6390f6c28cebdba Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Apr 2019 10:40:25 -0600
Subject: [PATCH] Change wording for old room link

---
 .../tabs/room/AdvancedRoomSettingsTab.js      | 20 ++++++-------------
 src/i18n/strings/en_EN.json                   |  3 ++-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
index b09274adfd..101cd036e5 100644
--- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
@@ -119,21 +119,13 @@ export default class AdvancedRoomSettingsTab extends React.Component {
 
         let oldRoomLink;
         if (this.state.hasPreviousRoom) {
+            let name = _t("this room");
+            const room = MatrixClientPeg.get().getRoom(this.props.roomId);
+            if (room && room.name) name = room.name;
             oldRoomLink = (
-                <div>
-                    {_t(
-                        "This is the upgraded version of another room. <a>Click here to visit the old room</a>.",
-                        {}, {
-                            'a': (sub) => {
-                                return (
-                                    <AccessibleButton element='a' onClick={this._onOldRoomClicked}>
-                                        {sub}
-                                    </AccessibleButton>
-                                );
-                            },
-                        },
-                    )}
-                </div>
+                <AccessibleButton element='a' onClick={this._onOldRoomClicked}>
+                    {_t("View older messages in %(roomName)s.", {roomName: name})}
+                </AccessibleButton>
             );
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c20ea08a91..6b9bc413a2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -599,7 +599,8 @@
     "Voice & Video": "Voice & Video",
     "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
     "Upgrade this room to the recommended room version": "Upgrade this room to the recommended room version",
-    "This is the upgraded version of another room. <a>Click here to visit the old room</a>.": "This is the upgraded version of another room. <a>Click here to visit the old room</a>.",
+    "this room": "this room",
+    "View older messages in %(roomName)s": "View older messages in %(roomName)s",
     "Room information": "Room information",
     "Internal room ID:": "Internal room ID:",
     "Room version": "Room version",