More cleanup

This commit is contained in:
Essem 2023-12-19 22:14:22 -06:00
parent 01b6cbe577
commit 9670ba6a1b
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
4 changed files with 1 additions and 26 deletions

View file

@ -159,6 +159,5 @@
"status.react": "React", "status.react": "React",
"status.sensitive_toggle": "Click to view", "status.sensitive_toggle": "Click to view",
"status.uncollapse": "Uncollapse", "status.uncollapse": "Uncollapse",
"suggestions.dismiss": "Dismiss suggestion", "suggestions.dismiss": "Dismiss suggestion"
"tooltips.reactions": "Reactions"
} }

View file

@ -434,7 +434,6 @@
"notification.mention": "{name} mentioned you", "notification.mention": "{name} mentioned you",
"notification.own_poll": "Your poll has ended", "notification.own_poll": "Your poll has ended",
"notification.poll": "A poll you have voted in has ended", "notification.poll": "A poll you have voted in has ended",
"notification.reaction": "{name} reacted to your post",
"notification.reblog": "{name} boosted your post", "notification.reblog": "{name} boosted your post",
"notification.status": "{name} just posted", "notification.status": "{name} just posted",
"notification.update": "{name} edited a post", "notification.update": "{name} edited a post",
@ -452,7 +451,6 @@
"notifications.column_settings.mention": "Mentions:", "notifications.column_settings.mention": "Mentions:",
"notifications.column_settings.poll": "Poll results:", "notifications.column_settings.poll": "Poll results:",
"notifications.column_settings.push": "Push notifications", "notifications.column_settings.push": "Push notifications",
"notifications.column_settings.reaction": "Reactions:",
"notifications.column_settings.reblog": "Boosts:", "notifications.column_settings.reblog": "Boosts:",
"notifications.column_settings.show": "Show in column", "notifications.column_settings.show": "Show in column",
"notifications.column_settings.sound": "Play sound", "notifications.column_settings.sound": "Play sound",
@ -667,7 +665,6 @@
"status.pin": "Pin on profile", "status.pin": "Pin on profile",
"status.pinned": "Pinned post", "status.pinned": "Pinned post",
"status.read_more": "Read more", "status.read_more": "Read more",
"status.react": "React",
"status.reblog": "Boost", "status.reblog": "Boost",
"status.reblog_private": "Boost with original visibility", "status.reblog_private": "Boost with original visibility",
"status.reblogged_by": "{name} boosted", "status.reblogged_by": "{name} boosted",
@ -706,7 +703,6 @@
"timeline_hint.resources.followers": "Followers", "timeline_hint.resources.followers": "Followers",
"timeline_hint.resources.follows": "Follows", "timeline_hint.resources.follows": "Follows",
"timeline_hint.resources.statuses": "Older posts", "timeline_hint.resources.statuses": "Older posts",
"tooltips.reactions": "Reactions",
"trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}", "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
"trends.trending_now": "Trending now", "trends.trending_now": "Trending now",
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.", "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",

View file

@ -56,7 +56,6 @@ const initialState = ImmutableMap({
follow: true, follow: true,
follow_request: false, follow_request: false,
favourite: true, favourite: true,
reaction: true,
reblog: true, reblog: true,
mention: true, mention: true,
poll: true, poll: true,
@ -70,7 +69,6 @@ const initialState = ImmutableMap({
follow: true, follow: true,
follow_request: false, follow_request: false,
favourite: true, favourite: true,
reaction: true,
reblog: true, reblog: true,
mention: true, mention: true,
poll: true, poll: true,

View file

@ -1,18 +0,0 @@
# frozen_string_literal: true
class FixForeignKeysStatusReactions < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
def change
# Fixes an oversight in a previous version of the CreateStatusReactions migration
remove_foreign_key :status_reactions, :accounts
add_foreign_key :status_reactions, :accounts, on_delete: :cascade, validate: false
validate_foreign_key :status_reactions, :accounts
remove_foreign_key :status_reactions, :statuses
add_foreign_key :status_reactions, :statuses, on_delete: :cascade, validate: false
validate_foreign_key :status_reactions, :statuses
remove_foreign_key :status_reactions, :custom_emojis
add_foreign_key :status_reactions, :custom_emojis, on_delete: :cascade, validate: false
validate_foreign_key :status_reactions, :custom_emojis
end
end