Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Clarify non-e2e vs. e2e /w composers placeholder #720

Merged
merged 2 commits into from
Feb 22, 2017

Conversation

lukebarnard1
Copy link
Contributor

@lukebarnard1 lukebarnard1 commented Feb 21, 2017

For E2E rooms, display "Send an encrypted message…" otherwise display "Send a plaintext message…" as the placeholder for the input box in [old] message composer.

Fix for element-hq/element-web#2850

For E2E rooms, display "Send an encrypted message…" otherwise display "Send a plaintext message…" as the placeholder for the input box in [old] message composer.
Copy link
Member

@dbkr dbkr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mm, interesting - I wonder if 'plaintext' is going to confuse people (ie. could mean unencrypted or non-richtext).

@lukebarnard1
Copy link
Contributor Author

could mean unencrypted or non-richtext

This is true... could use "unencrypted" ? This sounds quite scary though.

@ara4n
Copy link
Member

ara4n commented Feb 21, 2017

perhaps "send message (unencrypted)". agreed that 'plaintext' is jargon.

@dbkr dbkr merged commit 2b91b0d into develop Feb 22, 2017
@@ -286,12 +286,16 @@ export default class MessageComposer extends React.Component {
key="controls_formatting" />
);

const placeholderText = roomIsEncrypted ?
"Send a message (unencrypted)…" : "Send a message…";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I've just spotted a problem with this... ;)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants