New style of sat assy

This commit is contained in:
Rick Falkvinge
2021-07-01 19:14:18 +02:00
parent 4304fc8f76
commit b82d4004f7
2 changed files with 2 additions and 18 deletions
+1 -1
View File
@@ -80,7 +80,7 @@ namespace Resources {
}
}
return System.Reflection.Assembly.Load(baseAssemblyName + suffix);
return System.Reflection.Assembly.Load("Swarmops.Resources." + baseAssemblyName + suffix);
}
/// <summary>
+1 -17
View File
@@ -55,15 +55,6 @@ namespace Resources {
string infix = string.Empty;
string suffix = ".resources";
string resourceAssemblyPath = "/usr/share/swarmops/frontend/bin/";
if (Path.DirectorySeparatorChar != '/')
{
// If we're not running on Linux, this is a development environment,
// so use the HttpContext for the running folder
resourceAssemblyPath = "~/";
}
CultureInfo currentCulture = CultureInfo.CurrentUICulture;
if (currentCulture != null /* && currentCulture.Name != "neutral" */)
{
@@ -71,16 +62,9 @@ namespace Resources {
infix = "." + cultureName;
prefix = cultureName + "/";
// If specific culture exists, return it, otherwise return neutral culture
if (File.Exists(resourceAssemblyPath + prefix + baseAssemblyName + infix + suffix))
{
return System.Reflection.Assembly.Load(resourceAssemblyPath + prefix + baseAssemblyName + suffix + ".dll");
}
}
return System.Reflection.Assembly.Load(baseAssemblyName + suffix);
return System.Reflection.Assembly.Load("Swarmops.Resources." + baseAssemblyName + suffix);
}
/// <summary>