Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

V8: Do not warn about unpublishing multiple languages for invariant content #6613

Merged
merged 2 commits into from Oct 16, 2019
Merged

V8: Do not warn about unpublishing multiple languages for invariant content #6613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
999ec3d
Do not warn about unpublishing multiple languages for invariant content
kjac Oct 8, 2019
07c206f
Merge branch 'v8/dev' into pr/6613
nul800sebastiaan Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 0 additions & 14 deletions src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
View file
Open in desktop
Expand Up @@ -80,20 +80,6 @@ function ContentDeleteController($scope, $timeout, contentResource, treeService,
$scope.close = function () {
navigationService.hideDialog();
};


languageResource.getAll().then(function (data) {

$scope.hasMoreThanOneLanguage = data.length > 1;
}, function (err) {
toggleDeleting(false);

//check if response is ysod
if (err.status && err.status >= 500) {
// TODO: All YSOD handling should be done with an interceptor
overlayService.ysod(err);
}
});
}

angular.module("umbraco").controller("Umbraco.Editors.Content.DeleteController", ContentDeleteController);
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/views/content/delete.html
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
<localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong>?
</p>

<div class="umb-alert umb-alert--warning" ng-show="hasMoreThanOneLanguage && !currentNode.trashed">
<div class="umb-alert umb-alert--warning" ng-show="currentNode.metaData.variesByCulture && !currentNode.trashed">
<localize key="defaultdialogs_variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</localize>
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
View file
Open in desktop
Expand Up @@ -477,7 +477,7 @@
<key alias="account">account</key>
<key alias="selectEditor">Select editor</key>
<key alias="selectSnippet">Select snippet</key>
<key alias="variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</key>
<key alias="variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language, you should unpublish the node in that language instead.</key>
</area>
<area alias="dictionary">
<key alias="noItems">There are no dictionary items.</key>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
View file
Open in desktop
Expand Up @@ -480,7 +480,7 @@
<key alias="account">account</key>
<key alias="selectEditor">Select editor</key>
<key alias="selectSnippet">Select snippet</key>
<key alias="variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language go and unpublish it instead.</key>
<key alias="variantdeletewarning">This will delete the node and all its languages. If you only want to delete one language, you should unpublish the node in that language instead.</key>
</area>
<area alias="dictionary">
<key alias="noItems">There are no dictionary items.</key>
Expand Down