treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Change default reply language to be default language when replying to a translated reply (#22272) 

Fixes #22250
pull/41/head
Claire 2022-12-13 19:41:53 +01:00 committed by GitHub
parent 736b4283b0
commit f70bdba926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/reducers/compose.js
View File

@ -330,8 +330,10 @@ export default function compose(state = initialState, action) {
map.set('preselectDate', new Date()); map.set('preselectDate', new Date());
map.set('idempotencyKey', uuid()); map.set('idempotencyKey', uuid());
if (action.status.get('language')) { if (action.status.get('language') && !action.status.has('translation')) {
map.set('language', action.status.get('language')); map.set('language', action.status.get('language'));
} else {
map.set('language', state.get('default_language'));
} }
if (action.status.get('spoiler_text').length > 0) { if (action.status.get('spoiler_text').length > 0) {