Merge branch 'dawoe-temp-U4-11150' into dev-v7

src/Umbraco.Web/Editors/TourController.cs

@@ -118,13 +118,18 @@ namespace Umbraco.Web.Editors
                 var contents = File.ReadAllText(tourFile);
                 var tours = JsonConvert.DeserializeObject<BackOfficeTour[]>(contents);
 
+                var backOfficeTours = tours.Where(x =>
+                    aliasFilters.Count == 0 || aliasFilters.All(filter => filter.IsMatch(x.Alias)) == false);
+
+                var localizedTours = backOfficeTours.Where(x =>
+                    string.IsNullOrWhiteSpace(x.Culture) || x.Culture.Equals(Security.CurrentUser.Language,
+                        StringComparison.InvariantCultureIgnoreCase)).ToList();
+
                 var tour = new BackOfficeTourFile
                 {
                     FileName = Path.GetFileNameWithoutExtension(tourFile),
                     PluginName = pluginName,
-                    Tours = tours
-                        .Where(x => aliasFilters.Count == 0 || aliasFilters.All(filter => filter.IsMatch(x.Alias)) == false)
-                        .ToArray()
+                    Tours = localizedTours
                 };
 
                 //don't add if all of the tours are filtered

src/Umbraco.Web/Models/BackOfficeTour.cs

@@ -11,7 +11,7 @@ namespace Umbraco.Web.Models
     {
         public BackOfficeTour()
         {
-            RequiredSections = new List<string>();
+            RequiredSections = new List<string>();            
         }
 
         [DataMember(Name = "name")]
@@ -28,5 +28,8 @@ namespace Umbraco.Web.Models
         public List<string> RequiredSections { get; set; }
         [DataMember(Name = "steps")]
         public BackOfficeTourStep[] Steps { get; set; }
+
+        [DataMember(Name = "culture")]
+        public string Culture { get; set; }
     }
 }