From 3e8154cf272d6b35ec9eb0ef9f6dc07b5c6ed44b Mon Sep 17 00:00:00 2001 From: KMY Date: Tue, 5 Mar 2024 12:06:40 +0900 Subject: [PATCH] =?UTF-8?q?Add:=20=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=A7=E3=81=AE=E6=93=8D=E4=BD=9C=E5=B1=A5=E6=AD=B4=E3=83=95?= =?UTF-8?q?=E3=82=A3=E3=83=AB=E3=82=BF=E3=81=ABkmyblue=E7=8B=AC=E8=87=AA?= =?UTF-8?q?=E9=A0=85=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/admin/action_logs_helper.rb | 4 +++- app/models/admin/action_log_filter.rb | 4 ++++ config/locales/en.yml | 4 ++++ config/locales/ja.yml | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb index 4018ef6b1c554d..4355b5f78715d6 100644 --- a/app/helpers/admin/action_logs_helper.rb +++ b/app/helpers/admin/action_logs_helper.rb @@ -23,7 +23,9 @@ def log_target(log) link_to log.human_identifier, disputes_strike_path(log.target_id) when 'Announcement' link_to truncate(log.human_identifier), edit_admin_announcement_path(log.target_id) - when 'IpBlock', 'Instance', 'CustomEmoji' + when 'CustomEmoji' + link_to log.human_identifier, edit_admin_custom_emoji_path(log.target_id) + when 'IpBlock', 'Instance' log.human_identifier when 'CanonicalEmailBlock' content_tag(:samp, (log.human_identifier.presence || '')[0...7], title: log.human_identifier) diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb index f581af74e8bf8c..cd4bf8879f7433 100644 --- a/app/models/admin/action_log_filter.rb +++ b/app/models/admin/action_log_filter.rb @@ -16,6 +16,8 @@ class Admin::ActionLogFilter confirm_user: { target_type: 'User', action: 'confirm' }.freeze, approve_user: { target_type: 'User', action: 'approve' }.freeze, reject_user: { target_type: 'User', action: 'reject' }.freeze, + approve_remote_account: { target_type: 'Account', action: 'approve_remote' }.freeze, + reject_remote_account: { target_type: 'Account', action: 'reject_remote' }.freeze, create_account_warning: { target_type: 'AccountWarning', action: 'create' }.freeze, create_announcement: { target_type: 'Announcement', action: 'create' }.freeze, create_custom_emoji: { target_type: 'CustomEmoji', action: 'create' }.freeze, @@ -60,6 +62,8 @@ class Admin::ActionLogFilter update_announcement: { target_type: 'Announcement', action: 'update' }.freeze, update_custom_emoji: { target_type: 'CustomEmoji', action: 'update' }.freeze, update_status: { target_type: 'Status', action: 'update' }.freeze, + force_cw_status: { target_type: 'Status', action: 'force_cw' }.freeze, + force_sensitive_status: { target_type: 'Status', action: 'force_sensitive' }.freeze, update_user_role: { target_type: 'UserRole', action: 'update' }.freeze, update_ip_block: { target_type: 'IpBlock', action: 'update' }.freeze, unblock_email_account: { target_type: 'Account', action: 'unblock_email' }.freeze, diff --git a/config/locales/en.yml b/config/locales/en.yml index 479391f3801649..1fe44b867665b9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -176,6 +176,7 @@ en: action_logs: action_types: approve_appeal: Approve Appeal + approve_remote_account: Approve Remote Account approve_user: Approve User assigned_to_self_report: Assign Report change_email_user: Change E-mail for User @@ -210,9 +211,12 @@ en: enable_custom_emoji: Enable Custom Emoji enable_sign_in_token_auth_user: Enable E-mail Token Authentication for User enable_user: Enable User + force_cw_status: Add CW to Post + force_sensitive_status: Add Sensitive Flag to Post memorialize_account: Memorialize Account promote_user: Promote User reject_appeal: Reject Appeal + reject_remote_account: Reject Remote Account reject_user: Reject User remove_avatar_user: Remove Avatar reopen_report: Reopen Report diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 4580f98fedbf97..41a50f744070fa 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -173,6 +173,7 @@ ja: action_logs: action_types: approve_appeal: 抗議を承認 + approve_remote_account: リモートアカウントの承認 approve_user: ユーザーの承認 assigned_to_self_report: 通報の担当者に設定 change_email_user: ユーザーのメールアドレスを変更 @@ -207,9 +208,12 @@ ja: enable_custom_emoji: カスタム絵文字を有効化 enable_sign_in_token_auth_user: メールトークンのユーザー認証を有効にする enable_user: ユーザーを有効化 + force_cw_status: 投稿に警告文を追加 + force_sensitive_status: 投稿を閲覧注意に変更 memorialize_account: 追悼アカウント化 promote_user: ユーザーを昇格 reject_appeal: 抗議を却下 + reject_remote_account: リモートアカウントを拒否 reject_user: ユーザーを拒否 remove_avatar_user: アイコンを削除 reopen_report: 未解決に戻す