yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Object printed in UI

Browse Source
This commit is contained in:
Tom Moor
2020-12-12 22:29:20 -08:00
parent 72189e041b
commit 3fe807a10a
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/scenes/CollectionMembers/components/MemberListItem.js
View File

@@ -1,6 +1,6 @@
// @flow
import * as React from "react";
import { useTranslation } from "react-i18next";
import { Trans, useTranslation } from "react-i18next";
import styled from "styled-components";
import Membership from "models/Membership";
import User from "models/User";
@@ -46,11 +46,9 @@ const MemberListItem = ({
subtitle={
<>
{user.lastActiveAt ? (
<>
{t("Active {{ lastActiveAt }} ago", {
lastActiveAt: <Time dateTime={user.lastActiveAt} />,
})}
</>
<Trans>
Active <Time dateTime={user.lastActiveAt} /> ago
</Trans>
) : (
t("Never signed in")
)}

10
app/scenes/CollectionMembers/components/UserListItem.js
View File

@@ -1,7 +1,7 @@
// @flow
import { PlusIcon } from "outline-icons";
import * as React from "react";
import { useTranslation } from "react-i18next";
import { Trans, useTranslation } from "react-i18next";
import User from "models/User";
import Avatar from "components/Avatar";
import Badge from "components/Badge";
@@ -25,11 +25,9 @@ const UserListItem = ({ user, onAdd, canEdit }: Props) => {
subtitle={
<>
{user.lastActiveAt ? (
<>
{t("Active {{ lastActiveAt }} ago", {
lastActiveAt: <Time dateTime={user.lastActiveAt} />,
})}
</>
<Trans>
Active <Time dateTime={user.lastActiveAt} /> ago
</Trans>
) : (
t("Never signed in")
)}

2
shared/i18n/locales/en_US/translation.json
View File

@@ -212,7 +212,7 @@
"Read & Edit": "Read & Edit",
"Permissions": "Permissions",
"Remove": "Remove",
"Active {{ lastActiveAt }} ago": "Active {{ lastActiveAt }} ago",
"Active <1></1> ago": "Active <1></1> ago",
"Never signed in": "Never signed in",
"Invited": "Invited",
"Admin": "Admin",