diff --git a/BuildFiles/Building/scripts/compile-site-resources b/BuildFiles/Building/scripts/compile-site-resources index 6e95aa51..2685c20e 100755 --- a/BuildFiles/Building/scripts/compile-site-resources +++ b/BuildFiles/Building/scripts/compile-site-resources @@ -17,10 +17,10 @@ for F in *; do if [ -d "$F" ]; then # $F is a directory cd $F - find . -iname '*.resources' -exec al /target:lib /culture:$F /version:1.0.0.0 /embed:{} /out:{}.dll \; + find . -iname '*.resources' -exec al /target:lib /culture:$F /version:1.0.0.0 /embed:{} /out:Swarmops.Frontend.{}.dll \; cd .. elif [[ $F == *.resources ]]; then - al /target:lib /embed:$F /version:1.0.0.0 /out:$F.dll + al /target:lib /embed:$F /version:1.0.0.0 /out:Swarmops.Frontend.$F.dll fi done diff --git a/Site/Security/Login.aspx.cs b/Site/Security/Login.aspx.cs index d9e3b37b..339f6e59 100644 --- a/Site/Security/Login.aspx.cs +++ b/Site/Security/Login.aspx.cs @@ -2,6 +2,8 @@ using System.Diagnostics; using System.Globalization; using System.IO; +using System.Reflection; +using System.Resources; using System.Runtime.Versioning; using System.Web; using System.Web.ExtensionMethods; @@ -529,8 +531,15 @@ namespace Swarmops.Pages.Security public string Localized_BitIdRequired_Dialog { - get { return @"Being Localized"; } /* --- TODO: Commented out - get { return CommonV5.JavascriptEscape(Resources.Pages.Security.Login_BitIdRequired_Dialog); } --- */ + get { return CommonV5.JavascriptEscape(Localization.GetString("Login_BitIdRequired_Dialog")); } + } + + protected ResourceManager Localization + { + get + { + return new ResourceManager("Swarmops.Frontend.Pages.Security", Assembly.GetAssembly(this.GetType())); + } } // ReSharper restore InconsistentNaming