about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-12-13 19:41:53 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-12-14 09:14:50 +0100
commitbc91069e08e0dadcb523b6e372c0c0830376706c (patch)
treeebf55f39707be55a3e6436b1577f62ed44a04023
parent47c75c29da9537131c224bf93a381d5e5b80bda5 (diff)
[Glitch] Change default reply language to be default language when replying to a translated reply
Port f70bdba9264bd7c572cee3c45421733919b7d03c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
-rw-r--r--app/javascript/flavours/glitch/reducers/compose.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js
index 9b50ec23a..ddc3fa41e 100644
--- a/app/javascript/flavours/glitch/reducers/compose.js
+++ b/app/javascript/flavours/glitch/reducers/compose.js
@@ -421,8 +421,10 @@ export default function compose(state = initialState, action) {
       map.set('preselectDate', new Date());
       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'));
+      } else {
+        map.set('language', state.get('default_language'));
       }
 
       if (action.status.get('spoiler_text').length > 0) {