Merge branch 'v15/dev' into v15/feature/reworking-error-notifications

Author: madsrasmussen

src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts

@@ -875,6 +875,7 @@ export default {
 		unknown: 'Ukendt',
 		unknownUser: 'Ukendt bruger',
 		under: 'under',
+		unnamed: 'Unavngivet',
 		up: 'Op',
 		update: 'Opdatér',
 		upgrade: 'Opdatér',

src/Umbraco.Web.UI.Client/src/assets/lang/en.ts

@@ -913,6 +913,7 @@ export default {
 		unknown: 'Unknown',
 		unknownUser: 'Unknown user',
 		under: 'under',
+		unnamed: 'Unnamed',
 		up: 'Up',
 		update: 'Update',
 		upgrade: 'Upgrade',

src/Umbraco.Web.UI.Client/src/libs/localization-api/localization.controller.test.ts

@@ -298,8 +298,8 @@ describe('UmbLocalizeController', () => {
 		});
 
 		it('should return an empty string if the input is not a string', async () => {
-			expect(controller.string(123)).to.equal('');
-			expect(controller.string({})).to.equal('');
+			expect(controller.string(123 as any)).to.equal('');
+			expect(controller.string({} as any)).to.equal('');
 			expect(controller.string(undefined)).to.equal('');
 		});
 
@@ -338,5 +338,15 @@ describe('UmbLocalizeController', () => {
 			await elementUpdated(element);
 			expect(element.localize.term('close')).to.equal('Luk');
 		});
+
+		it('should update the string when the language changes', async () => {
+			expect(element.localize.string('testing #close')).to.equal('testing Close');
+
+			// Switch browser to Danish
+			element.lang = danishRegional.$code;
+
+			await elementUpdated(element);
+			expect(element.localize.string('testing #close')).to.equal('testing Luk');
+		});
 	});
 });

src/Umbraco.Web.UI.Client/src/libs/localization-api/localization.controller.ts

@@ -190,11 +190,11 @@ export class UmbLocalizationController<LocalizationSetType extends UmbLocalizati
 	 * Translates a string containing one or more terms. The terms should be prefixed with a `#` character.
 	 * If the term is found in the localization set, it will be replaced with the localized term.
 	 * If the term is not found, the original term will be returned.
-	 * @param {string} text The text to translate.
+	 * @param {string | null | undefined} text The text to translate.
 	 * @param {...any} args The arguments to parse for this localization entry.
 	 * @returns {string} The translated text.
 	 */
