From f4c8379a38335095394afa264bc159ae9260f5df Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 14 Sep 2023 09:04:16 +0200
Subject: [PATCH 01/13] dictionary update

---
 ...shboard-localization-dictionary.element.ts | 36 ++++++++++---------
 .../sources/dictionary.detail.server.data.ts  |  4 +--
 .../dictionary-workspace-editor.element.ts    |  2 +-
 .../workspace/dictionary-workspace.context.ts | 13 ++++---
 .../workspace/dictionary-workspace.element.ts |  2 +-
 5 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
index 4fb93e300d..24fc5641cf 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
@@ -1,5 +1,5 @@
 import { UmbDictionaryRepository } from '../../dictionary/repository/dictionary.repository.js';
-import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
+import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, state, when } from '@umbraco-cms/backoffice/external/lit';
 import { UmbTableConfig, UmbTableColumn, UmbTableItem } from '@umbraco-cms/backoffice/components';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -8,6 +8,7 @@ import {
 	UmbModalManagerContext,
 	UMB_MODAL_MANAGER_CONTEXT_TOKEN,
 	UMB_CREATE_DICTIONARY_MODAL,
+	UmbModalRouteRegistrationController,
 } from '@umbraco-cms/backoffice/modal';
 import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
 
@@ -33,6 +34,9 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 
 	#languages: Array<LanguageResponseModel> = [];
 
+	@state()
+	protected _modalRouteNewDictionary?: string;
+
 	constructor() {
 		super();
 
@@ -124,7 +128,7 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 
 	#filter(e: { target: HTMLInputElement }) {
 		this._tableItemsFiltered = e.target.value
-			? this.#tableItems.filter((t) => t.id.includes(e.target.value))
+			? this.#tableItems.filter((t) => t.id.toLocaleLowerCase().includes(e.target.value.toLocaleLowerCase()))
 			: this.#tableItems;
 	}
 
@@ -136,24 +140,23 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 		const modalContext = this.#modalContext?.open(UMB_CREATE_DICTIONARY_MODAL, { parentId: null });
 
 		const { name, parentId } = await modalContext.onSubmit();
+
 		if (!name || parentId === undefined) return;
 
-		const { data: url } = await this.#repo.create({ name, parentId });
+		const { data } = await this.#repo.createScaffold(null, { name });
+		const { error } = await this.#repo.create(data);
 
