imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tidy up, improve wording on modal

Browse source
This commit is contained in:
Michael Telatynski 2020-01-21 17:54:27 +00:00
parent 9f7df33bc3
commit a8df058ea6
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/components/views/rooms/SendMessageComposer.js
View file

@ -43,9 +43,6 @@ import ContentMessages from '../../../ContentMessages';
import {Key} from "../../../Keyboard"; import {Key} from "../../../Keyboard";
import MatrixClientContext from "../../../contexts/MatrixClientContext"; import MatrixClientContext from "../../../contexts/MatrixClientContext";
const SEND_ANYWAY = Symbol("send-anyway");
const UNKNOWN_CMD = Symbol("unknown-cmd");
function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) { function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent); const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
Object.assign(content, replyContent); Object.assign(content, replyContent);
@ -256,14 +253,26 @@ export default class SendMessageComposer extends React.Component {
shouldSend = false; shouldSend = false;
this._runSlashCommand(cmd); this._runSlashCommand(cmd);
} else { } else {
// ask the user if their unknown command should be sent as a message instead // ask the user if their unknown command should be sent as a message
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
// unknown command, ask the user if they meant to send it as a message
const {finished} = Modal.createTrackedDialog("Unknown command", "", QuestionDialog, { const {finished} = Modal.createTrackedDialog("Unknown command", "", QuestionDialog, {
title: _t("Unknown Command"), title: _t("Unknown Command"),
description: _t("Unrecognised command: ") + commandText, description: <div>
<p>
{ _t("Unrecognised command: %(commandText)s", {commandText}) }
</p>
<p>
{ _t("You can use <code>/help</code> to list available commands. Did you mean to send this as a message?", {}, {
code: t => <code>{ t }</code>,
}) }
</p>
<p>
{ _t("Protip: Begin your message with <code>//</code> to start it with a slash.", {}, {
code: t => <code>{ t }</code>,
}) }
</p>
</div>,
button: _t('Send as message'), button: _t('Send as message'),
danger: true,
}); });
const [sendAnyway] = await finished; const [sendAnyway] = await finished;
// if !sendAnyway bail to let the user edit the composer and try again // if !sendAnyway bail to let the user edit the composer and try again

4
src/i18n/strings/en_EN.json
View file

@ -1077,7 +1077,9 @@
"Command error": "Command error", "Command error": "Command error",
"Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.", "Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
"Unknown Command": "Unknown Command", "Unknown Command": "Unknown Command",
"Unrecognised command: ": "Unrecognised command: ", "Unrecognised command: %(commandText)s": "Unrecognised command: %(commandText)s",
"You can use <code>/help</code> to list available commands. Did you mean to send this as a message?": "You can use <code>/help</code> to list available commands. Did you mean to send this as a message?",
"Protip: Begin your message with <code>//</code> to start it with a slash.": "Protip: Begin your message with <code>//</code> to start it with a slash.",
"Send as message": "Send as message", "Send as message": "Send as message",
"Failed to connect to integration manager": "Failed to connect to integration manager", "Failed to connect to integration manager": "Failed to connect to integration manager",
"You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled", "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",