Merge remote-tracking branch 'origin/temp8' into temp8-U4-11282

# Conflicts:
#	src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
#	src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js

src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js

@@ -166,6 +166,15 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
                'Failed to retrieve all content types');
         },
 
+        allowsVariation: function() {
+            return umbRequestHelper.resourcePromise(
+                $http.get(
+                    umbRequestHelper.getApiUrl(
+                        "contentTypeApiBaseUrl",
+                        "AllowsVariation")),
+                'Failed to retrieve variant content types');
+        },
+
         getScaffold: function (parentId) {
 
             return umbRequestHelper.resourcePromise(

src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js

@@ -7,6 +7,10 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
 
     var contentTypeHelperService = {
 
+        allowsVariation: function() {
+            return contentTypeResource.allowsVariation();
+        },
+
         createIdArray: function(array) {
 
           var newArray = [];

src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js

@@ -9,7 +9,7 @@
  *
  * @param {navigationService} navigationService A reference to the navigationService
  */
-function NavigationController($scope, $rootScope, $location, $log, $q, $routeParams, $timeout, treeService, appState, navigationService, keyboardService, dialogService, historyService, eventsService, sectionResource, angularHelper, languageResource) {
+function NavigationController($scope, $rootScope, $location, $log, $q, $routeParams, $timeout, treeService, appState, navigationService, keyboardService, dialogService, historyService, eventsService, sectionResource, angularHelper, languageResource, contentTypeHelper) {
 
     //this is used to trigger the tree to start loading once everything is ready
     var treeInitPromise = $q.defer();
@@ -209,18 +209,47 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
             $scope.showSearchResults = args.value;
         }
 
+        //load languages if doc types allow variations
+        if ($scope.currentSection === "content") {
+            contentTypeHelper.allowsVariation().then(function (b) {
+                if (b === "true") {
+                    //load languages if there are more than 1
+                    loadLanguages();
+                } else {
+                    $scope.languages = [];
+                    init();
+                }
+
+            });
+        }
     }));
 
     // Listen for language updates
     evts.push(eventsService.on("editors.languages.languageDeleted", function (e, args) {
         languageResource.getAll().then(function (languages) {
-            $scope.languages = languages;
+            contentTypeHelper.allowsVariation().then(function (b) {
+
+                if (b === "true") {
+                    $scope.languages = languages;
+                } else {
+                    $scope.languages = [];
+                }
+
+            });
         });
     }));
 
     evts.push(eventsService.on("editors.languages.languageCreated", function (e, args) {
         languageResource.getAll().then(function (languages) {
-            $scope.languages = languages;
+            contentTypeHelper.allowsVariation().then(function (b) {
+
+                if (b === "true") {
+                    $scope.languages = languages;
+                } else {
+                    $scope.languages = [];
+                }
+
+            });
         });
     }));
 
@@ -359,7 +388,6 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
             });
         });
     }
-
     function nodeExpandedHandler(args) {
         //store the reference to the expanded node path
         if (args.node) {

src/Umbraco.Web.UI.Client/src/less/components/application/umb-language-picker.less

@@ -31,7 +31,7 @@
     position: absolute;
     border-radius: 0 0 3px 3px;
     max-height: 200px;
-    overflow: scroll;
+    overflow: auto;
 }
 
 .umb-language-picker__dropdown a {
@@ -45,4 +45,4 @@
 .umb-language-picker__dropdown a:focus {
     background: @gray-10;
     text-decoration: none;
-}
+}