diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs index 37d4889b4d..04f69243c3 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs @@ -820,11 +820,16 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers contentItem.Variants.Where(x => x.Save).Select(x => x.Culture).ToArray(), defaultCulture); + bool isBlueprint = contentItem.PersistedContent.Blueprint; + + var contentSavedHeader = isBlueprint ? "editBlueprintSavedHeader" : "editContentSavedHeader"; + var contentSavedText = isBlueprint ? "editBlueprintSavedText" : "editContentSavedText"; + switch (contentItem.Action) { case ContentSaveAction.Save: case ContentSaveAction.SaveNew: - SaveAndNotify(contentItem, saveMethod, variantCount, notifications, globalNotifications, "editContentSavedText", "editVariantSavedText", cultureForInvariantErrors, out wasCancelled); + SaveAndNotify(contentItem, saveMethod, variantCount, notifications, globalNotifications, contentSavedHeader, contentSavedText, "editVariantSavedText", cultureForInvariantErrors, out wasCancelled); break; case ContentSaveAction.Schedule: case ContentSaveAction.ScheduleNew: @@ -834,7 +839,8 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers wasCancelled = false; break; } - SaveAndNotify(contentItem, saveMethod, variantCount, notifications, globalNotifications, "editContentScheduledSavedText", "editVariantSavedText", cultureForInvariantErrors, out wasCancelled); + + SaveAndNotify(contentItem, saveMethod, variantCount, notifications, globalNotifications, "editContentSavedHeader", "editContentScheduledSavedText", "editVariantSavedText", cultureForInvariantErrors, out wasCancelled); break; case ContentSaveAction.SendPublish: @@ -883,7 +889,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers if (!await ValidatePublishBranchPermissionsAsync(contentItem)) { globalNotifications.AddErrorNotification( - _localizedTextService.Localize(null,"publish"), + _localizedTextService.Localize(null, "publish"), _localizedTextService.Localize("publish", "invalidPublishBranchPermissions")); wasCancelled = false; break; @@ -900,7 +906,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers if (!await ValidatePublishBranchPermissionsAsync(contentItem)) { globalNotifications.AddErrorNotification( - _localizedTextService.Localize(null,"publish"), + _localizedTextService.Localize(null, "publish"), _localizedTextService.Localize("publish", "invalidPublishBranchPermissions")); wasCancelled = false; break; @@ -1041,13 +1047,15 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers /// private void SaveAndNotify(ContentItemSave contentItem, Func saveMethod, int variantCount, Dictionary notifications, SimpleNotificationModel globalNotifications, - string invariantSavedLocalizationAlias, string variantSavedLocalizationAlias, string cultureForInvariantErrors, + string savedContentHeaderLocalizationAlias, string invariantSavedLocalizationAlias, string variantSavedLocalizationAlias, string cultureForInvariantErrors, out bool wasCancelled) { var saveResult = saveMethod(contentItem.PersistedContent); wasCancelled = saveResult.Success == false && saveResult.Result == OperationResultType.FailedCancelledByEvent; if (saveResult.Success) { + bool isBlueprint = contentItem.PersistedContent.Blueprint; + if (variantCount > 1) { var variantErrors = ModelState.GetVariantsWithErrors(cultureForInvariantErrors); @@ -1061,15 +1069,15 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers var variantName = GetVariantName(culture, segment); AddSuccessNotification(notifications, culture, segment, - _localizedTextService.Localize("speechBubbles", "editContentSavedHeader"), - _localizedTextService.Localize(null,variantSavedLocalizationAlias, new[] { variantName })); + _localizedTextService.Localize("speechBubbles", savedContentHeaderLocalizationAlias), + _localizedTextService.Localize(null, variantSavedLocalizationAlias, new[] { variantName })); } } else if (ModelState.IsValid) { globalNotifications.AddSuccessNotification( - _localizedTextService.Localize("speechBubbles", "editContentSavedHeader"), - _localizedTextService.Localize("speechBubbles",invariantSavedLocalizationAlias)); + _localizedTextService.Localize("speechBubbles", savedContentHeaderLocalizationAlias), + _localizedTextService.Localize("speechBubbles", invariantSavedLocalizationAlias)); } } } diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index dbcf771e4c..5ec919874f 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -1323,6 +1323,8 @@ Mange hilsner fra Umbraco robotten %0% dokumenter udgivet og synlige på hjemmesiden %0% udgivet og synligt på hjemmesiden %0% dokumenter udgivet for sprogene %1% og synlige på hjemmesiden + Indholdsskabelon gemt + Rettelser er blevet gemt Indhold gemt Husk at publicere for at gøre det synligt for besøgende En planlægning for udgivelse er blevet opdateret diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 5aadd606bf..350ef69f3f 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -1524,6 +1524,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont Publishing failed because the parent page isn't published Content published and visible on the website + Content Template saved + Changes have been successfully saved Content saved Remember to publish to make changes visible Sent For Approval diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index 19e6eef577..0c49df09ea 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -1549,8 +1549,9 @@ To manage your website, simply open the Umbraco backoffice and start adding cont and is visible on the website %0% documents published and visible on the website %0% published and visible on the website - %0% documents published for languages %1% and visible on the website - + %0% documents published for languages %1% and visible on the website + Content Template saved + Changes have been successfully saved Content saved Remember to publish to make changes visible A schedule for publishing has been updated