-	string(text: unknown, ...args: any): string {
+	string(text: string | null | undefined, ...args: any): string {
 		if (typeof text !== 'string') {
 			return '';
 		}
@@ -204,6 +204,9 @@ export class UmbLocalizationController<LocalizationSetType extends UmbLocalizati
 
 		const localizedText = text.replace(regex, (match: string) => {
 			const key = match.slice(1);
+			if (!this.#usedKeys.includes(key)) {
+				this.#usedKeys.push(key);
+			}
 
 			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 			// @ts-ignore

src/Umbraco.Web.UI.Client/src/packages/core/content/workspace/views/edit/content-editor.element.ts

@@ -16,8 +16,11 @@ import './content-editor-tab.element.js';
 
 @customElement('umb-content-workspace-view-edit')
 export class UmbContentWorkspaceViewEditElement extends UmbLitElement implements UmbWorkspaceViewElement {
-	//@state()
-	//private _hasRootProperties = false;
+	/*
+	// root properties is a possible feature with Bellissima, but as it is new its not fully implemented yet [NL]
+	@state()
+	private _hasRootProperties = false;
+  */
 
 	@state()
 	private _hasRootGroups = false;
@@ -78,6 +81,16 @@ export class UmbContentWorkspaceViewEditElement extends UmbLitElement implements
 		if (!this._tabs || !this.#structureManager) return;
 		const routes: UmbRoute[] = [];
 
+		if (this._hasRootGroups) {
+			routes.push({
+				path: `root`,
+				component: () => import('./content-editor-tab.element.js'),
+				setup: (component) => {
+					(component as UmbContentWorkspaceViewEditTabElement).containerId = null;
+				},
+			});
+		}
+
 		if (this._tabs.length > 0) {
 			this._tabs?.forEach((tab) => {
 				const tabName = tab.name ?? '';
@@ -91,23 +104,11 @@ export class UmbContentWorkspaceViewEditElement extends UmbLitElement implements
 			});
 		}
 
-		if (this._hasRootGroups) {
+		if (routes.length !== 0) {
 			routes.push({
 				path: '',
-				component: () => import('./content-editor-tab.element.js'),
-				setup: (component) => {
-					(component as UmbContentWorkspaceViewEditTabElement).containerId = null;
-				},
+				redirectTo: routes[0].path,
 			});
-		}
-
-		if (routes.length !== 0) {
-			if (!this._hasRootGroups) {
-				routes.push({
-					path: '',
-					redirectTo: routes[0]?.path,
-				});
-			}
 
 			routes.push({
 				path: `**`,
@@ -127,21 +128,20 @@ export class UmbContentWorkspaceViewEditElement extends UmbLitElement implements
 							${this._hasRootGroups && this._tabs.length > 0
 								? html`
 										<uui-tab
-											label="Content"
-											.active=${this._routerPath + '/' === this._activePath}
-											href=${this._routerPath + '/'}
-											>Content</uui-tab
-										>
+											.label=${this.localize.term('general_generic')}
+											.active=${this._routerPath + '/root' === this._activePath}
+											.href=${this._routerPath + '/root'}></uui-tab>
 									`
 								: ''}
 							${repeat(
 								this._tabs,
 								(tab) => tab.name,
 								(tab) => {
 									const path = this._routerPath + '/tab/' + encodeFolderName(tab.name || '');
-									return html`<uui-tab label=${tab.name ?? 'Unnamed'} .active=${path === this._activePath} href=${path}
-										>${this.localize.string(tab.name)}</uui-tab
-									>`;
+									return html`<uui-tab
+										.label=${this.localize.string(tab.name ?? '#general_unnamed')}
+										.active=${path === this._activePath}
+										.href=${path}></uui-tab>`;
 								},
 							)}
 						</uui-tab-group>`

src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.element.ts

@@ -22,7 +22,9 @@ export class UmbConfirmModalElement extends UmbLitElement {
 	override render() {
 		return html`
 			<uui-dialog-layout class="uui-text" .headline=${this.localize.string(this.data?.headline) ?? null}>
-				${unsafeHTML(this.localize.string(this.data?.content))}
+				${typeof this.data?.content === 'string'
+					? unsafeHTML(this.localize.string(this.data?.content))
+					: this.data?.content}
 
 				<uui-button
 					slot="actions"

src/Umbraco.Web.UI.Client/src/packages/core/router/components/not-found/route-not-found.element.ts

@@ -34,7 +34,7 @@ export class UmbRouteNotFoundElement extends UmbLitElement {
 				align-items: center;
 				height: 100%;
 				opacity: 0;
-				animation: fadeIn 4s 0.2s forwards;
+				animation: fadeIn 6s 0.2s forwards;
 			}
 
 			@keyframes fadeIn {

src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/types.ts

@@ -0,0 +1,2 @@
+export type * from './workspace-action/types.js';
+export type * from './workspace-action-menu-item/types.js';

src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/default/workspace-action-menu-item.element.ts

@@ -1,4 +1,4 @@
-import type { UmbWorkspaceActionMenuItem } from '../index.js';
+import type { UmbWorkspaceActionMenuItem } from '../types.js';
 import { UmbActionExecutedEvent } from '@umbraco-cms/backoffice/event';
 import { html, customElement, property, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';

src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action-menu-item/index.ts

@@ -1,3 +1 @@
 export * from './workspace-action-menu-item-base.controller.js';
-export type * from './types.js';
-export type * from './workspace-action-menu-item.interface.js';