diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-06-24 15:16:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-24 15:16:38 +0200 |
| commit | 2a4e44a725db57b8b506de6b09926bd977d4c504 (patch) | |
| tree | f0e0c38291c304e47c64f0f947b9982615523e74 /app/views | |
| parent | 776e00f19399875a135a64d8ad486f3578101cf9 (diff) | |
| parent | 86aca08ec6c1034e69c284b5b5e7b1020a30dff8 (diff) | |
Merge pull request #1553 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/settings/login_activities/_login_activity.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/settings/login_activities/_login_activity.html.haml b/app/views/settings/login_activities/_login_activity.html.haml index 19a3cc3dd..0c2c7087d 100644 --- a/app/views/settings/login_activities/_login_activity.html.haml +++ b/app/views/settings/login_activities/_login_activity.html.haml @@ -1,6 +1,6 @@ - method_str = content_tag(:span, login_activity.omniauth? ? t(login_activity.provider, scope: 'auth.providers') : t(login_activity.authentication_method, scope: 'login_activities.authentication_methods'), class: 'target') - ip_str = content_tag(:span, login_activity.ip, class: 'target') -- browser_str = content_tag(:span, t('sessions.description', browser: t("sessions.browsers.#{login_activity.browser}", default: "#{login_activity.browser}"), platform: t("sessions.platforms.#{login_activity.platform}", default: "#{login_activity.platform}")), class: 'target') +- browser_str = content_tag(:span, t('sessions.description', browser: t("sessions.browsers.#{login_activity.browser}", default: "#{login_activity.browser}"), platform: t("sessions.platforms.#{login_activity.platform}", default: "#{login_activity.platform}")), class: 'target', title: login_activity.user_agent) .log-entry .log-entry__header @@ -14,4 +14,4 @@ - else = t('login_activities.failed_sign_in_html', method: method_str, ip: ip_str, browser: browser_str) .log-entry__timestamp - %time.formatted{ datetime: login_activity.created_at.iso8601 } + %time.formatted{ datetime: login_activity.created_at.iso8601 }= l(login_activity.created_at) |