Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

L10n update 12 20 23 #10226

Merged
merged 2 commits into from
Dec 20, 2023
Merged

L10n update 12 20 23 #10226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e0630e
Replace pgettext with gettext (#10225)
AlexAndBear Dec 20, 2023
e4b71d6
[tx] updated from transifex
ownclouders Dec 20, 2023
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
2 changes: 1 addition & 1 deletion packages/web-pkg/l10n/translations.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions packages/web-pkg/src/composables/actions/files/useFileActionsCopy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const useFileActionsCopy = ({ store }: { store?: Store<any> } = {}) => {
const router = useRouter()

const language = useGettext()
const { $pgettext } = language
const { $gettext } = language

const isMacOs = computed(() => {
return window.navigator.platform.match('Mac')
Expand All @@ -27,9 +27,9 @@ export const useFileActionsCopy = ({ store }: { store?: Store<any> } = {}) => {

const copyShortcutString = computed(() => {
if (unref(isMacOs)) {
return $pgettext('Keyboard shortcut for macOS for copying files', '⌘ + C')
return $gettext('⌘ + C')
}
return $pgettext('Keyboard shortcut for non-macOS systems for copying files', 'Ctrl + C')
return $gettext('Ctrl + C')
})

const handler = ({ space, resources }: FileActionOptions) => {
Expand All @@ -47,8 +47,7 @@ export const useFileActionsCopy = ({ store }: { store?: Store<any> } = {}) => {
icon: 'file-copy-2',
handler,
shortcut: unref(copyShortcutString),
label: () =>
$pgettext('Action in the files list row to initiate copying resources', 'Copy'),
label: () => $gettext('Copy'),
isEnabled: ({ resources }) => {
if (
!isLocationSpacesActive(router, 'files-spaces-generic') &&
Expand Down
7 changes: 2 additions & 5 deletions packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { useLoadingService } from '../../loadingService'
export const useFileActionsEmptyTrashBin = ({ store }: { store?: Store<any> } = {}) => {
store = store || useStore()
const router = useRouter()
const { $gettext, $pgettext } = useGettext()
const { $gettext } = useGettext()
const clientService = useClientService()
const loadingService = useLoadingService()
const hasPermanentDeletion = useCapabilityFilesPermanentDeletion()
Expand All @@ -32,10 +32,7 @@ export const useFileActionsEmptyTrashBin = ({ store }: { store?: Store<any> } =
.catch((error) => {
console.error(error)
store.dispatch('showErrorMessage', {
title: $pgettext(
'Error message in case emptying trash bin fails',
'Failed to empty trash bin'
),
title: $gettext('Failed to empty trash bin'),
error
})
})
Expand Down
8 changes: 4 additions & 4 deletions packages/web-pkg/src/composables/actions/files/useFileActionsMove.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ export const useFileActionsMove = ({ store }: { store?: Store<any> } = {}) => {
store = store || useStore()
const router = useRouter()
const language = useGettext()
const { $pgettext } = language
const { $gettext } = language

const isMacOs = computed(() => {
return window.navigator.platform.match('Mac')
})

const cutShortcutString = computed(() => {
if (unref(isMacOs)) {
return $pgettext('Keyboard shortcut for macOS for cutting files', '⌘ + X')
return $gettext('⌘ + X')
}
return $pgettext('Keyboard shortcut for non-macOS systems for cutting files', 'Ctrl + X')
return $gettext('Ctrl + X')
})

const handler = ({ space, resources }: ActionOptions) => {
Expand All @@ -37,7 +37,7 @@ export const useFileActionsMove = ({ store }: { store?: Store<any> } = {}) => {
icon: 'scissors',
handler,
shortcut: unref(cutShortcutString),
label: () => $pgettext('Action in the files list row to initiate cutting resources', 'Cut'),
label: () => $gettext('Cut'),
isEnabled: ({ resources }) => {
if (
!isLocationSpacesActive(router, 'files-spaces-generic') &&
Expand Down
4 changes: 2 additions & 2 deletions packages/web-pkg/src/composables/actions/files/useFileActionsNavigate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { FileAction } from '../types'
export const useFileActionsNavigate = ({ store }: { store?: Store<any> } = {}) => {
store = store || useStore()
const router = useRouter()
const { $pgettext } = useGettext()
const { $gettext } = useGettext()
const { getMatchingSpace } = useGetMatchingSpace()

const getSpace = (space: SpaceResource, resource: Resource) => {
Expand All @@ -40,7 +40,7 @@ export const useFileActionsNavigate = ({ store }: { store?: Store<any> } = {}) =
{
name: 'navigate',
icon: 'folder-open',
label: () => $pgettext('Action in the files list row to open a folder', 'Open folder'),
label: () => $gettext('Open folder'),
isEnabled: ({ resources }) => {
if (isLocationTrashActive(router, 'files-trash-generic')) {
return false
Expand Down
8 changes: 4 additions & 4 deletions packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
const clientService = useClientService()
const loadingService = useLoadingService()
const { getMatchingSpace } = useGetMatchingSpace()
const { $gettext, $pgettext, $ngettext } = useGettext()
const { $gettext, $ngettext } = useGettext()

const isMacOs = computed(() => {
return window.navigator.platform.match('Mac')
})

const pasteShortcutString = computed(() => {
if (unref(isMacOs)) {
return $pgettext('Keyboard shortcut for macOS for pasting files', '⌘ + V')
return $gettext('⌘ + V')
}
return $pgettext('Keyboard shortcut for non-macOS systems for pasting files', 'Ctrl + V')
return $gettext('Ctrl + V')
})

const handler = async ({ space: targetSpace }: FileActionOptions) => {
Expand Down Expand Up @@ -76,7 +76,7 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
name: 'paste',
icon: 'clipboard',
handler,
label: () => $pgettext('Action in the files list row to initiate pasting resources', 'Paste'),
label: () => $gettext('Paste'),
shortcut: unref(pasteShortcutString),
isEnabled: ({ resources }) => {
if (store.getters['Files/clipboardResources'].length === 0) {
Expand Down