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
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,14 @@ export default {
</a>`
},
copyLinkTooltip() {
return this.isCopied ? t('federatedfilesharing', 'Cloud ID copied to the clipboard') : t('federatedfilesharing', 'Copy to clipboard')
return this.isCopied ? t('federatedfilesharing', 'Cloud ID copied') : t('federatedfilesharing', 'Copy')
},
},
methods: {
async copyCloudId(): Promise<void> {
try {
await navigator.clipboard.writeText(this.cloudId)
showSuccess(t('federatedfilesharing', 'Cloud ID copied to the clipboard'))
showSuccess(t('federatedfilesharing', 'Cloud ID copied'))
} catch (e) {
// no secure context or really old browser - need a fallback
window.prompt(t('federatedfilesharing', 'Clipboard not available. Please copy the cloud ID manually.'), this.reference)
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/actions/sidebarAction.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('Open sidebar action conditions tests', () => {
test('Default values', () => {
expect(action).toBeInstanceOf(FileAction)
expect(action.id).toBe('details')
expect(action.displayName([], view)).toBe('Open details')
expect(action.displayName([], view)).toBe('Details')
expect(action.iconSvgInline([], view)).toMatch(/<svg.+<\/svg>/)
expect(action.default).toBeUndefined()
expect(action.order).toBe(-50)
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/actions/sidebarAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const ACTION_DETAILS = 'details'

export const action = new FileAction({
id: ACTION_DETAILS,
displayName: () => t('files', 'Open details'),
displayName: () => t('files', 'Details'),
iconSvgInline: () => InformationSvg,

// Sidebar currently supports user folder only, /files/USER
Expand Down
6 changes: 3 additions & 3 deletions apps/files/src/components/FilesListTableHeaderActions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -305,16 +305,16 @@ export default defineComponent({
return
}

showError(this.t('files', '"{displayName}" failed on some elements', { displayName }))
showError(this.t('files', '{displayName}: failed on some elements', { displayName }))
return
}

// Show success message and clear selection
showSuccess(this.t('files', '"{displayName}" batch action executed successfully', { displayName }))
showSuccess(this.t('files', '{displayName}: done', { displayName }))
this.selectionStore.reset()
} catch (e) {
logger.error('Error while executing action', { action, e })
showError(this.t('files', '"{displayName}" action failed', { displayName }))
showError(this.t('files', '{displayName}: failed', { displayName }))
} finally {
// Remove loading markers
this.loading = null
Expand Down
8 changes: 4 additions & 4 deletions apps/files/src/components/FilesNavigationSearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ const isSearchView = computed(() => currentView.value.id === VIEW_ID)
*/
const searchLabel = computed(() => {
if (searchStore.scope === 'globally') {
return t('files', 'Search globally by filename …')
return t('files', 'Search everywhere …')
}
return t('files', 'Search here by filename …')
return t('files', 'Search here …')
})
</script>

Expand All @@ -72,13 +72,13 @@ const searchLabel = computed(() => {
<template #icon>
<NcIconSvgWrapper :path="mdiMagnify" />
</template>
{{ t('files', 'Filter and search from this location') }}
{{ t('files', 'Search here') }}
</NcActionButton>
<NcActionButton close-after-click @click="searchStore.scope = 'globally'">
<template #icon>
<NcIconSvgWrapper :path="mdiSearchWeb" />
</template>
{{ t('files', 'Search globally') }}
{{ t('files', 'Search everywhere') }}
</NcActionButton>
</NcActions>
</template>
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/filters/TypeFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const getTypePresets = async () => [
{
id: 'image',
// TRANSLATORS: This is for filtering files, e.g. PNG or JPEG, so photos, drawings, or images in general
label: t('files', 'Photos and images'),
label: t('files', 'Images'),
icon: svgImage,
mime: ['image'],
},
Expand Down
6 changes: 3 additions & 3 deletions apps/files/src/utils/actionUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ export const executeAction = async (action: FileAction) => {
}

if (success) {
showSuccess(t('files', '"{displayName}" action executed successfully', { displayName }))
showSuccess(t('files', '{displayName}: done', { displayName }))
return
}
showError(t('files', '"{displayName}" action failed', { displayName }))
showError(t('files', '{displayName}: failed', { displayName }))
} catch (error) {
logger.error('Error while executing action', { action, error })
showError(t('files', '"{displayName}" action failed', { displayName }))
showError(t('files', '{displayName}: failed', { displayName }))
} finally {
// Reset the loading marker
Vue.set(currentNode, 'status', undefined)
Expand Down
2 changes: 1 addition & 1 deletion apps/files/src/utils/davUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function humanizeWebDAVError(error: unknown) {
} else if (status === 403) {
return t('files', 'This operation is forbidden')
} else if (status === 500) {
return t('files', 'This directory is unavailable, please check the logs or contact the administrator')
return t('files', 'This folder is unavailable, please try again later or contact the administration')
} else if (status === 503) {
return t('files', 'Storage is temporarily not available')
}
Expand Down
6 changes: 3 additions & 3 deletions apps/files/src/views/FilesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -816,13 +816,13 @@ export default defineComponent({
}

if (success) {
showSuccess(t('files', '"{displayName}" action executed successfully', { displayName }))
showSuccess(t('files', '{displayName}: done', { displayName }))
return
}
showError(t('files', '"{displayName}" action failed', { displayName }))
showError(t('files', '{displayName}: failed', { displayName }))
} catch (error) {
logger.error('Error while executing action', { action, error })
showError(t('files', '"{displayName}" action failed', { displayName }))
showError(t('files', '{displayName}: failed', { displayName }))
} finally {
this.loadingAction = null
}
Expand Down
60 changes: 29 additions & 31 deletions apps/files/src/views/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
:name="t('files', 'Files settings')"
@update:open="onClose">
<!-- Settings API-->
<NcAppSettingsSection id="settings" :name="t('files', 'Files settings')">
<NcAppSettingsSection id="settings" :name="t('files', 'General')">
<fieldset class="files-settings__default-view"
data-cy-files-settings-setting="default_view">
<legend>
Expand Down Expand Up @@ -42,12 +42,12 @@
<NcCheckboxRadioSwitch data-cy-files-settings-setting="folder_tree"
:checked="userConfig.folder_tree"
@update:checked="setConfig('folder_tree', $event)">
{{ t('files', 'Enable folder tree') }}
{{ t('files', 'Folder tree') }}
</NcCheckboxRadioSwitch>
</NcAppSettingsSection>

<!-- Visual settings -->
<NcAppSettingsSection id="settings" :name="t('files', 'Visual settings')">
<!-- Appearance -->
<NcAppSettingsSection id="settings" :name="t('files', 'Appearance')">
<NcCheckboxRadioSwitch data-cy-files-settings-setting="show_hidden"
:checked="userConfig.show_hidden"
@update:checked="setConfig('show_hidden', $event)">
Expand All @@ -58,16 +58,16 @@
@update:checked="setConfig('show_mime_column', $event)">
{{ t('files', 'Show file type column') }}
</NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch data-cy-files-settings-setting="show_files_extensions"
:checked="userConfig.show_files_extensions"
@update:checked="setConfig('show_files_extensions', $event)">
{{ t('files', 'Show file extensions') }}
</NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch data-cy-files-settings-setting="crop_image_previews"
:checked="userConfig.crop_image_previews"
@update:checked="setConfig('crop_image_previews', $event)">
{{ t('files', 'Crop image previews') }}
</NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch data-cy-files-settings-setting="show_files_extensions"
:checked="userConfig.show_files_extensions"
@update:checked="setConfig('show_files_extensions', $event)">
{{ t('files', 'Show files extensions') }}
</NcCheckboxRadioSwitch>
</NcAppSettingsSection>

<!-- Settings API-->
Expand All @@ -85,7 +85,7 @@
:label="t('files', 'WebDAV URL')"
:show-trailing-button="true"
:success="webdavUrlCopied"
:trailing-button-label="t('files', 'Copy to clipboard')"
:trailing-button-label="t('files', 'Copy')"
:value="webdavUrl"
class="webdav-url-input"
readonly="readonly"
Expand All @@ -101,7 +101,7 @@
:href="webdavDocs"
target="_blank"
rel="noreferrer noopener">
{{ t('files', 'Use this address to access your Files via WebDAV.') }} ↗
{{ t('files', 'How to access files using WebDAV') }} ↗
</a>
</em>
<br>
Expand All @@ -113,22 +113,20 @@
</NcAppSettingsSection>

<NcAppSettingsSection id="warning" :name="t('files', 'Warnings')">
<em>{{ t('files', 'Prevent warning dialogs from open or reenable them.') }}</em>
<NcCheckboxRadioSwitch type="switch"
:checked="userConfig.show_dialog_file_extension"
@update:checked="setConfig('show_dialog_file_extension', $event)">
{{ t('files', 'Show a warning dialog when changing a file extension.') }}
{{ t('files', 'Warn before changing a file extension') }}
</NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch type="switch"
:checked="userConfig.show_dialog_deletion"
@update:checked="setConfig('show_dialog_deletion', $event)">
{{ t('files', 'Show a warning dialog when deleting files.') }}
{{ t('files', 'Warn before deleting files') }}
</NcCheckboxRadioSwitch>
</NcAppSettingsSection>

<NcAppSettingsSection id="shortcuts"
:name="t('files', 'Keyboard shortcuts')">
<em>{{ t('files', 'Speed up your Files experience with these quick shortcuts.') }}</em>

<h3>{{ t('files', 'Actions') }}</h3>
<dl>
Expand All @@ -137,39 +135,39 @@
<kbd>a</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Open the actions menu for a file') }}
{{ t('files', 'File actions') }}
</dd>
</div>
<div>
<dt class="shortcut-key">
<kbd>F2</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Rename a file') }}
{{ t('files', 'Rename') }}
</dd>
</div>
<div>
<dt class="shortcut-key">
<kbd>Del</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Delete a file') }}
{{ t('files', 'Delete') }}
</dd>
</div>
<div>
<dt class="shortcut-key">
<kbd>s</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Favorite or remove a file from favorites') }}
{{ t('files', 'Add or remove favorite') }}
</dd>
</div>
<div v-if="isSystemtagsEnabled">
<dt class="shortcut-key">
<kbd>t</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Manage tags for a file') }}
{{ t('files', 'Manage tags') }}
</dd>
</div>
</dl>
Expand All @@ -189,23 +187,23 @@
<kbd>ESC</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Deselect all files') }}
{{ t('files', 'Deselect all') }}
</dd>
</div>
<div>
<dt class="shortcut-key">
<kbd>Ctrl</kbd> + <kbd>Space</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Select or deselect a file') }}
{{ t('files', 'Select or deselect') }}
</dd>
</div>
<div>
<dt class="shortcut-key">
<kbd>Ctrl</kbd> + <kbd>Shift</kbd> <span>+ <kbd>Space</kbd></span>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Select a range of files') }}
{{ t('files', 'Select a range') }}
</dd>
</div>
</dl>
Expand All @@ -217,39 +215,39 @@
<kbd>Alt</kbd> + <kbd>↑</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Navigate to the parent folder') }}
{{ t('files', 'Go to parent folder') }}
</dd>
</div>
<div>
<dt class="shortcut-key">
<kbd>↑</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Navigate to the file above') }}
{{ t('files', 'Go to file above') }}
</dd>
</div>
<div>
<dt class="shortcut-key">
<kbd>↓</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Navigate to the file below') }}
{{ t('files', 'Go to file below') }}
</dd>
</div>
<div>
<dt class="shortcut-key">
<kbd>←</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Navigate to the file on the left (in grid mode)') }}
{{ t('files', 'Go left in grid') }}
</dd>
</div>
<div>
<dt class="shortcut-key">
<kbd>→</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Navigate to the file on the right (in grid mode)') }}
{{ t('files', 'Go right in grid') }}
</dd>
</div>
</dl>
Expand All @@ -261,15 +259,15 @@
<kbd>V</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Toggle the grid view') }}
{{ t('files', 'Toggle grid view') }}
</dd>
</div>
<div>
<dt class="shortcut-key">
<kbd>D</kbd>
</dt>
<dd class="shortcut-description">
{{ t('files', 'Open the sidebar for a file') }}
{{ t('files', 'Open file sidebar') }}
</dd>
</div>
<div>
Expand Down Expand Up @@ -400,7 +398,7 @@ export default {

await navigator.clipboard.writeText(this.webdavUrl)
this.webdavUrlCopied = true
showSuccess(t('files', 'WebDAV URL copied to clipboard'))
showSuccess(t('files', 'WebDAV URL copied'))
setTimeout(() => {
this.webdavUrlCopied = false
}, 5000)
Expand Down
4 changes: 2 additions & 2 deletions apps/files_reminders/src/actions/setReminderCustomAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import { pickCustomDate } from '../services/customPicker'

export const action = new FileAction({
id: 'set-reminder-custom',
displayName: () => t('files_reminders', 'Set custom reminder'),
title: () => t('files_reminders', 'Set reminder at custom date & time'),
displayName: () => t('files_reminders', 'Custom reminder'),
title: () => t('files_reminders', 'Reminder at custom date & time'),
iconSvgInline: () => CalendarClockSvg,

enabled: (nodes: Node[], view: View) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export default Vue.extend({
},

label(): string {
return t('files_reminders', 'Set reminder at custom date & time')
return t('files_reminders', 'Reminder at custom date & time')
},

clearAriaLabel(): string {
Expand Down
Loading
Loading