Change "Ban" to "Ban from room" to fix an inconsistency in the Admin Tools dialog #8281
Conversation
|
Hi @t3chguy, please can you tell me why I am getting the error? |
There was a problem hiding this comment.
You've changed the string, but not the source file. Additionally, as noted in #7576, this needs to be space-aware.
The PR description should also not have the "Fixes $link" in a code block because it prevents github from working. The PR title should also be a sentence.
Alright, thank you. I will fix that. |
andybalaam
changed the title
EECvision
force-pushed
the
eecvision/admin-tools-phrase-inconsistency
branch
from
f150d02 to
1182d1a
Compare
Codecov Report
@@ Coverage Diff @@
## develop #8281 +/- ##
===========================================
- Coverage 29.54% 29.53% -0.01%
===========================================
Files 871 871
Lines 49986 49991 +5
Branches 12715 12720 +5
===========================================
Hits 14767 14767
- Misses 35219 35224 +5
|
| @@ -653,7 +653,7 @@ const BanToggleButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBa | |||
| room.isSpaceRoom() ? ConfirmSpaceUserActionDialog : ConfirmUserActionDialog, | |||
| { | |||
| member, | |||
| action: isBanned ? _t("Unban") : _t("Ban"), | |||
| action: isBanned ? _t("Unban") : _t("Ban from room"), | |||
There was a problem hiding this comment.
Surely now ban is inconsistent from unban?
| @@ -719,7 +719,7 @@ const BanToggleButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBa | |||
| }); | |||
| }; | |||
|
|
|||
| let label = _t("Ban"); | |||
| let label = _t("Ban from room"); | |||
| if (isBanned) { | |||
| label = _t("Unban"); | |||
| @@ -653,7 +653,7 @@ const BanToggleButton = ({ room, member, startUpdating, stopUpdating }: Omit<IBa | |||
| room.isSpaceRoom() ? ConfirmSpaceUserActionDialog : ConfirmUserActionDialog, | |||
| { | |||
| member, | |||
| action: isBanned ? _t("Unban") : _t("Ban"), | |||
| action: isBanned ? _t("Unban") : _t("Ban from room"), | |||
There was a problem hiding this comment.
UserInfo is also shown for Spaces, so it may be from room or from space
There was a problem hiding this comment.
Okay, I am towards fixing it.
EECvision
force-pushed
the
eecvision/admin-tools-phrase-inconsistency
branch
from
1182d1a to
21dee1d
Compare
|
Please do not force push after review has been given. It makes review significantly harder and less likely to happen :( |
Okay, I'm sorry I didn't know. I will not do it again. |
Revert the applied formatting. Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
|
Hi @t3chguy, I have committed your suggestions. Is there any other change I need to make in the PR? |
Thank you |
Fixes element-hq/element-web#20578
I have changed the Admin tools button "Ban" to "Ban from room" so as to be consistently phrased with Remove from room
Signed-off-by: Emmanuel Ezeka eec.studies@gmail.com
This PR currently has no changelog labels, so will not be included in changelogs.
A reviewer can add one of:
T-Deprecation,T-Enhancement,T-Defect,T-Taskto indicate what type of change this is, or addType: [enhancement/defect/task]to the description and I'll add them for you.Preview: https://pr8281--matrix-react-sdk.netlify.app
⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts.