From bc1503655dd80a9f6183f4359c2a95379eb68d57 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Mon, 7 Oct 2024 14:45:47 +0200 Subject: [PATCH] fix: ensure the fallback language `en.ts` has all of the same variables as the other languages, namely en-us had a few new variables --- src/assets/lang/en-us.ts | 20 +++++++++++++++----- src/assets/lang/en.ts | 20 +++++++++++++++++--- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/assets/lang/en-us.ts b/src/assets/lang/en-us.ts index 26fe42eea5..f14e5b19fc 100644 --- a/src/assets/lang/en-us.ts +++ b/src/assets/lang/en-us.ts @@ -171,7 +171,14 @@ export default { morePublishingOptions: 'More publishing options', submitChanges: 'Submit', }, + auditTrailsMedia: { + delete: 'Media deleted', + move: 'Media moved', + copy: 'Media copied', + save: 'Media saved', + }, auditTrails: { + assigndomain: 'Domain assigned: %0%', atViewingFor: 'Viewing for', delete: 'Content deleted', unpublish: 'Content unpublished', @@ -189,6 +196,7 @@ export default { custom: '%0%', contentversionpreventcleanup: 'Cleanup disabled for version: %0%', contentversionenablecleanup: 'Cleanup enabled for version: %0%', + smallAssignDomain: 'Assign Domain', smallCopy: 'Copy', smallPublish: 'Publish', smallPublishVariant: 'Publish', @@ -333,6 +341,7 @@ export default { variantSendForApprovalNotAllowed: 'Send for approval is not allowed', variantScheduleNotAllowed: 'Schedule is not allowed', variantUnpublishNotAllowed: 'Unpublish is not allowed', + selectAllVariants: 'Select all variants', }, blueprints: { createBlueprintFrom: "Create a new Document Blueprint from '%0%'", @@ -354,25 +363,26 @@ export default { invalidFileName: 'Cannot upload this file, it does not have a valid file name', maxFileSize: 'Max file size is', mediaRoot: 'Media root', - moveToSameFolderFailed: 'Parent and destination folders cannot be the same', createFolderFailed: 'Failed to create a folder under parent id %0%', renameFolderFailed: 'Failed to rename the folder with id %0%', dragAndDropYourFilesIntoTheArea: 'Drag and drop your file(s) into the area', + fileSecurityValidationFailure: 'One or more file security validations have failed', + moveToSameFolderFailed: 'Parent and destination folders cannot be the same', uploadNotAllowed: 'Upload is not allowed in this location.', }, member: { - createNewMember: 'Create a new member', + '2fa': 'Two-Factor Authentication', allMembers: 'All Members', + createNewMember: 'Create a new member', duplicateMemberLogin: 'A member with this login already exists', kind: 'Kind', memberGroupNoProperties: 'Member groups have no additional properties for editing.', memberHasGroup: "The member is already in group '%0%'", memberHasPassword: 'The member already has a password set', - memberLockoutNotEnabled: 'Lockout is not enabled for this member', - memberNotInGroup: "The member is not in group '%0%'", - '2fa': 'Two-Factor Authentication', memberKindDefault: 'Member', memberKindApi: 'API Member', + memberLockoutNotEnabled: 'Lockout is not enabled for this member', + memberNotInGroup: "The member is not in group '%0%'", }, contentType: { copyFailed: 'Failed to copy content type', diff --git a/src/assets/lang/en.ts b/src/assets/lang/en.ts index d714c4675e..816ef955ea 100644 --- a/src/assets/lang/en.ts +++ b/src/assets/lang/en.ts @@ -370,13 +370,16 @@ export default { uploadNotAllowed: 'Upload is not allowed in this location.', }, member: { - createNewMember: 'Create a new member', - allMembers: 'All Members', - memberGroupNoProperties: 'Member groups have no additional properties for editing.', '2fa': 'Two-Factor Authentication', + allMembers: 'All Members', + createNewMember: 'Create a new member', duplicateMemberLogin: 'A member with this login already exists', + kind: 'Kind', + memberGroupNoProperties: 'Member groups have no additional properties for editing.', memberHasGroup: "The member is already in group '%0%'", memberHasPassword: 'The member already has a password set', + memberKindDefault: 'Member', + memberKindApi: 'API Member', memberLockoutNotEnabled: 'Lockout is not enabled for this member', memberNotInGroup: "The member is not in group '%0%'", }, @@ -1901,6 +1904,14 @@ export default { administrators: 'Administrator', categoryField: 'Category field', createDate: 'User created', + createUserHeadline: (kind: string) => { + return kind === 'Api' ? 'Create API user' : 'Create user'; + }, + createUserDescription: (kind: string) => { + const defaultUserText = `Create a user to give them access to Umbraco. When a user is created a password will be generated that you can share with them.`; + const apiUserText = `Create an Api User to allow external services to authenticate with the Umbraco Management API.`; + return kind === 'Api' ? apiUserText : defaultUserText; + }, changePassword: 'Change your password', changePhoto: 'Change photo', configureMfa: 'Configure MFA', @@ -1910,6 +1921,7 @@ export default { ? 'The email address is used for notifications, password recovery, and as the username for logging in' : 'The email address is used for notifications and password recovery'; }, + kind: 'Kind', newPassword: 'New password', newPasswordFormatLengthTip: 'Minimum %0% character(s) to go!', newPasswordFormatNonAlphaTip: 'There should be at least %0% special character(s) in there.', @@ -2043,6 +2055,8 @@ export default { sortCreateDateDescending: 'Newest', sortCreateDateAscending: 'Oldest', sortLastLoginDateDescending: 'Last login', + userKindDefault: 'User', + userKindApi: 'API User', noUserGroupsAdded: 'No user groups have been added', '2faDisableText': 'If you wish to disable this two-factor provider, then you must enter the code shown on your authentication device:',