From 9f8ec6159ba68d81c91739f6690f6f19b2c5d9ca Mon Sep 17 00:00:00 2001 From: Paul Seal Date: Fri, 14 Jun 2024 10:16:25 +0100 Subject: [PATCH 1/2] added friendly message to display when there are no other languages to choose from --- src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts | 1 + src/Umbraco.Web.UI.Client/src/assets/lang/en.ts | 1 + .../modals/language-picker/language-picker-modal.element.ts | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) 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 0f840ec4cd..dacd98f712 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 @@ -1033,6 +1033,7 @@ export default { language: { cultureCode: 'Culture Code', displayName: 'Culture Name', + noFallbackLanguages: 'There are no other languages to choose from' }, lockout: { lockoutWillOccur: "You've been idle and logout will automatically occur in", diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts index cfef63d647..eebf31a353 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts @@ -1046,6 +1046,7 @@ export default { language: { cultureCode: 'Culture Code', displayName: 'Culture Name', + noFallbackLanguages: 'There are no other languages to choose from' }, lockout: { lockoutWillOccur: "You've been idle and logout will automatically occur in", diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/modals/language-picker/language-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/modals/language-picker/language-picker-modal.element.ts index 474e0be07c..c80f575d78 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/modals/language-picker/language-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/modals/language-picker/language-picker-modal.element.ts @@ -51,7 +51,7 @@ export class UmbLanguagePickerModalElement extends UmbModalBaseElement< render() { return html` - ${repeat( + ${this.#filteredLanguages.length > 0 ? repeat( this.#filteredLanguages, (item) => item.unique, (item) => html` @@ -64,7 +64,9 @@ export class UmbLanguagePickerModalElement extends UmbModalBaseElement< `, - )} + ) : html` + There are no other languages to choose from + `}
From 3d67b5689633560a254cce63a2e196b26fc9727a Mon Sep 17 00:00:00 2001 From: Paul Seal Date: Fri, 14 Jun 2024 10:39:20 +0100 Subject: [PATCH 2/2] added trailing commas --- src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts | 2 +- src/Umbraco.Web.UI.Client/src/assets/lang/en.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 dacd98f712..ad50e70d73 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 @@ -1033,7 +1033,7 @@ export default { language: { cultureCode: 'Culture Code', displayName: 'Culture Name', - noFallbackLanguages: 'There are no other languages to choose from' + noFallbackLanguages: 'There are no other languages to choose from', }, lockout: { lockoutWillOccur: "You've been idle and logout will automatically occur in", diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts index eebf31a353..495f93ad61 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts @@ -1046,7 +1046,7 @@ export default { language: { cultureCode: 'Culture Code', displayName: 'Culture Name', - noFallbackLanguages: 'There are no other languages to choose from' + noFallbackLanguages: 'There are no other languages to choose from', }, lockout: { lockoutWillOccur: "You've been idle and logout will automatically occur in",