-		if (!url) return;
-		//TODO: Why do we need to extract the id like this?
-		const id = url.substring(url.lastIndexOf('/') + 1);
-
-		history.pushState({}, '', `/section/dictionary/workspace/dictionary-item/edit/${id}`);
+		if (error) return;
+		history.pushState({}, '', `/section/dictionary/workspace/dictionary-item/edit/${data.id}`);
 	}
 
 	render() {
 		return html`
 			<umb-body-layout header-transparent>
 				<div id="header" slot="header">
-					<uui-button type="button" look="outline" label="Create dictionary item" @click=${this.#create}
-						>Create dictionary item</uui-button
-					>
+					<uui-button type="button" look="outline" label="Create dictionary item" @click=${this.#create}>
+						Create dictionary item
+					</uui-button>
 					<uui-input
 						@keyup="${this.#filter}"
 						placeholder="Type to filter..."
@@ -166,11 +169,12 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 				</div>
 				${when(
 					this._tableItemsFiltered.length,
-					() => html` <umb-table
-						.config=${this._tableConfig}
-						.columns=${this.#tableColumns}
-						.items=${this._tableItemsFiltered}></umb-table>`,
-					() => html`<umb-empty-state>There were no dictionary items found.</umb-empty-state>`
+					() =>
+						html` <umb-table
+							.config=${this._tableConfig}
+							.columns=${this.#tableColumns}
+							.items=${this._tableItemsFiltered}></umb-table>`,
+					() => html`<umb-empty-state>There were no dictionary items found.</umb-empty-state>`,
 				)}
 			</umb-body-layout>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/sources/dictionary.detail.server.data.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/sources/dictionary.detail.server.data.ts
index 47a7e29ac5..b4c442fc3d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/sources/dictionary.detail.server.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/repository/sources/dictionary.detail.server.data.ts
@@ -114,7 +114,7 @@ export class UmbDictionaryDetailServerDataSource
 		// TODO => parentId will be a guid param once #13786 is merged and API regenerated
 		return await tryExecuteAndNotify(
 			this.#host,
-			DictionaryResource.postDictionaryImport({ requestBody: { temporaryFileId, parentId } })
+			DictionaryResource.postDictionaryImport({ requestBody: { temporaryFileId, parentId } }),
 		);
 	}
 
@@ -129,7 +129,7 @@ export class UmbDictionaryDetailServerDataSource
 			this.#host,
 			DictionaryResource.postDictionaryImport({
 				requestBody: formData,
-			})
+			}),
 		);
 	}
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts
index 0bc6559516..59eeb34c70 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts
@@ -1,6 +1,6 @@
 import { UMB_DICTIONARY_WORKSPACE_CONTEXT } from './dictionary-workspace.context.js';
 import { UUIInputElement, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
-import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, customElement, state, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 @customElement('umb-dictionary-workspace-editor')
 export class UmbDictionaryWorkspaceEditorElement extends UmbLitElement {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.context.ts
index 2990d526eb..73cf8a557c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.context.ts
@@ -76,7 +76,10 @@ export class UmbDictionaryWorkspaceContext
 	async save() {
 		if (!this.#data.value) return;
 		if (!this.#data.value.id) return;
-		await this.repository.save(this.#data.value.id, this.#data.value);
+
+		const model = { name: this.#data.value.name, translations: this.#data.value.translations };
+
+		await this.repository.save(this.#data.value.id, model);
 		this.setIsNew(false);
 	}
 
@@ -85,8 +88,10 @@ export class UmbDictionaryWorkspaceContext
 	}
 }
 
-
-export const UMB_DICTIONARY_WORKSPACE_CONTEXT = new UmbContextToken<UmbSaveableWorkspaceContextInterface, UmbDictionaryWorkspaceContext>(
+export const UMB_DICTIONARY_WORKSPACE_CONTEXT = new UmbContextToken<
+	UmbSaveableWorkspaceContextInterface,
+	UmbDictionaryWorkspaceContext
+>(
 	'UmbWorkspaceContext',
-	(context): context is UmbDictionaryWorkspaceContext => context.getEntityType?.() === 'dictionary-item'
+	(context): context is UmbDictionaryWorkspaceContext => context.getEntityType?.() === 'dictionary-item',
 );
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.element.ts
index a161d33891..0e5a4b77a2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.element.ts
@@ -1,6 +1,6 @@
 import { UmbDictionaryWorkspaceContext } from './dictionary-workspace.context.js';
 import { UmbDictionaryWorkspaceEditorElement } from './dictionary-workspace-editor.element.js';
-import { UmbTextStyles } from "@umbraco-cms/backoffice/style";
+import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import type { UmbRoute } from '@umbraco-cms/backoffice/router';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

From 80385320fbd1aecfc0090ca482373570d5d6f9e5 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 14 Sep 2023 11:12:00 +0200
Subject: [PATCH 02/13] dictionary create

---
 ...shboard-localization-dictionary.element.ts | 37 +++----------------
 .../dictionary-workspace-editor.element.ts    |  4 +-
 .../workspace/dictionary-workspace.element.ts |  8 ++++
 3 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
index 24fc5641cf..e332fc9186 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
@@ -4,13 +4,6 @@ import { css, html, customElement, state, when } from '@umbraco-cms/backoffice/e
 import { UmbTableConfig, UmbTableColumn, UmbTableItem } from '@umbraco-cms/backoffice/components';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { DictionaryOverviewResponseModel, LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
-import {
-	UmbModalManagerContext,
-	UMB_MODAL_MANAGER_CONTEXT_TOKEN,
-	UMB_CREATE_DICTIONARY_MODAL,
-	UmbModalRouteRegistrationController,
-} from '@umbraco-cms/backoffice/modal';
-import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
 
 @customElement('umb-dashboard-translation-dictionary')
 export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
@@ -26,8 +19,6 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 
 	#repo!: UmbDictionaryRepository;
 
-	#modalContext!: UmbModalManagerContext;
-
 	#tableItems: Array<UmbTableItem> = [];
 
 	#tableColumns: Array<UmbTableColumn> = [];
@@ -39,10 +30,6 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 
 	constructor() {
 		super();
-
-		new UmbContextConsumerController(this, UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
-			this.#modalContext = instance;
-		});
 	}
 
 	async connectedCallback() {
@@ -132,29 +119,15 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 			: this.#tableItems;
 	}
 
-	async #create() {
-		// TODO: what to do if modal service is not available?
-		if (!this.#modalContext) return;
-		if (!this.#repo) return;
-
-		const modalContext = this.#modalContext?.open(UMB_CREATE_DICTIONARY_MODAL, { parentId: null });
-
-		const { name, parentId } = await modalContext.onSubmit();
-
-		if (!name || parentId === undefined) return;
-
-		const { data } = await this.#repo.createScaffold(null, { name });
-		const { error } = await this.#repo.create(data);
-
-		if (error) return;
-		history.pushState({}, '', `/section/dictionary/workspace/dictionary-item/edit/${data.id}`);
-	}
-
 	render() {
 		return html`
 			<umb-body-layout header-transparent>
 				<div id="header" slot="header">
-					<uui-button type="button" look="outline" label="Create dictionary item" @click=${this.#create}>
+					<uui-button
+						type="button"
+						look="outline"
+						label="Create dictionary item"
+						href="/section/dictionary/workspace/dictionary-item/create/null">
 						Create dictionary item
 					</uui-button>
 					<uui-input
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts
index 59eeb34c70..37b7180bd0 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts
@@ -1,6 +1,6 @@
 import { UMB_DICTIONARY_WORKSPACE_CONTEXT } from './dictionary-workspace.context.js';
 import { UUIInputElement, UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
-import { css, html, customElement, state, property } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 @customElement('umb-dictionary-workspace-editor')
 export class UmbDictionaryWorkspaceEditorElement extends UmbLitElement {
@@ -41,7 +41,7 @@ export class UmbDictionaryWorkspaceEditorElement extends UmbLitElement {
 					<uui-button href="/section/dictionary/dashboard" label="Back to list" compact>
 						<uui-icon name="umb:arrow-left"></uui-icon>
 					</uui-button>
-					<uui-input .value=${this._name} @input="${this.#handleInput}" label="Dictionary name"></uui-input>
+					<uui-input .value=${this._name ?? ''} @input="${this.#handleInput}" label="Dictionary name"></uui-input>
 				</div>
 			</umb-workspace-editor>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.element.ts
index 0e5a4b77a2..99b9099679 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.element.ts
@@ -20,6 +20,14 @@ export class UmbWorkspaceDictionaryElement extends UmbLitElement {
 				this.#workspaceContext.load(id);
 			},
 		},
+		{
+			path: 'create/:parentId',
+			component: () => this.#element,
+			setup: (_component, info) => {
+				const parentId = info.match.params.parentId === 'null' ? null : info.match.params.parentId;
+				this.#workspaceContext.create(parentId);
+			},
+		},
 	];
 
 	render() {

From 9b7cf7a14d6ecbe97913c5f71e3e1d6e36785c5b Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 14 Sep 2023 11:20:56 +0200
Subject: [PATCH 03/13] revert save

---
 .../dictionary/workspace/dictionary-workspace.context.ts      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.context.ts
index 73cf8a557c..683d452ac7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.context.ts
@@ -77,9 +77,7 @@ export class UmbDictionaryWorkspaceContext
 		if (!this.#data.value) return;
 		if (!this.#data.value.id) return;
 
-		const model = { name: this.#data.value.name, translations: this.#data.value.translations };
-
-		await this.repository.save(this.#data.value.id, model);
+		await this.repository.save(this.#data.value.id, this.#data.value);
 		this.setIsNew(false);
 	}
 

From 6f21ffc274b6b16677a7c9dcd11a89b3af03d2e2 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 14 Sep 2023 11:22:18 +0200
Subject: [PATCH 04/13] unused string

---
 .../dictionary/dashboard-localization-dictionary.element.ts    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
index e332fc9186..911809fc42 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
@@ -25,9 +25,6 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 
 	#languages: Array<LanguageResponseModel> = [];
 
-	@state()
-	protected _modalRouteNewDictionary?: string;
-
 	constructor() {
 		super();
 	}

From 9b58e3773c305dd43dce9c8598f78f8944c63101 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 14 Sep 2023 11:42:10 +0200
Subject: [PATCH 05/13] localizations

---
 .../dashboard-localization-dictionary.element.ts | 16 ++++++++--------
 .../dictionary-workspace-editor.element.ts       | 10 ++++++++--
 .../workspace-view-dictionary-editor.element.ts  |  7 +++----
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
index 911809fc42..fc9b329ec8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
@@ -54,7 +54,7 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 	#setTableColumns() {
 		this.#tableColumns = [
 			{
-				name: 'Name',
+				name: this.localize.term('general_name'),
 				alias: 'name',
 			},
 		];
@@ -95,11 +95,11 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 					value: dictionary.translatedIsoCodes?.includes(l.isoCode)
 						? html`<uui-icon
 								name="check"
-								title="Translation exists for ${l.name}"
+								title="${this.localize.term('visuallyHiddenTexts_hasTranslation')} (${l.name})"
 								style="color:var(--uui-color-positive-standalone);display:inline-block"></uui-icon>`
 						: html`<uui-icon
 								name="alert"
-								title="Translation does not exist for ${l.name}"
+								title="${this.localize.term('visuallyHiddenTexts_noTranslation')} (${l.name})"
 								style="color:var(--uui-color-danger-standalone);display:inline-block"></uui-icon>`,
 				});
 			});
@@ -123,14 +123,14 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 					<uui-button
 						type="button"
 						look="outline"
-						label="Create dictionary item"
+						label=${this.localize.term('dictionary_createNew')}
 						href="/section/dictionary/workspace/dictionary-item/create/null">
-						Create dictionary item
+						${this.localize.term('dictionary_createNew')}
 					</uui-button>
 					<uui-input
 						@keyup="${this.#filter}"
-						placeholder="Type to filter..."
-						label="Type to filter dictionary"
+						placeholder=${this.localize.term('placeholders_filter')}
+						label=${this.localize.term('placeholders_filter')}
 						id="searchbar">
 						<div slot="prepend">
 							<uui-icon name="search" id="searchbar_icon"></uui-icon>
@@ -144,7 +144,7 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 							.config=${this._tableConfig}
 							.columns=${this.#tableColumns}
 							.items=${this._tableItemsFiltered}></umb-table>`,
-					() => html`<umb-empty-state>There were no dictionary items found.</umb-empty-state>`,
+					() => html`<umb-empty-state>${this.localize.term('emptyStates_emptyDictionaryTree')}</umb-empty-state>`,
 				)}
 			</umb-body-layout>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts
index 37b7180bd0..367ec0d07d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts
@@ -38,10 +38,16 @@ export class UmbDictionaryWorkspaceEditorElement extends UmbLitElement {
 		return html`
 			<umb-workspace-editor alias="Umb.Workspace.Dictionary">
 				<div id="header" slot="header">
-					<uui-button href="/section/dictionary/dashboard" label="Back to list" compact>
+					<uui-button
+						href="/section/dictionary/dashboard"
+						label=${this.localize.term('general_backToOverview')}
+						compact>
 						<uui-icon name="umb:arrow-left"></uui-icon>
 					</uui-button>
-					<uui-input .value=${this._name ?? ''} @input="${this.#handleInput}" label="Dictionary name"></uui-input>
+					<uui-input
+						.value=${this._name ?? ''}
+						@input="${this.#handleInput}"
+						label="${this.localize.term('general_dictionary')} ${this.localize.term('general_name')}"></uui-input>
 				</div>
 			</umb-workspace-editor>
 		`;
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/views/editor/workspace-view-dictionary-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/views/editor/workspace-view-dictionary-editor.element.ts
index 5a2f6dda58..9a04bb2979 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/views/editor/workspace-view-dictionary-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/views/editor/workspace-view-dictionary-editor.element.ts
@@ -1,7 +1,7 @@
 import { UMB_DICTIONARY_WORKSPACE_CONTEXT } from '../../dictionary-workspace.context.js';
 import { UmbDictionaryRepository } from '../../../repository/dictionary.repository.js';
 import { UUITextareaElement, UUITextareaEvent } from '@umbraco-cms/backoffice/external/uui';
-import { css, html, customElement, state, repeat, ifDefined } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, customElement, state, repeat, ifDefined, unsafeHTML } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
 import { DictionaryItemResponseModel, LanguageResponseModel } from '@umbraco-cms/backoffice/backend-api';
 @customElement('umb-workspace-view-dictionary-editor')
@@ -62,12 +62,11 @@ export class UmbWorkspaceViewDictionaryEditorElement extends UmbLitElement {
 	render() {
 		return html`
 			<uui-box>
-				<p>Edit the different language versions for the dictionary item '<em>${this._dictionary?.name}</em>' below.</p>
-
+				${unsafeHTML(this.localize.term('dictionaryItem_description', this._dictionary?.name))}
 				${repeat(
 					this._languages,
 					(item) => item.isoCode,
-					(item) => this.#renderTranslation(item)
+					(item) => this.#renderTranslation(item),
 				)}
 			</uui-box>
 		`;

From a55b08d1478e72aae98bf4e5ad6cc13f44545354 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 14 Sep 2023 12:17:57 +0200
Subject: [PATCH 06/13] put api

---
 .../src/mocks/handlers/dictionary.handlers.ts      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
index 874bb40a16..40bf026547 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
@@ -115,6 +115,18 @@ export const handlers = [
 		return res(ctx.status(200), ctx.json(saved));
 	}),
 
+	rest.put('/umbraco/management/api/v1/dictionary/:id', async (req, res, ctx) => {
+		const data = await req.json();
+		if (!data) return;
+
+		const id = req.params.id as string;
+		if (!id) return;
+
+		const saved = umbDictionaryData.save(id, data);
+
+		return res(ctx.status(200), ctx.json(saved));
+	}),
+
 	rest.get('/umbraco/management/api/v1/tree/dictionary/root', (req, res, ctx) => {
 		const items = umbDictionaryData.getTreeRoot();
 		const response = {
@@ -165,7 +177,7 @@ export const handlers = [
 		const item = umbDictionaryData.getById(id);
 
 		alert(
-			`Downloads file for dictionary "${item?.name}", ${includeChildren === 'true' ? 'with' : 'without'} children.`
+			`Downloads file for dictionary "${item?.name}", ${includeChildren === 'true' ? 'with' : 'without'} children.`,
 		);
 		return res(ctx.status(200));
 	}),

From f6654baf42ab3bb411d59f4807cf02751ee4df5a Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 14 Sep 2023 13:45:48 +0200
Subject: [PATCH 07/13] save uses put or posts, depends on isNew.

---
 .../src/mocks/handlers/dictionary.handlers.ts       | 13 ++-----------
 .../workspace/dictionary-workspace.context.ts       | 11 +++++++++--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
index 40bf026547..2bb9a3fafc 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
@@ -76,23 +76,14 @@ export const handlers = [
 
 	rest.post('/umbraco/management/api/v1/dictionary', async (req, res, ctx) => {
 		const data = await req.json();
+
 		if (!data) return;
 
 		data.icon = 'umb:book-alt';
 		data.hasChildren = false;
 		data.type = 'dictionary-item';
-		data.translations = [
-			{
-				isoCode: 'en-US',
-				translation: '',
-			},
-			{
-				isoCode: 'fr',
-				translation: '',
-			},
-		];
 
-		const value = umbDictionaryData.save(data.id, data);
+		const value = umbDictionaryData.insert(data);
 
 		const createdResult = {
 			value,
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.context.ts
index 683d452ac7..6e762a44fe 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace.context.ts
@@ -77,8 +77,15 @@ export class UmbDictionaryWorkspaceContext
 		if (!this.#data.value) return;
 		if (!this.#data.value.id) return;
 
-		await this.repository.save(this.#data.value.id, this.#data.value);
-		this.setIsNew(false);
+		if (this.getIsNew()) {
+			await this.repository.create(this.#data.value);
+			this.setIsNew(false);
+		} else {
+			await this.repository.save(this.#data.value.id, this.#data.value);
+		}
+
+		const data = this.getData();
+		if (data) this.saveComplete(data);
 	}
 
 	public destroy(): void {

From 57fd5c48f69197bb1d6cd97711d2d70ee69dcaa2 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 14 Sep 2023 15:27:59 +0200
Subject: [PATCH 08/13] if name is empty, show unnamed.

---
 .../views/editor/workspace-view-dictionary-editor.element.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/views/editor/workspace-view-dictionary-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/views/editor/workspace-view-dictionary-editor.element.ts
index 9a04bb2979..2d1007e331 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/views/editor/workspace-view-dictionary-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/views/editor/workspace-view-dictionary-editor.element.ts
@@ -62,7 +62,7 @@ export class UmbWorkspaceViewDictionaryEditorElement extends UmbLitElement {
 	render() {
 		return html`
 			<uui-box>
-				${unsafeHTML(this.localize.term('dictionaryItem_description', this._dictionary?.name))}
+				${unsafeHTML(this.localize.term('dictionaryItem_description', this._dictionary?.name || 'unnamed'))}
 				${repeat(
 					this._languages,
 					(item) => item.isoCode,

From aa0e71c7e65164db2284b3027791034332592e53 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:33:42 +0200
Subject: [PATCH 09/13] umbracopath

---
 .../src/mocks/handlers/dictionary.handlers.ts                  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
index 2bb9a3fafc..3767ba9958 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
@@ -1,4 +1,5 @@
 const { rest } = window.MockServiceWorker;
+import { umbracoPath } from '@umbraco-cms/backoffice/utils';
 import { umbDictionaryData } from '../data/dictionary.data.js';
 import {
 	ImportDictionaryRequestModel,
@@ -106,7 +107,7 @@ export const handlers = [
 		return res(ctx.status(200), ctx.json(saved));
 	}),
 
-	rest.put('/umbraco/management/api/v1/dictionary/:id', async (req, res, ctx) => {
+	rest.put(umbracoPath('/dictionary/:id'), async (req, res, ctx) => {
 		const data = await req.json();
 		if (!data) return;
 

From 988205b6ab467d1846dbc51e194baca5b7e52701 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:49:21 +0200
Subject: [PATCH 10/13] optimization of search

---
 .../dictionary/dashboard-localization-dictionary.element.ts  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
index fc9b329ec8..1cc515f05e 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
@@ -111,8 +111,9 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 	}
 
 	#filter(e: { target: HTMLInputElement }) {
-		this._tableItemsFiltered = e.target.value
-			? this.#tableItems.filter((t) => t.id.toLocaleLowerCase().includes(e.target.value.toLocaleLowerCase()))
+		const searchValue = e.target.value.toLocaleLowerCase();
+		this._tableItemsFiltered = searchValue
+			? this.#tableItems.filter((t) => t.id.toLocaleLowerCase().includes(searchValue))
 			: this.#tableItems;
 	}
 

From 3f3ea5af5d5431d2f7f7e1980e2759989a8c5195 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:51:15 +0200
Subject: [PATCH 11/13] relative url

---
 .../dictionary/dashboard-localization-dictionary.element.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
index 1cc515f05e..b31198c9a4 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
@@ -125,7 +125,7 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 						type="button"
 						look="outline"
 						label=${this.localize.term('dictionary_createNew')}
-						href="/section/dictionary/workspace/dictionary-item/create/null">
+						href="section/dictionary/workspace/dictionary-item/create/null">
 						${this.localize.term('dictionary_createNew')}
 					</uui-button>
 					<uui-input

From 391c6519008fbad8ab1950f4fd9ae4676cea37ce Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Mon, 2 Oct 2023 09:52:38 +0200
Subject: [PATCH 12/13] relative url

---
 .../dictionary/dashboard-localization-dictionary.element.ts  | 2 +-
 .../workspace/dictionary-workspace-editor.element.ts         | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
index b31198c9a4..9f9831a07d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dashboards/dictionary/dashboard-localization-dictionary.element.ts
@@ -80,7 +80,7 @@ export class UmbDashboardTranslationDictionaryElement extends UmbLitElement {
 						columnAlias: 'name',
 						value: html`<a
 							style="font-weight:bold"
-							href="/section/dictionary/workspace/dictionary-item/edit/${dictionary.id}">
+							href="section/dictionary/workspace/dictionary-item/edit/${dictionary.id}">
 							${dictionary.name}</a
 						> `,
 					},
diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts
index 367ec0d07d..e26480f629 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/dictionary/workspace/dictionary-workspace-editor.element.ts
@@ -38,10 +38,7 @@ export class UmbDictionaryWorkspaceEditorElement extends UmbLitElement {
 		return html`
 			<umb-workspace-editor alias="Umb.Workspace.Dictionary">
 				<div id="header" slot="header">
-					<uui-button
-						href="/section/dictionary/dashboard"
-						label=${this.localize.term('general_backToOverview')}
-						compact>
+					<uui-button href="section/dictionary/dashboard" label=${this.localize.term('general_backToOverview')} compact>
 						<uui-icon name="umb:arrow-left"></uui-icon>
 					</uui-button>
 					<uui-input

From 9eca5a446295e0ce717fd6ca9fd4b93284170ca5 Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Thu, 5 Oct 2023 12:53:38 +0200
Subject: [PATCH 13/13] umbracopaths

---
 .../src/mocks/handlers/dictionary.handlers.ts | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
index 208e7add9d..17bfb287f0 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers/dictionary.handlers.ts
@@ -1,6 +1,6 @@
 const { rest } = window.MockServiceWorker;
-import { umbracoPath } from '@umbraco-cms/backoffice/utils';
 import { umbDictionaryData } from '../data/dictionary.data.js';
+import { umbracoPath } from '@umbraco-cms/backoffice/utils';
 import {
 	ImportDictionaryRequestModel,
 	DictionaryOverviewResponseModel,
@@ -49,7 +49,7 @@ const overviewData: Array<DictionaryOverviewResponseModel> = [
 
 // TODO: add schema
 export const handlers = [
-	rest.get('/umbraco/management/api/v1/dictionary/:id', (req, res, ctx) => {
+	rest.get(umbracoPath('/dictionary/:id'), (req, res, ctx) => {
 		const id = req.params.id as string;
 		if (!id) return;
 
@@ -57,7 +57,7 @@ export const handlers = [
 		return res(ctx.status(200), ctx.json(dictionary));
 	}),
 
-	rest.get('/umbraco/management/api/v1/dictionary', (req, res, ctx) => {
+	rest.get(umbracoPath('/dictionary'), (req, res, ctx) => {
 		const skip = req.url.searchParams.get('skip');
 		const take = req.url.searchParams.get('take');
 		if (!skip || !take) return;
@@ -75,7 +75,7 @@ export const handlers = [
 		return res(ctx.status(200), ctx.json(response));
 	}),
 
-	rest.post('/umbraco/management/api/v1/dictionary', async (req, res, ctx) => {
+	rest.post(umbracoPath('/dictionary'), async (req, res, ctx) => {
 		const data = await req.json();
 
 		if (!data) return;
@@ -94,7 +94,7 @@ export const handlers = [
 		return res(ctx.status(200), ctx.json(createdResult));
 	}),
 
-	rest.patch('/umbraco/management/api/v1/dictionary/:id', async (req, res, ctx) => {
+	rest.patch(umbracoPath('/dictionary/:id'), async (req, res, ctx) => {
 		const data = await req.json();
 		if (!data) return;
 
@@ -119,7 +119,7 @@ export const handlers = [
 		return res(ctx.status(200), ctx.json(saved));
 	}),
 
-	rest.get('/umbraco/management/api/v1/tree/dictionary/root', (req, res, ctx) => {
+	rest.get(umbracoPath('/tree/dictionary/root'), (req, res, ctx) => {
 		const items = umbDictionaryData.getTreeRoot();
 		const response = {
 			total: items.length,
@@ -128,7 +128,7 @@ export const handlers = [
 		return res(ctx.status(200), ctx.json(response));
 	}),
 
-	rest.get('/umbraco/management/api/v1/tree/dictionary/children', (req, res, ctx) => {
+	rest.get(umbracoPath('/tree/dictionary/children'), (req, res, ctx) => {
 		const parentId = req.url.searchParams.get('parentId');
 		if (!parentId) return;
 
@@ -142,7 +142,7 @@ export const handlers = [
 		return res(ctx.status(200), ctx.json(response));
 	}),
 
-	rest.get('/umbraco/management/api/v1/tree/dictionary/item', (req, res, ctx) => {
+	rest.get(umbracoPath('/tree/dictionary/item'), (req, res, ctx) => {
 		const ids = req.url.searchParams.getAll('id');
 		if (!ids) return;
 
@@ -151,7 +151,7 @@ export const handlers = [
 		return res(ctx.status(200), ctx.json(items));
 	}),
 
-	rest.delete('/umbraco/management/api/v1/dictionary/:id', (req, res, ctx) => {
+	rest.delete(umbracoPath('/dictionary/:id'), (req, res, ctx) => {
 		const id = req.params.id as string;
 		if (!id) return;
 
@@ -161,7 +161,7 @@ export const handlers = [
 	}),
 
 	// TODO => handle properly, querystring breaks handler
-	rest.get('/umbraco/management/api/v1/dictionary/:id/export', (req, res, ctx) => {
+	rest.get(umbracoPath('/dictionary/:id/export'), (req, res, ctx) => {
 		const id = req.params.id as string;
 		if (!id) return;
 
@@ -174,13 +174,13 @@ export const handlers = [
 		return res(ctx.status(200));
 	}),
 
-	rest.post('/umbraco/management/api/v1/dictionary/upload', async (req, res, ctx) => {
+	rest.post(umbracoPath('/dictionary/upload'), async (req, res, ctx) => {
 		if (!req.arrayBuffer()) return;
 
 		return res(ctx.status(200), ctx.json(uploadResponse));
 	}),
 
-	rest.post('/umbraco/management/api/v1/dictionary/import', async (req, res, ctx) => {
+	rest.post(umbracoPath('/dictionary/import'), async (req, res, ctx) => {
 		const file = req.url.searchParams.get('file');
 
 		if (!file || !importResponse.id) return;