Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/locales/en.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"Nav": {
"item_drive": "Files",
"item_recent": "Recent",
"item_drive": "My Drive",
"item_recent": "Recents",
"item_sharings": "Sharings",
"item_shared": "Shared by me",
"item_activity": "Activity",
"item_trash": "Trash",
"item_trash": "Bin",
"item_settings": "Settings",
"item_collect": "Administrative",
"item_shared_drives": "Shared drives",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/fr.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Nav": {
"item_drive": "Fichiers",
"item_drive": "Mon Drive",
"item_recent": "Récents",
"item_sharings": "Partages",
"item_shared": "Partagés",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/ru.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Nav": {
"item_drive": "Файлы",
"item_drive": "Мой диск",
"item_recent": "Недавние",
"item_sharings": "Общие",
"item_shared": "Мои отправленные файлы",
Expand Down
2 changes: 1 addition & 1 deletion src/locales/vi.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Nav": {
"item_drive": "Tệp",
"item_drive": "Ổ đĩa của tôi",
"item_recent": "Gần đây",
"item_sharings": "Chia sẻ",
"item_shared": "Chia sẻ bởi tôi",
Expand Down
7 changes: 6 additions & 1 deletion src/modules/navigation/FavoriteListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,12 @@ const FavoriteListItem: FC<FavoriteListItemProps> = ({
onClick={(): void => setLastClicked(undefined)}
>
<NavIcon icon={ItemIcon} />
<Typography variant="inherit" color="inherit" noWrap>
<Typography
className="u-fz-small"
variant="inherit"
color="inherit"
noWrap
>
{filename}
</Typography>
</FileLink>
Expand Down
6 changes: 3 additions & 3 deletions src/modules/navigation/Nav.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react'

import Icon from 'cozy-ui/transpiled/react/Icon'
import ClockIcon from 'cozy-ui/transpiled/react/Icons/Clock'
import FolderIcon from 'cozy-ui/transpiled/react/Icons/Folder'
import ClockIcon from 'cozy-ui/transpiled/react/Icons/ClockOutline'
import CloudIcon from 'cozy-ui/transpiled/react/Icons/Cloud2'
import StarIcon from 'cozy-ui/transpiled/react/Icons/Star'
import TrashIcon from 'cozy-ui/transpiled/react/Icons/Trash'
import UINav from 'cozy-ui/transpiled/react/Nav'
Expand All @@ -22,7 +22,7 @@ export const Nav = () => {
<UINav>
<NavItem
to="/folder"
icon={<Icon icon={FolderIcon} />}
icon={<Icon icon={CloudIcon} />}
label="drive"
rx={/\/(folder|nextcloud)(\/.*)?/}
clickState={clickState}
Expand Down
8 changes: 4 additions & 4 deletions src/modules/views/useUpdateDocumentTitle.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ describe('makeTitle', () => {
'Cozy Drive',
t
)
).toBe('file.docx (Trash/folder) - Cozy Drive')
).toBe('file.docx (Bin/folder) - Cozy Drive')
})

it('should show trash folder with human frendly name even if no subdirectory', () => {
expect(
makeTitle({ name: 'file.docx', path: TRASH_DIR_PATH }, 'Cozy Drive', t)
).toBe('file.docx (Trash) - Cozy Drive')
).toBe('file.docx (Bin) - Cozy Drive')
})
})

Expand All @@ -68,7 +68,7 @@ describe('makeTitle', () => {
'Cozy Drive',
t
)
).toBe('Trash - Cozy Drive')
).toBe('Bin - Cozy Drive')
})

it('should show trash folder with human frendly name', () => {
Expand All @@ -82,7 +82,7 @@ describe('makeTitle', () => {
'Cozy Drive',
t
)
).toBe('folder (Trash/folder) - Cozy Drive')
).toBe('folder (Bin/folder) - Cozy Drive')
})

it('should show folder path and app name', () => {
Expand Down
Loading