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 @@ -49,7 +49,7 @@ export const useGroupActionsDelete = () => {

const title =
failed.length === 1 && groups.length === 1
? $gettext('Failed to delete group "%{group}"', { group: groups[0].displayName })
? $gettext('Failed to delete group »%{group}«', { group: groups[0].displayName })
: $ngettext(
'Failed to delete %{groupCount} group',
'Failed to delete %{groupCount} groups',
Expand Down Expand Up @@ -80,7 +80,7 @@ export const useGroupActionsDelete = () => {

dispatchModal({
title: $ngettext(
'Delete group "%{group}"?',
'Delete group »%{group}«?',
'Delete %{groupCount} groups?',
resources.length,
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const useUserActionsEditQuota = () => {

const getModalTitle = ({ resources }: { resources: User[] }) => {
if (resources.length === 1) {
return $gettext('Change quota for user "%{name}"', {
return $gettext('Change quota for user »%{name}«', {
name: resources[0].displayName
})
}
Expand Down
4 changes: 2 additions & 2 deletions packages/web-app-external/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ const handlePostMessagesCollabora = async (event: MessageEvent) => {
if (message.MessageId === 'UI_SaveAs') {
if (Object.hasOwn(message.Values, 'format')) {
dispatchModal({
title: $gettext('Export %{name} as %{format}', {
title: $gettext('Export »%{name}« as %{format}', {
name: resource.name,
format: message.Values.format
}),
Expand All @@ -248,7 +248,7 @@ const handlePostMessagesCollabora = async (event: MessageEvent) => {
}

dispatchModal({
title: $gettext('Save %{name} with new name', { name: resource.name }),
title: $gettext('Save »%{name}« with new name', { name: resource.name }),
customComponent: FileNameModal,
customComponentAttrs: () => ({
space,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const useSpaceActionsUploadImage = ({ spaceImageInput }: { spaceImageInpu
;(event.currentTarget as HTMLInputElement).value = ''

dispatchModal({
title: $gettext('Crop your Space image'),
title: $gettext('Crop image for »%{space}«', { space: selectedSpace.name }),
confirmText: $gettext('Confirm'),
customComponent: SpaceImageModal,
focusTrapInitial: false,
Expand Down
2 changes: 1 addition & 1 deletion packages/web-pkg/src/components/CreateShortcutModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ export default defineComponent({

const inputFileNameErrorMessage = computed(() => {
if (unref(fileAlreadyExists)) {
return $gettext('%{name} already exists', { name: `${unref(inputFilename)}.url` })
return $gettext('»%{name}« already exists', { name: `${unref(inputFilename)}.url` })
}

if (/[/]/.test(unref(inputFilename))) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ export default defineComponent({
const message = computed(() =>
props.resource.isFolder
? $gettext(
'Folder with name "%{name}" already exists.',
'Folder with name »%{name}« already exists.',
{ name: props.resource.name },
true
)
: $gettext('File with name "%{name}" already exists.', { name: props.resource.name }, true)
: $gettext('File with name »%{name}« already exists.', { name: props.resource.name }, true)
)

const confirmSecondaryText = computed(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export const useFileActionsCreateLink = ({
if (enforceModal || passwordEnforced) {
dispatchModal({
title: $ngettext(
'Copy link for "%{resourceName}"',
'Copy link for »%{resourceName}«',
'Copy links for the selected items',
resources.length,
{ resourceName: resources[0].name }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ export const useFileActionsCreateSpaceFromResource = () => {
const handler = ({ resources, space }: FileActionOptions) => {
dispatchModal({
title: $ngettext(
'Create Space from "%{resourceName}"',
'Create Space from »%{resourceName}«',
'Create Space from selection',
resources.length,
{
resourceName: resources[0].name
}
),
message: $ngettext(
'Create Space with the content of "%{resourceName}".',
'Create Space with the content of »%{resourceName}«.',
'Create Space with the selected files.',
resources.length,
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ export const useFileActionsEmptyTrashBin = () => {

const handler = ({ resources }: SpaceActionOptions) => {
dispatchModal({
title: $gettext('Empty trash bin for "%{name}"', { name: resources[0].name }),
title: $gettext('Empty trash bin for »%{name}«', { name: resources[0].name }),
confirmText: $gettext('Delete'),
message: $gettext(
'Are you sure you want to permanently delete the items in "%{name}"? You can’t undo this action.',
'Are you sure you want to permanently delete the items in »%{name}«? You can’t undo this action.',
{
name: resources[0].name
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@ export const useFileActionsRename = () => {
} catch (error) {
console.error(error)
let title = $gettext(
'Failed to rename "%{file}" to "%{newName}"',
'Failed to rename "%{file}" to »%{newName}«',
{ file: resource.name, newName },
true
)
if (error.statusCode === 423) {
title = $gettext(
'Failed to rename "%{file}" to "%{newName}" - the file is locked',
'Failed to rename »%{file}« to »%{newName}« - the file is locked',
{ file: resource.name, newName },
true
)
Expand Down Expand Up @@ -133,8 +133,8 @@ export const useFileActionsRename = () => {
!resources[0].isFolder && !areFileExtensionsShown ? nameWithoutExtension : resources[0].name

const title = resources[0].isFolder
? $gettext('Rename folder %{name}', { name: modalTitle })
: $gettext('Rename file %{name}', { name: modalTitle })
? $gettext('Rename folder »%{name}«', { name: modalTitle })
: $gettext('Rename file »%{name}«', { name: modalTitle })

const inputValue =
!resources[0].isFolder && !areFileExtensionsShown ? nameWithoutExtension : resources[0].name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ export const useFileActionsDeleteResources = () => {
if (currentResources.length === 1) {
if (isFolder) {
title = $gettext(
'Permanently delete folder "%{name}"',
'Permanently delete folder »%{name}«',
{
name: currentResources[0].name
},
true
)
} else {
title = $gettext(
'Permanently delete file "%{name}"',
'Permanently delete file »%{name}«',
{
name: currentResources[0].name
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const useIsResourceNameValid = () => {
(file) => file.path === newPath && file.name === newName
)
if (exists) {
const translated = $gettext('The name "%{name}" is already taken')
const translated = $gettext('The name »%{name}« is already taken')
return { isValid: false, error: $gettext(translated, { name: newName }, true) }
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const useSpaceActionsDelete = () => {
if (succeeded.length) {
const title =
succeeded.length === 1 && spaces.length === 1
? $gettext('Space "%{space}" was deleted successfully', { space: spaces[0].name })
? $gettext('Space »%{space}« was deleted successfully', { space: spaces[0].name })
: $ngettext(
'%{spaceCount} space was deleted successfully',
'%{spaceCount} spaces were deleted successfully',
Expand All @@ -64,7 +64,7 @@ export const useSpaceActionsDelete = () => {

const title =
failed.length === 1 && spaces.length === 1
? $gettext('Failed to delete space "%{space}"', { space: spaces[0].name })
? $gettext('Failed to delete space »%{space}«', { space: spaces[0].name })
: $ngettext(
'Failed to delete %{spaceCount} space',
'Failed to delete %{spaceCount} spaces',
Expand Down Expand Up @@ -97,7 +97,7 @@ export const useSpaceActionsDelete = () => {

dispatchModal({
title: $ngettext(
'Delete Space "%{space}"?',
'Delete Space »%{space}«?',
'Delete %{spaceCount} Spaces?',
allowedResources.length,
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ export const useSpaceActionsDeleteImage = () => {

const handler = ({ resources }: SpaceActionOptions) => {
dispatchModal({
title: $gettext('Delete %{ space } image', { space: resources[0].name }),
title: $gettext('Delete »%{space image', { space: resources[0].name }),
confirmText: $gettext('Delete'),
onConfirm: () => deleteSpaceImage({ space: resources[0] }),
message: $gettext('Are you sure you want to delete the image of %{ space }?', {
message: $gettext('Are you sure you want to delete the image of »%{space?', {
space: resources[0].name
})
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const useSpaceActionsDisable = () => {
if (succeeded.length) {
const title =
succeeded.length === 1 && spaces.length === 1
? $gettext('Space "%{space}" was disabled successfully', { space: spaces[0].name })
? $gettext('Space »%{space}« was disabled successfully', { space: spaces[0].name })
: $ngettext(
'%{spaceCount} space was disabled successfully',
'%{spaceCount} spaces were disabled successfully',
Expand All @@ -65,7 +65,7 @@ export const useSpaceActionsDisable = () => {

const title =
failed.length === 1 && spaces.length === 1
? $gettext('Failed to disable space "%{space}"', { space: spaces[0].name })
? $gettext('Failed to disable space »%{space}«', { space: spaces[0].name })
: $ngettext(
'Failed to disable %{spaceCount} space',
'Failed to disable %{spaceCount} spaces',
Expand Down Expand Up @@ -95,7 +95,7 @@ export const useSpaceActionsDisable = () => {

dispatchModal({
title: $ngettext(
'Disable Space "%{space}"?',
'Disable Space »%{space}«?',
'Disable %{spaceCount} Spaces?',
allowedResources.length,
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,14 @@ export const useSpaceActionsDuplicate = () => {
}

showMessage({
title: $gettext('Space "%{space}" was duplicated successfully', {
title: $gettext('Space »%{space}« was duplicated successfully', {
space: existingSpace.name
})
})
} catch (error) {
console.error(error)
showErrorMessage({
title: $gettext('Failed to duplicate space "%{space}"', { space: existingSpace.name }),
title: $gettext('Failed to duplicate space »%{space}«', { space: existingSpace.name }),
errors: [error]
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const useSpaceActionsEditQuota = () => {

const getModalTitle = ({ resources }: { resources: SpaceResource[] }) => {
if (resources.length === 1) {
return $gettext('Change quota for Space "%{name}"', {
return $gettext('Change quota for Space »%{name}«', {
name: resources[0].name
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const useSpaceActionsRestore = () => {
if (succeeded.length) {
const title =
succeeded.length === 1 && spaces.length === 1
? $gettext('Space "%{space}" was enabled successfully', { space: spaces[0].name })
? $gettext('Space »%{space}« was enabled successfully', { space: spaces[0].name })
: $ngettext(
'%{spaceCount} space was enabled successfully',
'%{spaceCount} spaces were enabled successfully',
Expand All @@ -66,7 +66,7 @@ export const useSpaceActionsRestore = () => {

const title =
failed.length === 1 && spaces.length === 1
? $gettext('Failed to enabled space "%{space}"', { space: spaces[0].name })
? $gettext('Failed to enabled space »%{space}«', { space: spaces[0].name })
: $ngettext(
'Failed to enable %{spaceCount} space',
'Failed to enable %{spaceCount} spaces',
Expand Down Expand Up @@ -96,7 +96,7 @@ export const useSpaceActionsRestore = () => {

dispatchModal({
title: $ngettext(
'Enable Space "%{space}"?',
'Enable Space »%{space}«?',
'Enable %{spaceCount} Spaces?',
allowedResources.length,
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const useSpaceActionsSetIcon = () => {

dispatchModal({
elementClass: 'oc-width-auto',
title: $gettext('Set icon for %{space}', { space: resources[0].name }),
title: $gettext('Set icon for »%{space}«', { space: resources[0].name }),
hideConfirmButton: true,
customComponent: EmojiPickerModal,
focusTrapInitial: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ export class ResourceTransfer extends ConflictDialog {
if (errors.length === 1) {
title =
transferType === TransferType.COPY
? this.$gettext('Failed to copy "%{name}"', { name: errors[0]?.resourceName }, true)
: this.$gettext('Failed to move "%{name}"', { name: errors[0]?.resourceName }, true)
? this.$gettext('Failed to copy »%{name}«', { name: errors[0]?.resourceName }, true)
: this.$gettext('Failed to move »%{name}«', { name: errors[0]?.resourceName }, true)
}
let description = ''
if (errors.some(({ error }) => error instanceof HttpError && error.statusCode === 507)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('useIsResourceNameValid', () => {
parentResources
)
expect(isValid).toBe(false)
expect(error).toEqual('The name "otherName" is already taken')
expect(error).toEqual('The name »otherName« is already taken')
}
})
})
Expand Down Expand Up @@ -93,13 +93,13 @@ describe('useIsResourceNameValid', () => {
{
currentName: 'currentName',
newName: 'file1',
message: 'The name "file1" is already taken'
message: 'The name »file1« is already taken'
},
{
currentName: 'currentName',
newName: 'newname',
parentResources: [{ name: 'newname', path: '/newname' } as Resource],
message: 'The name "newname" is already taken'
message: 'The name »newname« is already taken'
},
{
currentName: 'currentName',
Expand Down