Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
Charles Nurse
2021-04-28 15:08:00 -07:00
3 changed files with 4 additions and 5 deletions

View File

@ -65,8 +65,8 @@ namespace Oqtane.Repository
break; // found a matching alias
}
}
return alias;
// return fallback alias
return alias ?? aliases.Find(item => item.Name.Equals("*"));
}
public void DeleteAlias(int aliasId)

View File

@ -16,7 +16,6 @@
"DefaultContainer": ""
},
"Localization": {
"DefaultCulture": "",
"SupportedCultures": []
"DefaultCulture": "en"
}
}

View File

@ -71,6 +71,6 @@ namespace Oqtane.Shared {
public static readonly string SatelliteAssemblyExtension = ".resources.dll";
public static readonly string DefaultCulture = CultureInfo.InstalledUICulture.Name;
public static readonly string DefaultCulture = "en";
}
}