From 7eaa04a326850f1004396a2b95ceebc27a142544 Mon Sep 17 00:00:00 2001 From: pavelbannov Date: Tue, 1 Mar 2022 18:16:11 +0300 Subject: [PATCH] resources --- Web.sln | 41 ++++++ Web/App_Code/Global.cs | 4 +- Web/App_GlobalResources/Resource.resx | 126 ++++++++++++++++++ Web/App_GlobalResources/Resource.ru.resx | 126 ++++++++++++++++++ .../SysReqs_CPU_doc.ascx.resx | 123 +++++++++++++++++ .../SysReqs_CPU_doc.ascx.ru.resx | 123 +++++++++++++++++ .../SysReqs_CPU/SysReqs_CPU_doc.ascx | 5 +- .../SysReqs_CPU/SysReqs_CPU_doc.ru.ascx | 2 +- .../Windows/SysReqsWin/SysReqsWin.ascx | 3 +- .../Windows/SysReqsWin/SysReqsWin.ru.ascx | 3 +- 10 files changed, 550 insertions(+), 6 deletions(-) create mode 100644 Web.sln create mode 100644 Web/App_GlobalResources/Resource.resx create mode 100644 Web/App_GlobalResources/Resource.ru.resx create mode 100644 Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/App_LocalResources/SysReqs_CPU_doc.ascx.resx create mode 100644 Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/App_LocalResources/SysReqs_CPU_doc.ascx.ru.resx diff --git a/Web.sln b/Web.sln new file mode 100644 index 000000000..d340c8cbc --- /dev/null +++ b/Web.sln @@ -0,0 +1,41 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32210.238 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Web", "Web\", "{8FF8A609-4D1D-4EC5-9A69-2E0E986845C9}" + ProjectSection(WebsiteProperties) = preProject + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5" + Debug.AspNetCompiler.VirtualPath = "/localhost_64832" + Debug.AspNetCompiler.PhysicalPath = "Web\" + Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_64832\" + Debug.AspNetCompiler.Updateable = "true" + Debug.AspNetCompiler.ForceOverwrite = "true" + Debug.AspNetCompiler.FixedNames = "false" + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.VirtualPath = "/localhost_64832" + Release.AspNetCompiler.PhysicalPath = "Web\" + Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_64832\" + Release.AspNetCompiler.Updateable = "true" + Release.AspNetCompiler.ForceOverwrite = "true" + Release.AspNetCompiler.FixedNames = "false" + Release.AspNetCompiler.Debug = "False" + VWDPort = "64832" + SlnRelativePath = "Web\" + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8FF8A609-4D1D-4EC5-9A69-2E0E986845C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8FF8A609-4D1D-4EC5-9A69-2E0E986845C9}.Debug|Any CPU.Build.0 = Debug|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {ACC58640-5D24-4334-9B89-7C132BC692AF} + EndGlobalSection +EndGlobal diff --git a/Web/App_Code/Global.cs b/Web/App_Code/Global.cs index 77b2aea06..e6aa182ba 100644 --- a/Web/App_Code/Global.cs +++ b/Web/App_Code/Global.cs @@ -11,7 +11,7 @@ using log4net; using log4net.Config; using TeamLab; -public class Global : HttpApplication +public class Global : HttpApplication { public Global() { @@ -51,5 +51,7 @@ public class Global : HttpApplication protected void Application_BeginRequest(object sender, EventArgs e) { + System.Threading.Thread.CurrentThread.CurrentCulture = LanguageProvider.GetCurrentCulture(); + System.Threading.Thread.CurrentThread.CurrentUICulture = LanguageProvider.GetCurrentCulture(); } } diff --git a/Web/App_GlobalResources/Resource.resx b/Web/App_GlobalResources/Resource.resx new file mode 100644 index 000000000..136d29921 --- /dev/null +++ b/Web/App_GlobalResources/Resource.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dual-core + + + CPU + + \ No newline at end of file diff --git a/Web/App_GlobalResources/Resource.ru.resx b/Web/App_GlobalResources/Resource.ru.resx new file mode 100644 index 000000000..ef99ff62b --- /dev/null +++ b/Web/App_GlobalResources/Resource.ru.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + двухъядерный с тактовой частотой + + + Процессор1 + + \ No newline at end of file diff --git a/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/App_LocalResources/SysReqs_CPU_doc.ascx.resx b/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/App_LocalResources/SysReqs_CPU_doc.ascx.resx new file mode 100644 index 000000000..dcb65b4a0 --- /dev/null +++ b/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/App_LocalResources/SysReqs_CPU_doc.ascx.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + CPU1 + + \ No newline at end of file diff --git a/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/App_LocalResources/SysReqs_CPU_doc.ascx.ru.resx b/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/App_LocalResources/SysReqs_CPU_doc.ascx.ru.resx new file mode 100644 index 000000000..f786c4e53 --- /dev/null +++ b/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/App_LocalResources/SysReqs_CPU_doc.ascx.ru.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + двухъядерный с тактовой частотой + + \ No newline at end of file diff --git a/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/SysReqs_CPU_doc.ascx b/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/SysReqs_CPU_doc.ascx index 2ffc57613..caadfb878 100644 --- a/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/SysReqs_CPU_doc.ascx +++ b/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/SysReqs_CPU_doc.ascx @@ -1,3 +1,4 @@ <%@ Control Language="C#" %> -
CPU
-
dual-core 2 GHz or better
\ No newline at end of file +
+
+
2 GHz or better
\ No newline at end of file diff --git a/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/SysReqs_CPU_doc.ru.ascx b/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/SysReqs_CPU_doc.ru.ascx index addf3354a..303d857dd 100644 --- a/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/SysReqs_CPU_doc.ru.ascx +++ b/Web/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/SysReqs_CPU_doc.ru.ascx @@ -1,3 +1,3 @@ <%@ Control Language="C#" %> -
Процессор
+
двухъядерный с тактовой частотой 2 ГГц или лучше
\ No newline at end of file diff --git a/Web/Controls/Help/Desktop/Documents/Windows/SysReqsWin/SysReqsWin.ascx b/Web/Controls/Help/Desktop/Documents/Windows/SysReqsWin/SysReqsWin.ascx index 7da5e3c26..09a7fb018 100644 --- a/Web/Controls/Help/Desktop/Documents/Windows/SysReqsWin/SysReqsWin.ascx +++ b/Web/Controls/Help/Desktop/Documents/Windows/SysReqsWin/SysReqsWin.ascx @@ -1,5 +1,6 @@ <%@ Control Language="C#" Inherits="BaseContentUserControls" %> <%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %> +<%@ Register TagPrefix="cc" TagName="SysReqsCPUdoc" Src="~/Controls/Help/Desktop/Documents/Common/SystemRequirements/SysReqs_CPU/SysReqs_CPU_doc.ascx" %>