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