diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts index 10209e8b15ef..4e33e9ef361d 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts @@ -16,7 +16,7 @@ export default { 'In order to improve Umbraco and add new functionality based on as relevant information as possible, we would like to collect system- and usage information from your installation.
Aggregate data will be shared on a regular basis as well as learnings from these metrics.
Hopefully, you will help us collect some valuable data.

We WILL NOT collect any personal data such as content, code, user information, and all data will be fully anonymized.', basicLevelDescription: 'We will send an anonymized site ID, Umbraco version, and packages installed', detailedLevelDescription: - 'We will send: We might change what we send on the Detailed level in the future. If so, it will be listed above.
By choosing "Detailed" you agree to current and future anonymized information being collected.', + 'We will send: We might change what we send on the Detailed level in the future. If so, it will be listed above.
By choosing "Detailed" you agree to current and future anonymized information being collected.', minimalLevelDescription: 'We will only send an anonymized site ID to let us know that the site exists.', }, blockEditor: { diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/server-extension-registrator.controller.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/server-extension-registrator.controller.ts index 0f5af1c0b15e..bd366ddb06be 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/server-extension-registrator.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/server-extension-registrator.controller.ts @@ -34,7 +34,9 @@ export class UmbServerExtensionRegistrator extends UmbControllerBase { * @remark Users must have the BACKOFFICE_ACCESS permission to access this method. */ public async registerPrivateExtensions() { - const { data: packages } = await tryExecute(this, ManifestService.getManifestManifestPrivate()); + const { data: packages } = await tryExecute(this, ManifestService.getManifestManifestPrivate(), { + disableNotifications: true, + }); if (packages) { await this.#loadServerPackages(packages); } @@ -46,7 +48,9 @@ export class UmbServerExtensionRegistrator extends UmbControllerBase { * @remark Any user can access this method without any permissions. */ public async registerPublicExtensions() { - const { data: packages } = await tryExecute(this, ManifestService.getManifestManifestPublic()); + const { data: packages } = await tryExecute(this, ManifestService.getManifestManifestPublic(), { + disableNotifications: true, + }); if (packages) { await this.#loadServerPackages(packages); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/localization/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/localization/manifests.ts index c393e2f3db98..c1d88ac00951 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/localization/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/localization/manifests.ts @@ -4,7 +4,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.AR', - weight: -100, + weight: 100, name: 'Arabic Backoffice UI Localization', meta: { culture: 'ar', @@ -14,7 +14,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.BS', - weight: -100, + weight: 100, name: 'Bosnian Backoffice UI Localization', meta: { culture: 'bs', @@ -24,7 +24,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.CS', - weight: -100, + weight: 100, name: 'Czech Backoffice UI Localization', meta: { culture: 'cs', @@ -34,7 +34,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.CY', - weight: -100, + weight: 100, name: 'Welsh Backoffice UI Localization', meta: { culture: 'cy', @@ -44,7 +44,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.DA', - weight: -100, + weight: 100, name: 'Danish Backoffice UI Localization', meta: { culture: 'da', @@ -54,7 +54,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.DE', - weight: -100, + weight: 100, name: 'German Backoffice UI Localization', meta: { culture: 'de', @@ -64,7 +64,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.EN', - weight: -100, + weight: 100, name: 'English (United Kingdom) Backoffice UI Localization', meta: { culture: 'en', @@ -74,7 +74,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.EN_US', - weight: -100, + weight: 100, name: 'English (United States) Backoffice UI Localization', meta: { culture: 'en-US', @@ -84,7 +84,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.ES', - weight: -100, + weight: 100, name: 'Spanish Backoffice UI Localization', meta: { culture: 'es', @@ -94,7 +94,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.FR', - weight: -100, + weight: 100, name: 'French Backoffice UI Localization', meta: { culture: 'fr', @@ -104,7 +104,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.HE', - weight: -100, + weight: 100, name: 'Hebrew Backoffice UI Localization', meta: { culture: 'he', @@ -114,7 +114,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.HR', - weight: -100, + weight: 100, name: 'Croatian Backoffice UI Localization', meta: { culture: 'hr', @@ -124,7 +124,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.IT', - weight: -100, + weight: 100, name: 'Italian Backoffice UI Localization', meta: { culture: 'it', @@ -134,7 +134,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.JA', - weight: -100, + weight: 100, name: 'Japanese Backoffice UI Localization', meta: { culture: 'ja', @@ -144,7 +144,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.KO', - weight: -100, + weight: 100, name: 'Korean Backoffice UI Localization', meta: { culture: 'ko', @@ -154,7 +154,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.NB', - weight: -100, + weight: 100, name: 'Norwegian Backoffice UI Localization', meta: { culture: 'nb', @@ -164,7 +164,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.NL', - weight: -100, + weight: 100, name: 'Dutch Backoffice UI Localization', meta: { culture: 'nl', @@ -174,7 +174,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.PL', - weight: -100, + weight: 100, name: 'Polish Backoffice UI Localization', meta: { culture: 'pl', @@ -184,7 +184,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.PT', - weight: -100, + weight: 100, name: 'Portuguese Backoffice UI Localization', meta: { culture: 'pt', @@ -194,7 +194,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.PT_BR', - weight: -100, + weight: 100, name: 'Portuguese (Brazil) Backoffice UI Localization', meta: { culture: 'pt-BR', @@ -204,7 +204,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.RO', - weight: -100, + weight: 100, name: 'Romanian Backoffice UI Localization', meta: { culture: 'ro', @@ -214,7 +214,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.RU', - weight: -100, + weight: 100, name: 'Russian Backoffice UI Localization', meta: { culture: 'ru', @@ -224,7 +224,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.SV', - weight: -100, + weight: 100, name: 'Swedish Backoffice UI Localization', meta: { culture: 'sv', @@ -234,7 +234,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.TR', - weight: -100, + weight: 100, name: 'Turkish Backoffice UI Localization', meta: { culture: 'tr', @@ -244,7 +244,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.UK', - weight: -100, + weight: 100, name: 'Ukrainian Backoffice UI Localization', meta: { culture: 'uk', @@ -254,7 +254,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.ZH', - weight: -100, + weight: 100, name: 'Chinese Backoffice UI Localization', meta: { culture: 'zh', @@ -264,7 +264,7 @@ export const manifests: Array = [ { type: 'localization', alias: 'Umb.Localization.ZH_TW', - weight: -100, + weight: 100, name: 'Chinese (Taiwan) Backoffice UI Localization', meta: { culture: 'zh-TW', diff --git a/src/Umbraco.Web.UI.Login/src/components/pages/login.page.element.ts b/src/Umbraco.Web.UI.Login/src/components/pages/login.page.element.ts index 240c68f43140..315bac444895 100644 --- a/src/Umbraco.Web.UI.Login/src/components/pages/login.page.element.ts +++ b/src/Umbraco.Web.UI.Login/src/components/pages/login.page.element.ts @@ -127,7 +127,7 @@ export default class UmbLoginPageElement extends UmbLitElement { return html` diff --git a/src/Umbraco.Web.UI.Login/src/controllers/slim-backoffice-initializer.ts b/src/Umbraco.Web.UI.Login/src/controllers/slim-backoffice-initializer.ts index 9764923f6bc3..153a927303c0 100644 --- a/src/Umbraco.Web.UI.Login/src/controllers/slim-backoffice-initializer.ts +++ b/src/Umbraco.Web.UI.Login/src/controllers/slim-backoffice-initializer.ts @@ -6,6 +6,7 @@ import { import type { UmbElement } from '@umbraco-cms/backoffice/element-api'; import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UUIIconRegistryEssential } from '@umbraco-cms/backoffice/external/uui'; +import { UmbServerConnection, UmbServerContext } from '@umbraco-cms/backoffice/server'; // We import what we need from the Backoffice app. // In the future the login screen app will be a part of the Backoffice app, and we will not need to import these. @@ -16,19 +17,33 @@ import '@umbraco-cms/backoffice/localization'; * It is responsible for initializing the backoffice and only the extensions that is needed to run the login screen. */ export class UmbSlimBackofficeController extends UmbControllerBase { - #uuiIconRegistry = new UUIIconRegistryEssential(); - constructor(host: UmbElement) { super(host); + + // Get the server URL and backoffice path from the host. + const serverUrl = window.location.origin; + const serverConnection = new UmbServerConnection(host, serverUrl); + + // Create the server context for the slim backoffice. + // This is needed by the UmbServerExtensionRegistrator to register the extensions. + new UmbServerContext(this, { + backofficePath: '/umbraco', + serverUrl, + serverConnection: serverConnection, + }); + new UmbBundleExtensionInitializer(host, umbExtensionsRegistry); new UmbAppEntryPointExtensionInitializer(host, umbExtensionsRegistry); - new UmbServerExtensionRegistrator(host, umbExtensionsRegistry).registerPublicExtensions().catch(() => { - // We don't care about errors here, as this is just a fallback for the login screen. - // If the extensions are not registered, the login screen will still work, but some features may not be available. + + // Register the public extensions for the slim backoffice. + new UmbServerExtensionRegistrator(this, umbExtensionsRegistry).registerPublicExtensions().catch((error) => { + console.error(`Failed to register public extensions for the slim backoffice.`, error); }); - this.#uuiIconRegistry.attach(host); + // Attach the UUIIconRegistry to the host so that it can be used in the login screen. + new UUIIconRegistryEssential().attach(host); + // Add the essential styles to the host so that it can be used in the login screen. host.classList.add('uui-text'); host.classList.add('uui-font'); } diff --git a/src/Umbraco.Web.UI.Login/src/localization/lang/da-dk.ts b/src/Umbraco.Web.UI.Login/src/localization/lang/da.ts similarity index 100% rename from src/Umbraco.Web.UI.Login/src/localization/lang/da-dk.ts rename to src/Umbraco.Web.UI.Login/src/localization/lang/da.ts diff --git a/src/Umbraco.Web.UI.Login/src/localization/lang/de-de.ts b/src/Umbraco.Web.UI.Login/src/localization/lang/de.ts similarity index 100% rename from src/Umbraco.Web.UI.Login/src/localization/lang/de-de.ts rename to src/Umbraco.Web.UI.Login/src/localization/lang/de.ts diff --git a/src/Umbraco.Web.UI.Login/src/localization/lang/en-us.ts b/src/Umbraco.Web.UI.Login/src/localization/lang/en-us.ts index 3dedbca533a5..e5fab358c3c5 100644 --- a/src/Umbraco.Web.UI.Login/src/localization/lang/en-us.ts +++ b/src/Umbraco.Web.UI.Login/src/localization/lang/en-us.ts @@ -1,51 +1,55 @@ import type { UmbLocalizationDictionary } from '@umbraco-cms/backoffice/localization-api'; export default { - auth: { - continue: 'Continue', - validate: 'Validate', - login: 'Login', - email: 'E-mail', - username: 'Username', - password: 'Password', - submit: 'Submit', - required: 'Required', - success: 'Success', - forgottenPassword: 'Forgotten password?', - forgottenPasswordInstruction: 'An email will be sent to the address specified with a link to reset your password', - requestPasswordResetConfirmation: 'An email with password reset instructions will be sent to the specified address if it matched our records', - setPasswordConfirmation: 'Your password has been updated', - rememberMe: 'Remember me', - error: 'Error', - defaultError: 'An error occurred while processing your request.', - errorInPasswordFormat: 'The password must be at least {0} characters long and contain at least {1} special characters.', - passwordMismatch: 'The confirmed password does not match the new password!', - passwordMinLength: 'The password must be at least {0} characters long.', - passwordIsBlank: 'The password cannot be blank.', - userFailedLogin: 'Oops! We couldn\'t log you in. Please check your credentials and try again.', - userLockedOut: 'Your account has been locked out. Please try again later.', - receivedErrorFromServer: 'Received an error from the server', - resetCodeExpired: 'The link you have clicked on is invalid or has expired', - userInviteWelcomeMessage: 'Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password.', - userInviteExpiredMessage: 'Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.', - newPassword: 'New password', - confirmNewPassword: 'Confirm password', - greeting0: 'Welcome', - greeting1: 'Welcome', - greeting2: 'Welcome', - greeting3: 'Welcome', - greeting4: 'Welcome', - greeting5: 'Welcome', - greeting6: 'Welcome', - mfaTitle: 'One last step', - mfaCodeInputHelp: 'Enter the code from your authenticator app', - mfaText: 'You have enabled 2-factor authentication and must verify your identity.', - mfaMultipleText: 'Please choose a 2-factor provider', - mfaCodeInput: 'Verification code', - mfaInvalidCode: 'Invalid code entered', - signInWith: 'Sign in with {0}', - returnToLogin: 'Return to login', - localLoginDisabled: 'Unfortunately, direct login is not possible. It has been disabled by a provider.', - friendlyGreeting: 'Hi there', - }, + auth: { + continue: 'Continue', + validate: 'Validate', + login: 'Login', + email: 'E-mail', + username: 'Username', + password: 'Password', + submit: 'Submit', + required: 'Required', + success: 'Success', + forgottenPassword: 'Forgotten password?', + forgottenPasswordInstruction: 'An email will be sent to the address specified with a link to reset your password', + requestPasswordResetConfirmation: + 'An email with password reset instructions will be sent to the specified address if it matched our records', + setPasswordConfirmation: 'Your password has been updated', + rememberMe: 'Remember me', + error: 'Error', + defaultError: 'An error occurred while processing your request.', + errorInPasswordFormat: + 'The password must be at least {0} characters long and contain at least {1} special characters.', + passwordMismatch: 'The confirmed password does not match the new password!', + passwordMinLength: 'The password must be at least {0} characters long.', + passwordIsBlank: 'The password cannot be blank.', + userFailedLogin: "Oops! We couldn't log you in. Please check your credentials and try again.", + userLockedOut: 'Your account has been locked out. Please try again later.', + receivedErrorFromServer: 'Received an error from the server', + resetCodeExpired: 'The link you have clicked on is invalid or has expired', + userInviteWelcomeMessage: + 'Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password.', + userInviteExpiredMessage: + 'Welcome to Umbraco! Unfortunately your invite has expired. Please contact your administrator and ask them to resend it.', + newPassword: 'New password', + confirmNewPassword: 'Confirm password', + greeting0: 'Welcome', + greeting1: 'Welcome', + greeting2: 'Welcome', + greeting3: 'Welcome', + greeting4: 'Welcome', + greeting5: 'Welcome', + greeting6: 'Welcome', + mfaTitle: 'One last step', + mfaCodeInputHelp: 'Enter the code from your authenticator app', + mfaText: 'You have enabled 2-factor authentication and must verify your identity.', + mfaMultipleText: 'Please choose a 2-factor provider', + mfaCodeInput: 'Verification code', + mfaInvalidCode: 'Invalid code entered', + signInWith: 'Sign in with {0}', + returnToLogin: 'Return to login', + localLoginDisabled: 'Unfortunately, direct login is not possible. It has been disabled by a provider.', + friendlyGreeting: 'Hi there', + }, } satisfies UmbLocalizationDictionary; diff --git a/src/Umbraco.Web.UI.Login/src/localization/lang/nb-no.ts b/src/Umbraco.Web.UI.Login/src/localization/lang/nb.ts similarity index 100% rename from src/Umbraco.Web.UI.Login/src/localization/lang/nb-no.ts rename to src/Umbraco.Web.UI.Login/src/localization/lang/nb.ts diff --git a/src/Umbraco.Web.UI.Login/src/localization/lang/nl-nl.ts b/src/Umbraco.Web.UI.Login/src/localization/lang/nl.ts similarity index 100% rename from src/Umbraco.Web.UI.Login/src/localization/lang/nl-nl.ts rename to src/Umbraco.Web.UI.Login/src/localization/lang/nl.ts diff --git a/src/Umbraco.Web.UI.Login/src/localization/lang/sv-se.ts b/src/Umbraco.Web.UI.Login/src/localization/lang/sv.ts similarity index 100% rename from src/Umbraco.Web.UI.Login/src/localization/lang/sv-se.ts rename to src/Umbraco.Web.UI.Login/src/localization/lang/sv.ts diff --git a/src/Umbraco.Web.UI.Login/src/localization/manifests.ts b/src/Umbraco.Web.UI.Login/src/localization/manifests.ts index 94ca59c460da..c0adca4e4f11 100644 --- a/src/Umbraco.Web.UI.Login/src/localization/manifests.ts +++ b/src/Umbraco.Web.UI.Login/src/localization/manifests.ts @@ -3,7 +3,7 @@ export const manifests: UmbExtensionManifest[] = [ type: 'localization', alias: 'Umb.Auth.Localization.En', name: 'English', - weight: 0, + weight: 100, js: () => import('./lang/en.js'), meta: { culture: 'en', @@ -13,60 +13,60 @@ export const manifests: UmbExtensionManifest[] = [ type: 'localization', alias: 'Umb.Auth.Localization.EnUs', name: 'English (US)', - weight: 0, + weight: 100, js: () => import('./lang/en-us.js'), meta: { - culture: 'en-us', + culture: 'en-US', }, }, { type: 'localization', - alias: 'Umb.Auth.Localization.DaDk', - name: 'Danish (DK)', - weight: 0, - js: () => import('./lang/da-dk.js'), + alias: 'Umb.Auth.Localization.Da', + name: 'Danish', + weight: 100, + js: () => import('./lang/da.js'), meta: { - culture: 'da-dk', + culture: 'da', }, }, { type: 'localization', - alias: 'Umb.Auth.Localization.DeDe', - name: 'German (DE)', - weight: 0, - js: () => import('./lang/de-de.js'), + alias: 'Umb.Auth.Localization.De', + name: 'German', + weight: 100, + js: () => import('./lang/de.js'), meta: { - culture: 'de-de', + culture: 'de', }, }, { type: 'localization', - alias: 'Umb.Auth.Localization.NlNl', - name: 'Dutch (NL)', - weight: 0, - js: () => import('./lang/nl-nl.js'), + alias: 'Umb.Auth.Localization.Nb', + name: 'Norwegian Bokmål', + weight: 100, + js: () => import('./lang/nb.js'), meta: { - culture: 'nl-nl', + culture: 'nb', }, }, { type: 'localization', - alias: 'Umb.Auth.Localization.SvSe', - name: 'Swedish (SE)', - weight: 0, - js: () => import('./lang/sv-se.js'), + alias: 'Umb.Auth.Localization.Nl', + name: 'Dutch', + weight: 100, + js: () => import('./lang/nl.js'), meta: { - culture: 'sv-se', + culture: 'nl', }, }, { type: 'localization', - alias: 'Umb.Auth.Localization.NbNo', - name: 'Norwegian Bokmål (NO)', - weight: 0, - js: () => import('./lang/nb-no.js'), + alias: 'Umb.Auth.Localization.Sv', + name: 'Swedish', + weight: 100, + js: () => import('./lang/sv.js'), meta: { - culture: 'nb-no', + culture: 'sv', }, }, ];