Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
This commit is contained in:
commit
ba98abc97b
|
@ -970,6 +970,7 @@ reactionAcceptance: "リアクションの受け入れ"
|
|||
likeOnly: "いいねのみ"
|
||||
likeOnlyForRemote: "リモートからはいいねのみ"
|
||||
rolesAssignedToMe: "自分に割り当てられたロール"
|
||||
resetPasswordConfirm: "パスワードリセットしますか?"
|
||||
|
||||
_achievements:
|
||||
earnedAt: "獲得日時"
|
||||
|
|
|
@ -262,14 +262,21 @@ async function updateRemoteUser() {
|
|||
}
|
||||
|
||||
async function resetPassword() {
|
||||
const { password } = await os.api('admin/reset-password', {
|
||||
userId: user.id,
|
||||
});
|
||||
|
||||
os.alert({
|
||||
type: 'success',
|
||||
text: i18n.t('newPasswordIs', { password }),
|
||||
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) {
|
||||
|
|
Loading…
Reference in New Issue