Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

locales/ja-JP.yml

@@ -970,6 +970,7 @@ reactionAcceptance: "リアクションの受け入れ"
 likeOnly: "いいねのみ"
 likeOnlyForRemote: "リモートからはいいねのみ"
 rolesAssignedToMe: "自分に割り当てられたロール"
+resetPasswordConfirm: "パスワードリセットしますか？"
 
 _achievements:
   earnedAt: "獲得日時"

packages/frontend/src/pages/user-info.vue

@@ -262,15 +262,22 @@ async function updateRemoteUser() {
 }
 
 async function resetPassword() {
+	const confirm = await os.confirm({
+		type: 'warning',
+		text: i18n.ts.resetPasswordConfirm,
+	});
+	if (confirm.canceled) {
+		return;
+	} else {
 		const { password } = await os.api('admin/reset-password', {
 			userId: user.id,
 		});
-
 		os.alert({
 			type: 'success',
 			text: i18n.t('newPasswordIs', { password }),
 		});
 	}
+}
 
 async function toggleSuspend(v) {
 	const confirm = await os.confirm({