From 2d6ff4d6107f7ea92a1efb9982e896da28363149 Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Sun, 7 Jun 2020 01:09:34 +0300 Subject: [PATCH] Add translation, fix tag display --- src/lang/en.js | 4 +++- src/views/users/components/ResetPasswordDialog.vue | 4 ++-- src/views/users/show.vue | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lang/en.js b/src/lang/en.js index 3907cec0..291bbde3 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -240,7 +240,9 @@ export default { confirmAccounts: 'Confirm accounts', resendConfirmation: 'Resend confirmation email', invalidAccount: 'This account has invalid nickname and can\'t be modified', - invalidNickname: 'invalid nickname' + invalidNickname: 'invalid nickname', + passwordResetTokenGenerated: 'Password reset token was generated:', + linkToResetPassword: 'You can also use this link to reset password:' }, statuses: { statuses: 'Statuses', diff --git a/src/views/users/components/ResetPasswordDialog.vue b/src/views/users/components/ResetPasswordDialog.vue index b70f289d..f47886cc 100644 --- a/src/views/users/components/ResetPasswordDialog.vue +++ b/src/views/users/components/ResetPasswordDialog.vue @@ -6,8 +6,8 @@ custom-class="password-reset-token-dialog" @close="closeResetPasswordDialog">
-

Password reset token was generated: {{ passwordResetToken }}

-

You can also use this link to reset password: +

{{ $t('users.passwordResetTokenGenerated') }} {{ passwordResetToken }}

+

{{ $t('users.linkToResetPassword') }} {{ passwordResetLink }}

diff --git a/src/views/users/show.vue b/src/views/users/show.vue index 872883ef..424096b9 100644 --- a/src/views/users/show.vue +++ b/src/views/users/show.vue @@ -51,7 +51,7 @@ {{ $t('userProfile.tags') }} - {{ tag }} + {{ humanizeTag(tag) }} @@ -286,7 +286,8 @@ table { .user-page-header { display: flex; justify-content: space-between; - padding: 0 15px 0 20px; + margin: 22px 15px 22px 20px; + padding: 0; align-items: center; h1 { display: inline