tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change "Conversations" back to "Direct messages" and add warning in web UI (#18289)

Browse Source 
Partially reverts #18146
This commit is contained in:
Eugen Rochko
2022-05-03 09:09:09 +02:00
committed by GitHub
parent aed1c47cb1
commit 7e244879fe
7 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/keyboard_shortcuts/index.js
View File

@ -122,7 +122,7 @@ class KeyboardShortcuts extends ImmutablePureComponent {
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>d</kbd></td>
<td><FormattedMessage id='keyboard_shortcuts.conversations' defaultMessage='to open conversations column' /></td>
<td><FormattedMessage id='keyboard_shortcuts.direct' defaultMessage='to open direct messages column' /></td>
</tr>
<tr>
<td><kbd>g</kbd>+<kbd>s</kbd></td>