diff --git a/config/locales/en.yml b/config/locales/en.yml index ebc1e8131b03ae..85ef990e3f2e9d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -232,6 +232,7 @@ en: update_user_role: Update Role actions: approve_appeal_html: "%{name} approved moderation decision appeal from %{target}" + approve_remote_account_html: "%{name} approved %{target} join on this server" approve_user_html: "%{name} approved sign-up from %{target}" assigned_to_self_report_html: "%{name} assigned report %{target} to themselves" change_email_user_html: "%{name} changed the e-mail address of user %{target}" @@ -271,6 +272,7 @@ en: memorialize_account_html: "%{name} turned %{target}'s account into a memoriam page" promote_user_html: "%{name} promoted user %{target}" reject_appeal_html: "%{name} rejected moderation decision appeal from %{target}" + reject_remote_account_html: "%{name} rejected %{target} join on this server" reject_user_html: "%{name} rejected sign-up from %{target}" remove_avatar_user_html: "%{name} removed %{target}'s avatar" remove_history_status_html: "%{name} removed post edit histories by %{target}" diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 2a0dd9c7b0ba90..325f905c81b9b7 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -229,6 +229,7 @@ ja: update_user_role: ロールを更新 actions: approve_appeal_html: "%{name}さんが%{target}さんからの抗議を承認しました" + approve_remote_account_html: "%{name}さんが%{target}さんの参加を承認しました" approve_user_html: "%{name}さんが%{target}さんからの登録を承認しました" assigned_to_self_report_html: "%{name}さんが通報 %{target}を自身の担当に割り当てました" change_email_user_html: "%{name}さんが%{target}さんのメールアドレスを変更しました" @@ -268,6 +269,7 @@ ja: memorialize_account_html: "%{name}さんが%{target}さんを追悼アカウントページに登録しました" promote_user_html: "%{name}さんが%{target}さんを昇格しました" reject_appeal_html: "%{name}さんが%{target}からの抗議を却下しました" + reject_remote_account_html: "%{name}さんが%{target}さんの参加を却下しました" reject_user_html: "%{name}さんが%{target}さんからの登録を拒否しました" remove_avatar_user_html: "%{name}さんが%{target}さんのアイコンを削除しました" remove_history_status_html: "%{name}さんが%{target}さんの投稿の編集履歴を削除しました" diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb index 9c3a6c566f8d7a..378f9e605a596a 100644 --- a/spec/services/activitypub/process_account_service_spec.rb +++ b/spec/services/activitypub/process_account_service_spec.rb @@ -52,7 +52,6 @@ expect(subject).to_not be_nil expect(subject.suspended?).to be false expect(subject.remote_pending).to be false - expect(subject.suspension_origin_local?).to be true expect(subject.note).to eq 'new bio' end end