4 files changed, 6 insertions(+), 6 deletions(-)

M app/javascript/flavours/glitch/containers/status_container.js
M app/javascript/flavours/glitch/features/local_settings/page/index.jsx
M app/javascript/flavours/glitch/locales/en.json
M app/javascript/flavours/glitch/reducers/local_settings.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({

@@ 129,11 129,11 @@ class LocalSettingsPage extends PureComponent {
           
           <LocalSettingsPageItem
             settings={settings}
-            item={['confirm_deletion']}
-            id='mastodon-settings--confirm_deletion'
+            item={['confirm_delete']}
+            id='mastodon-settings--confirm_delete'
             onChange={onChange}
           >
-            <FormattedMessage id='settings.confirm_post_deletion' defaultMessage='Show a confirmation dialog before deleting a post' />
+            <FormattedMessage id='settings.confirm_delete' defaultMessage='Show a confirmation dialog before deleting a post' />
           </LocalSettingsPageItem>
           
         </section>

@@ 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",

@@ 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,