From 016bed03ae9fb5a2658d6eefd2fcb46173344bbc Mon Sep 17 00:00:00 2001
From: elitsa <elm@umbraco.dk>
Date: Fri, 11 Oct 2019 15:38:26 +0200
Subject: [PATCH] Deleting a language will set the selectedLanguage to the
 default language and update the mculture attribute in the url.

---
 .../src/navigation.controller.js              | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/navigation.controller.js b/src/Umbraco.Web.UI.Client/src/navigation.controller.js
index e4c94f3c66..b585d22e9f 100644
--- a/src/Umbraco.Web.UI.Client/src/navigation.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/navigation.controller.js
@@ -212,6 +212,22 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
     evts.push(eventsService.on("editors.languages.languageDeleted", function (e, args) {
         loadLanguages().then(function (languages) {
             $scope.languages = languages;
+            const defaultCulture = $scope.languages[0].culture;
+
+            if (args.language.culture === $scope.selectedLanguage.culture) {
+                $scope.selectedLanguage = defaultCulture;
+
+                if ($scope.languages.length > 1) {
+                    $location.search("mculture", defaultCulture);
+                } else {
+                    $location.search("mculture", null);
+                }
+                
+                var currentEditorState = editorState.getCurrent();
+                if (currentEditorState && currentEditorState.path) {
+                    $scope.treeApi.syncTree({ path: currentEditorState.path, activate: true });
+                }
+            }
         });
     }));
 
@@ -255,7 +271,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
     evts.push(eventsService.on("treeService.removeNode", function (e, args) {
         //check to see if the current page has been removed
 
-        var currentEditorState = editorState.getCurrent()
+        var currentEditorState = editorState.getCurrent();
         if (currentEditorState && currentEditorState.id.toString() === args.node.id.toString()) {
             //current page is loaded, so navigate to root
             var section = appState.getSectionState("currentSection");
@@ -279,6 +295,9 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
             //select the current language if set in the query string
             if (mainCulture && $scope.languages && $scope.languages.length > 1) {
                 var found = _.find($scope.languages, function (l) {
+                    if (mainCulture === true) {
+                        return false;
+                    }
                     return l.culture.toLowerCase() === mainCulture.toLowerCase();
                 });
                 if (found) {
@@ -348,7 +367,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
 
         return contentResource.allowsCultureVariation().then(function (b) {
             if (b === true) {
-                return languageResource.getAll()
+                return languageResource.getAll();
             } else {
                 return $q.when([]); //resolve an empty collection
             }