PathToLocale dictionary ordered by depth descending, based on count of forward slashes in path

Author: yohsii

core/Helpers/ApiHelper_Services.cs

@@ -292,7 +292,7 @@ public List<BaseTask> SystemTasks()
 
         public String PathLocalisation(string path)
         {
-            var meta = repo.GetPuckMeta().Where(x => x.Name == DBNames.PathToLocale && path.StartsWith(x.Key)).OrderByDescending(x => x.Key.Length).FirstOrDefault();
+            var meta = repo.GetPuckMeta().Where(x => x.Name == DBNames.PathToLocale && (path+"/").StartsWith(x.Key+"/")).OrderByDescending(x => x.Key.Length).FirstOrDefault();
             return meta == null ? null : meta.Value;
         }
         public String DomainMapping(string path)

core/Helpers/StateHelper.cs

@@ -329,12 +329,17 @@ public static void UpdatePathLocaleMappings(bool addInstruction=false)
             using (var scope = PuckCache.ServiceProvider.CreateScope())
             {
                 var repo = scope.ServiceProvider.GetService<I_Puck_Repository>();
-                var meta = repo.GetPuckMeta().Where(x => x.Name == DBNames.PathToLocale).OrderByDescending(x => x.Key.Length).ToList();
+                var meta = repo.GetPuckMeta()
+                    .Where(x => x.Name == DBNames.PathToLocale)
+                    .ToList()
+                    .Where(x=>!string.IsNullOrEmpty(x.Key))
+                    .OrderByDescending(x => x.Key.Count(xx => xx == '/'))
+                    .ToList();
+                
                 var map = new Dictionary<string, string>();
                 meta.ForEach(x =>
                 {
-                //map.Add(x.Key.ToLower(), x.Value.ToLower());
-                map[x.Key.ToLower()] = x.Value.ToLower();
+                    map[x.Key.ToLower()] = x.Value.ToLower();
                 });
                 PuckCache.PathToLocale = map;