mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-23 07:14:10 +00:00
Fix blank screen when trying to copy emoji with a too large file size (#1718)
Fixes #1714
This commit is contained in:
parent
76d6fe63c3
commit
80c4db160e
|
@ -35,6 +35,9 @@ module Admin
|
|||
flash[:alert] = I18n.t('admin.accounts.no_account_selected')
|
||||
rescue Mastodon::NotPermittedError
|
||||
flash[:alert] = I18n.t('admin.custom_emojis.not_permitted')
|
||||
rescue ActiveRecord::RecordInvalid => e
|
||||
error_message = action_from_button == 'copy' ? 'admin.custom_emojis.batch_copy_error' : 'admin.custom_emojis.batch_error'
|
||||
flash[:alert] = I18n.t(error_message, message: e.message)
|
||||
ensure
|
||||
redirect_to admin_custom_emojis_path(filter_params)
|
||||
end
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
---
|
||||
en:
|
||||
admin:
|
||||
custom_emojis:
|
||||
batch_copy_error: 'An error occurred when copying some of the selected emoji: %{message}'
|
||||
batch_error: 'An error occurred: %{message}'
|
||||
settings:
|
||||
captcha_enabled:
|
||||
desc_html: This relies on external scripts from hCaptcha, which may be a security and privacy concern. In addition, <strong>this can make the registration process significantly less accessible to some (especially disabled) people</strong>. For these reasons, please consider alternative measures such as approval-based or invite-based registration.<br>Users that have been invited through a limited-use invite will not need to solve a CAPTCHA
|
||||
|
|
Loading…
Reference in a new issue