From db6bc54d8cdda2325f6cecd5c72cd0f5f17f9a52 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 21 Nov 2018 11:58:55 +0100 Subject: [PATCH] Fix settings look --- src/components/structures/UserSettings.js | 42 ++++++++++------------- src/i18n/strings/en_EN.json | 15 ++++---- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js index 2c3bdeec8b7..c0461038742 100644 --- a/src/components/structures/UserSettings.js +++ b/src/components/structures/UserSettings.js @@ -815,33 +815,27 @@ module.exports = React.createClass({ _renderPushToTalkSettings: function() { const id = "pushToTalk"; - const buttonLabel = this.state.settingKeybinding ? 'Stop' : 'Set'; + const buttonLabel = this.state.settingKeybinding ? _t('Stop') : _t('Set'); const activated = SettingsStore.getValueAt(SettingLevel.DEVICE, id).enabled; return ( -
- - - - - - - - -
- - - {"Shortcut: " + this.state.pushToTalkAscii} - -
+
+ + + + + {" | Shortcut: " + this.state.pushToTalkAscii + " "} + + +
); }, diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 572cc0d2b34..a325ee87f83 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -223,6 +223,7 @@ "Failed to join room": "Failed to join room", "Message Pinning": "Message Pinning", "Increase performance by only loading room members on first view": "Increase performance by only loading room members on first view", + "Push-to-Talk": "Push-to-Talk", "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing", "Use compact timeline layout": "Use compact timeline layout", "Hide removed messages": "Hide removed messages", @@ -249,10 +250,11 @@ "Enable URL previews for this room (only affects you)": "Enable URL previews for this room (only affects you)", "Enable URL previews by default for participants in this room": "Enable URL previews by default for participants in this room", "Room Colour": "Room Colour", - "Pin unread rooms to the top of the room list": "Pin unread rooms to the top of the room list", "Pin rooms I'm mentioned in to the top of the room list": "Pin rooms I'm mentioned in to the top of the room list", + "Pin unread rooms to the top of the room list": "Pin unread rooms to the top of the room list", "Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets", "Show empty room list headings": "Show empty room list headings", + "Show developer tools": "Show developer tools", "Collecting app version information": "Collecting app version information", "Collecting logs": "Collecting logs", "Uploading report": "Uploading report", @@ -553,6 +555,7 @@ "Click here to fix": "Click here to fix", "To send events of type , you must be a": "To send events of type , you must be a", "Upgrade room to version %(ver)s": "Upgrade room to version %(ver)s", + "Open Devtools": "Open Devtools", "Who can access this room?": "Who can access this room?", "Only people who have been invited": "Only people who have been invited", "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests", @@ -927,9 +930,7 @@ "Username available": "Username available", "To get started, please pick a username!": "To get started, please pick a username!", "This will be your account name on the homeserver, or you can pick a different server.": "This will be your account name on the homeserver, or you can pick a different server.", - "If you would like to create a Matrix account you can register now.": "If you would like to create a Matrix account you can register now.", "If you already have a Matrix account you can log in instead.": "If you already have a Matrix account you can log in instead.", - "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.", "You have successfully set a password!": "You have successfully set a password!", "You have successfully set a password and an email address!": "You have successfully set a password and an email address!", "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.", @@ -1036,6 +1037,8 @@ "This Home server does not support communities": "This Home server does not support communities", "Failed to load %(groupId)s": "Failed to load %(groupId)s", "Couldn't load home page": "Couldn't load home page", + "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.", + "If you would like to create a Matrix account you can register now.": "If you would like to create a Matrix account you can register now.", "Login": "Login", "Failed to reject invitation": "Failed to reject invitation", "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.", @@ -1140,6 +1143,8 @@ "Unable to remove contact information": "Unable to remove contact information", "Refer a friend to Riot:": "Refer a friend to Riot:", "Interface Language": "Interface Language", + "Stop": "Stop", + "Set": "Set", "User Interface": "User Interface", "Autocomplete Delay (ms):": "Autocomplete Delay (ms):", "": "", @@ -1272,7 +1277,5 @@ "Import": "Import", "Failed to set direct chat tag": "Failed to set direct chat tag", "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room", - "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room", - "Open Devtools": "Open Devtools", - "Show developer tools": "Show developer tools" + "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room" }