diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-28 11:36:25 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-10-28 19:23:58 +0200 |
| commit | cb19be67d1b47dd04cb5bb88e09f0101a614bd1c (patch) | |
| tree | 6c85ccc6ac0279ae7b1ed4dff56c8e83f71a0c95 /app/controllers/admin/custom_emojis_controller.rb | |
| parent | 371563b0e249b6369e04709fb974a8e57413529f (diff) | |
| parent | 8dfe5179ee7186e549dbe1186a151ffa848fe8ab (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/admin/custom_emojis_controller.rb')
| -rw-r--r-- | app/controllers/admin/custom_emojis_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb index 1fae60f5b..431dc1524 100644 --- a/app/controllers/admin/custom_emojis_controller.rb +++ b/app/controllers/admin/custom_emojis_controller.rb @@ -34,7 +34,7 @@ module Admin @form = Form::CustomEmojiBatch.new(form_custom_emoji_batch_params.merge(current_account: current_account, action: action_from_button)) @form.save rescue ActionController::ParameterMissing - flash[:alert] = I18n.t('admin.accounts.no_account_selected') + flash[:alert] = I18n.t('admin.custom_emojis.no_emoji_selected') rescue Mastodon::NotPermittedError flash[:alert] = I18n.t('admin.custom_emojis.not_permitted') rescue ActiveRecord::RecordInvalid => e |