From 88b97fa050a69dc7af46698e68007c059fb846ac Mon Sep 17 00:00:00 2001 From: Ittihadyya Date: Thu, 9 Oct 2025 12:59:00 +0300 Subject: [PATCH] fix typo and reword setting to be consistent with \'confirm_VERB\' --- .../flavours/glitch/containers/status_container.js | 2 +- .../flavours/glitch/features/local_settings/page/index.jsx | 6 +++--- app/javascript/flavours/glitch/locales/en.json | 2 +- app/javascript/flavours/glitch/reducers/local_settings.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/javascript/flavours/glitch/containers/status_container.js b/app/javascript/flavours/glitch/containers/status_container.js index 56951d3d7d1bd6ce5f8a204d5f8ada86e3fb9449..d80c50b1b294ac5b440d104dcd7cb6759ee5485a 100644 --- a/app/javascript/flavours/glitch/containers/status_container.js +++ b/app/javascript/flavours/glitch/containers/status_container.js @@ -184,7 +184,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({ }, onDelete (status, history, withRedraft = false) { - if (!deleteModal) { + if (state.getIn(['local_settings', 'confirm_delete']) ) { dispatch(deleteStatus(status.get('id'), history, withRedraft)); } else { dispatch(openModal({ diff --git a/app/javascript/flavours/glitch/features/local_settings/page/index.jsx b/app/javascript/flavours/glitch/features/local_settings/page/index.jsx index a97c8892f599443e2bd6fc28c0e5f86000656307..221cac57c39659ed2888d8786c50ccc7b6cef978 100644 --- a/app/javascript/flavours/glitch/features/local_settings/page/index.jsx +++ b/app/javascript/flavours/glitch/features/local_settings/page/index.jsx @@ -129,11 +129,11 @@ class LocalSettingsPage extends PureComponent { - + diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json index 5c4262dcbae034124f5f4c6876e54e1302dbab3c..94505b954a5bfb71b3efb6878c618b8a292fa071 100644 --- a/app/javascript/flavours/glitch/locales/en.json +++ b/app/javascript/flavours/glitch/locales/en.json @@ -165,7 +165,7 @@ "settings.rewrite_mentions_username": "Rewrite with username", "settings.confirm_unfollow": "Show a confirmation dialog before unfollowing an account", "settings.confirm_boost": "Show a confirmation dialog before boosting", - "settings.confirm_deletion": "Show a confirmation dialog before deleting a post", + "settings.confirm_delete": "Show a confirmation dialog before deleting a post", "settings.shared_settings_link": "user preferences", "settings.show_action_bar": "Show action buttons in collapsed toots", "settings.show_content_type_choice": "Show content-type choice when authoring toots", diff --git a/app/javascript/flavours/glitch/reducers/local_settings.js b/app/javascript/flavours/glitch/reducers/local_settings.js index 89dfa43f2c339995e34a5c49768d5542ae194a0c..40ef46e372b85e79df68c555ac48e215e22c3ccf 100644 --- a/app/javascript/flavours/glitch/reducers/local_settings.js +++ b/app/javascript/flavours/glitch/reducers/local_settings.js @@ -24,7 +24,7 @@ const initialState = ImmutableMap({ rewrite_mentions: 'no', confirm_unfollow: true, confirm_boost: false, - confirm_deletion: true, + confirm_delete: true, content_warnings : ImmutableMap({ auto_unfold : false, filter : null,