From 8cae18d92ad88fb70ecaba7aba6ef27c6786a415 Mon Sep 17 00:00:00 2001 From: emoacht Date: Sun, 23 May 2021 22:15:47 +0900 Subject: [PATCH 1/4] Modify language service --- Source/Monitorian.Core/Models/LanguageService.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/Monitorian.Core/Models/LanguageService.cs b/Source/Monitorian.Core/Models/LanguageService.cs index 77e07499..9ce7c687 100644 --- a/Source/Monitorian.Core/Models/LanguageService.cs +++ b/Source/Monitorian.Core/Models/LanguageService.cs @@ -15,7 +15,6 @@ public class LanguageService private static readonly Lazy _culture = new(() => { - var supportedCultureNames = new HashSet(CultureInfo.GetCultures(CultureTypes.AllCultures).Select(x => x.Name)); var arguments = AppKeeper.DefinedArguments; int i = 0; @@ -23,11 +22,9 @@ public class LanguageService { if (string.Equals(arguments[i], Option, StringComparison.OrdinalIgnoreCase)) { - var cultureName = supportedCultureNames.FirstOrDefault(x => string.Equals(x, arguments[i + 1], StringComparison.OrdinalIgnoreCase)); - if (cultureName is not null) - return new CultureInfo(cultureName); - - break; + var cultureName = arguments[i + 1]; + return CultureInfo.GetCultures(CultureTypes.AllCultures) + .FirstOrDefault(x => string.Equals(x.Name, cultureName, StringComparison.OrdinalIgnoreCase)); } i++; } From 7c9bfd20c63f0ce78b547c35aaa18fb74cf71410 Mon Sep 17 00:00:00 2001 From: emoacht Date: Sun, 23 May 2021 22:21:00 +0900 Subject: [PATCH 2/4] Remove SiteUrl --- Source/Monitorian.Core/Properties/Resources.ko-KR.resx | 3 --- 1 file changed, 3 deletions(-) diff --git a/Source/Monitorian.Core/Properties/Resources.ko-KR.resx b/Source/Monitorian.Core/Properties/Resources.ko-KR.resx index 74d77ca6..0f4ad5ad 100644 --- a/Source/Monitorian.Core/Properties/Resources.ko-KR.resx +++ b/Source/Monitorian.Core/Properties/Resources.ko-KR.resx @@ -150,9 +150,6 @@ 조정된 밝기를 표시합니다 - - https://github.com/emoacht/Monitorian - 로그인 시 시작합니다. From a0e4b88b41c0f2864bbf6219b624c71e62eb53c3 Mon Sep 17 00:00:00 2001 From: emoacht Date: Sun, 23 May 2021 22:22:38 +0900 Subject: [PATCH 3/4] Move ProjectUrl to AppSettings --- Source/Monitorian.Core/Models/ProductInfo.cs | 5 +++++ Source/Monitorian.Core/Properties/Invariant.Designer.cs | 9 --------- Source/Monitorian.Core/Properties/Invariant.resx | 3 --- Source/Monitorian.Core/Views/MenuWindow.xaml | 2 +- Source/Monitorian/App.config | 1 + 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Source/Monitorian.Core/Models/ProductInfo.cs b/Source/Monitorian.Core/Models/ProductInfo.cs index a0e45ce7..6699e8a1 100644 --- a/Source/Monitorian.Core/Models/ProductInfo.cs +++ b/Source/Monitorian.Core/Models/ProductInfo.cs @@ -51,6 +51,11 @@ public static string Title /// public static string StartupTaskId => GetAppSettings(); + /// + /// Project Url + /// + public static string ProjectUrl => GetAppSettings(); + private static TAttribute GetAttribute(this Assembly assembly) where TAttribute : Attribute => (TAttribute)Attribute.GetCustomAttribute(assembly, typeof(TAttribute)); diff --git a/Source/Monitorian.Core/Properties/Invariant.Designer.cs b/Source/Monitorian.Core/Properties/Invariant.Designer.cs index 44451349..9f993f05 100644 --- a/Source/Monitorian.Core/Properties/Invariant.Designer.cs +++ b/Source/Monitorian.Core/Properties/Invariant.Designer.cs @@ -77,14 +77,5 @@ public static string Site { return ResourceManager.GetString("Site", resourceCulture); } } - - /// - /// Looks up a localized string similar to https://github.com/emoacht/Monitorian. - /// - public static string SiteUrl { - get { - return ResourceManager.GetString("SiteUrl", resourceCulture); - } - } } } diff --git a/Source/Monitorian.Core/Properties/Invariant.resx b/Source/Monitorian.Core/Properties/Invariant.resx index aa906897..aed46bfe 100644 --- a/Source/Monitorian.Core/Properties/Invariant.resx +++ b/Source/Monitorian.Core/Properties/Invariant.resx @@ -123,7 +123,4 @@ Site - - https://github.com/emoacht/Monitorian - \ No newline at end of file diff --git a/Source/Monitorian.Core/Views/MenuWindow.xaml b/Source/Monitorian.Core/Views/MenuWindow.xaml index aae48ddf..1e134fed 100644 --- a/Source/Monitorian.Core/Views/MenuWindow.xaml +++ b/Source/Monitorian.Core/Views/MenuWindow.xaml @@ -29,7 +29,7 @@ Text="{x:Static properties:Invariant.Site}"> - + diff --git a/Source/Monitorian/App.config b/Source/Monitorian/App.config index cc5ac077..1949d7ec 100644 --- a/Source/Monitorian/App.config +++ b/Source/Monitorian/App.config @@ -8,5 +8,6 @@ + From 99223b3eb0b8a76b36f7373f0c362c9cd819b727 Mon Sep 17 00:00:00 2001 From: emoacht Date: Sun, 23 May 2021 22:43:01 +0900 Subject: [PATCH 4/4] Increment build number --- Source/Installer/Product.wxs | 2 +- Source/Monitorian.Core/Properties/AssemblyInfo.cs | 4 ++-- Source/Monitorian/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs index 04271381..22ae7e5f 100644 --- a/Source/Installer/Product.wxs +++ b/Source/Installer/Product.wxs @@ -1,6 +1,6 @@  -