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 4c416894e378..b98a778667aa 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts @@ -159,7 +159,7 @@ export default { saveAndPublish: 'Save and publish', saveToPublish: 'Save and send for approval', saveListView: 'Save list view', - schedulePublish: 'Schedule', + schedulePublish: 'Schedule publish', saveAndPreview: 'Save and preview', showPageDisabled: "Preview is disabled because there's no template assigned", styleChoose: 'Choose style', @@ -271,7 +271,7 @@ export default { publishedPendingChanges: 'Published (pending changes)', publishStatus: 'Publication Status', publishDescendantsHelp: - 'Publish %0% and all content items underneath and thereby making their content publicly available.', + 'Publish %0% and all items underneath and thereby making their content publicly available.', publishDescendantsWithVariantsHelp: 'Publish variants and variants of same type underneath and thereby making their content publicly available.', noVariantsToProcess: 'There are no available variants', @@ -319,7 +319,7 @@ export default { addTextBox: 'Add another text box', removeTextBox: 'Remove this text box', contentRoot: 'Content root', - includeUnpublished: 'Include unpublished content items.', + includeUnpublished: 'Include unpublished items.', isSensitiveValue: 'This value is hidden. If you need access to view this value please contact your website administrator.', isSensitiveValue_short: 'This value is hidden.', @@ -348,6 +348,8 @@ export default { variantUnpublishNotAllowed: 'Unpublish is not allowed', selectAllVariants: 'Select all variants', saveModalTitle: 'Save', + saveAndPublishModalTitle: 'Save and publish', + publishModalTitle: 'Publish', }, blueprints: { createBlueprintFrom: "Create a new Document Blueprint from '%0%'", @@ -475,10 +477,11 @@ export default { discardChanges: 'Discard changes', unsavedChanges: 'Discard unsaved changes', unsavedChangesWarning: 'Are you sure you want to navigate away from this page? You have unsaved changes', - confirmListViewPublish: 'Publishing will make the selected items visible on the site.', - confirmListViewUnpublish: 'Unpublishing will remove the selected items and all their descendants from the site.', - confirmPublish: 'Publishing will make this page and all its published descendants visible on the site.', - confirmUnpublish: 'Unpublishing will remove this page and all its descendants from the site.', + confirmListViewPublish: 'Publishing will make the selected items publicly available.', + confirmListViewUnpublish: + 'Unpublishing will make the selected items and all their descendants publicly unavailable.', + confirmPublish: 'Publishing will make this content and all its published descendants publicly available.', + confirmUnpublish: 'Unpublishing will make this content publicly unavailable.', doctypeChangeWarning: 'You have unsaved changes. Making changes to the Document Type will discard the changes.', }, bulk: { @@ -911,7 +914,7 @@ export default { retrieve: 'Retrieve', retry: 'Retry', rights: 'Permissions', - scheduledPublishing: 'Scheduled Publishing', + scheduledPublishing: 'Schedule publish', umbracoInfo: 'Umbraco info', search: 'Search', searchNoResult: 'Sorry, we can not find what you are looking for.', diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/save-modal/document-save-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/save-modal/document-save-modal.element.ts index 5b89bcfea9ca..aa2f39cceb61 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/save-modal/document-save-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/save-modal/document-save-modal.element.ts @@ -57,10 +57,6 @@ export class UmbDocumentSaveModalElement extends UmbModalBaseElement< override render() { return html` -

- Choose which variants to be saved. -

- diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/publish/modal/document-publish-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/publish/modal/document-publish-modal.element.ts index 44a93f0d0424..b59254f4c0a8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/publish/modal/document-publish-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/publish/modal/document-publish-modal.element.ts @@ -101,26 +101,23 @@ export class UmbDocumentPublishModalElement extends UmbModalBaseElement< } override render() { - return html` + const headline = this.data?.headline ?? this.localize.term('content_publishModalTitle'); + + return html` +

+ +

+ ${when( !this._isInvariant, () => - html`

- Which variants would you like to publish? -

- `, + html` `, )} -

- - Publishing will make this page and all its published descendants visible on the site. - -

-
-

- ${when( - this._options.length > 1, - () => html` - Which languages would you like to schedule? - `, - () => html` - - Select the date and time to publish and/or unpublish the content item. - - `, - )} -

- ${this.#renderOptions()}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/unpublish/entity-action/unpublish.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/unpublish/entity-action/unpublish.action.ts index 072941195ba2..667fb4dbebc1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/unpublish/entity-action/unpublish.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/unpublish/entity-action/unpublish.action.ts @@ -105,28 +105,11 @@ export class UmbUnpublishDocumentEntityAction extends UmbEntityActionBase } if (!error) { - // If the content is invariant, we need to show a different notification - const isInvariant = options.length === 1 && options[0].culture === null; - - if (isInvariant) { - notificationContext?.peek('positive', { - data: { - headline: localize.term('speechBubbles_editContentUnpublishedHeader'), - message: localize.term('speechBubbles_editContentUnpublishedText'), - }, - }); - } else { - const documentVariants = documentData.variants.filter((variant) => result.selection.includes(variant.culture!)); - notificationContext?.peek('positive', { - data: { - headline: localize.term('speechBubbles_editContentUnpublishedHeader'), - message: localize.term( - 'speechBubbles_editVariantUnpublishedText', - localize.list(documentVariants.map((v) => v.culture ?? v.name)), - ), - }, - }); - } + notificationContext?.peek('positive', { + data: { + message: localize.term('speechBubbles_editContentUnpublishedHeader'), + }, + }); const actionEventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT); const event = new UmbRequestReloadStructureForEntityEvent({ diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/unpublish/modal/document-unpublish-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/unpublish/modal/document-unpublish-modal.element.ts index 7a1ef74b8fd2..d356a82072a3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/unpublish/modal/document-unpublish-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/unpublish/modal/document-unpublish-modal.element.ts @@ -150,14 +150,12 @@ export class UmbDocumentUnpublishModalElement extends UmbModalBaseElement< override render() { return html` +

+ +

${when( !this._isInvariant, () => html` -

- - Select the languages to unpublish. Unpublishing a mandatory language will unpublish all languages. - -

`, )} - -

- - Unpublishing will remove this page and all its descendants from the site. - -

- ${this._referencesConfig ? html` variantIds.some((id) => id.culture === v.culture)); this.#notificationContext?.peek('positive', { data: { - headline: this.#localize.term('speechBubbles_editContentPublishedHeader'), - message: this.#localize.term( - 'speechBubbles_editVariantPublishedText', - // TODO: use correct variant names instead of variant strings [MR] - this.#localize.list(variants.map((v) => UmbVariantId.Create(v).toString() ?? v.name)), - ), + message: this.#localize.term('speechBubbles_editContentPublishedHeader'), }, });