heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
syuilo 2023-03-12 16:45:11 +09:00
commit ba98abc97b
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
locales/ja-JP.yml
View file

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

9
packages/frontend/src/pages/user-info.vue
View file

@ -262,14 +262,21 @@ 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) {