V8: Do not warn about unpublishing multiple languages for invar… (#6613)

umbraco · Oct 16, 2019 · 0085053 · 0085053
1 parent 0b39548
commit 0085053
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 17 deletions.
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
@@ -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);
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/delete.html b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
@@ -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>
 

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
@@ -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>

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
@@ -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>