diff options
Diffstat (limited to 'app/helpers/users_helper.rb')
| -rw-r--r-- | app/helpers/users_helper.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 4ea2512bc67..cae2addea9c 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -15,11 +15,11 @@ module UsersHelper end def user_email_help_text(user) - return 'We also use email for avatar detection if no avatar is uploaded.' unless user.unconfirmed_email.present? + return _('We also use email for avatar detection if no avatar is uploaded.') unless user.unconfirmed_email.present? - confirmation_link = link_to 'Resend confirmation e-mail', user_confirmation_path(user: { email: @user.unconfirmed_email }), method: :post + confirmation_link = link_to _('Resend confirmation e-mail'), user_confirmation_path(user: { email: user.unconfirmed_email }), method: :post - h('Please click the link in the confirmation email before continuing. It was sent to ') + + h(_('Please click the link in the confirmation email before continuing. It was sent to ')) + content_tag(:strong) { user.unconfirmed_email } + h('.') + content_tag(:p) { confirmation_link } end @@ -67,12 +67,6 @@ module UsersHelper "access:#{max_project_member_access(project)}" end - def show_status_emoji?(status) - return false unless status - - status.message.present? || status.emoji != UserStatus::DEFAULT_EMOJI - end - def user_status(user) return unless user |