Merge pull request #181 from emoacht/develop

Develop
emoacht · May 23, 2021 · a947320 · a947320
2 parents 21bb14c + 99223b3
commit a947320
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 27 deletions.
diff --git a/Source/Installer/Product.wxs b/Source/Installer/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="2.18.0"
+  <Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="2.18.1"
            Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
     <Package Id="*" InstallerVersion="500" Compressed="yes"
              InstallScope="perMachine" InstallPrivileges="elevated"

diff --git a/Source/Monitorian.Core/Models/LanguageService.cs b/Source/Monitorian.Core/Models/LanguageService.cs
@@ -15,19 +15,16 @@ public class LanguageService
 
 		private static readonly Lazy<CultureInfo> _culture = new(() =>
 		{
-			var supportedCultureNames = new HashSet<string>(CultureInfo.GetCultures(CultureTypes.AllCultures).Select(x => x.Name));
 			var arguments = AppKeeper.DefinedArguments;
 
 			int i = 0;
 			while (i < arguments.Count - 1)
 			{
 				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++;
 			}

diff --git a/Source/Monitorian.Core/Models/ProductInfo.cs b/Source/Monitorian.Core/Models/ProductInfo.cs
@@ -51,6 +51,11 @@ public static string Title
 		/// </summary>
 		public static string StartupTaskId => GetAppSettings();
 
+		/// <summary>
+		/// Project Url
+		/// </summary>
+		public static string ProjectUrl => GetAppSettings();
+
 		private static TAttribute GetAttribute<TAttribute>(this Assembly assembly) where TAttribute : Attribute =>
 			(TAttribute)Attribute.GetCustomAttribute(assembly, typeof(TAttribute));
 

diff --git a/Source/Monitorian.Core/Properties/AssemblyInfo.cs b/Source/Monitorian.Core/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.18.0.0")]
-[assembly: AssemblyFileVersion("2.18.0.0")]
+[assembly: AssemblyVersion("2.18.1.0")]
+[assembly: AssemblyFileVersion("2.18.1.0")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 // For unit test

diff --git a/Source/Monitorian.Core/Properties/Invariant.Designer.cs b/Source/Monitorian.Core/Properties/Invariant.Designer.cs
diff --git a/Source/Monitorian.Core/Properties/Invariant.resx b/Source/Monitorian.Core/Properties/Invariant.resx
@@ -123,7 +123,4 @@
   <data name="Site" xml:space="preserve">
     <value>Site</value>
   </data>
-  <data name="SiteUrl" xml:space="preserve">
-    <value>https://github.com/emoacht/Monitorian</value>
-  </data>
 </root>
diff --git a/Source/Monitorian.Core/Properties/Resources.ko-KR.resx b/Source/Monitorian.Core/Properties/Resources.ko-KR.resx
@@ -150,9 +150,6 @@
   <data name="ShowAdjusted" xml:space="preserve">
     <value>조정된 밝기를 표시합니다</value>
   </data>
-  <data name="SiteUrl" xml:space="preserve">
-    <value>https://github.com/emoacht/Monitorian</value>
-  </data>
   <data name="StartSignIn" xml:space="preserve">
     <value>로그인 시 시작합니다.</value>
   </data>

diff --git a/Source/Monitorian.Core/Views/MenuWindow.xaml b/Source/Monitorian.Core/Views/MenuWindow.xaml
@@ -29,7 +29,7 @@
 					 Text="{x:Static properties:Invariant.Site}">
 					<i:Interaction.Triggers>
 						<i:EventTrigger EventName="MouseDown">
-							<i:LaunchUriOrFileAction Path="{x:Static properties:Invariant.SiteUrl}"/>
+							<i:LaunchUriOrFileAction Path="{x:Static models:ProductInfo.ProjectUrl}"/>
 						</i:EventTrigger>
 					</i:Interaction.Triggers>
 				</Run>

diff --git a/Source/Monitorian/App.config b/Source/Monitorian/App.config
@@ -8,5 +8,6 @@
   </runtime>
   <appSettings>
     <add key="StartupTaskId" value="MonitorianStartupTask"/>
+    <add key="ProjectUrl" value="https://github.com/emoacht/Monitorian"/>
   </appSettings>
 </configuration>
diff --git a/Source/Monitorian/Properties/AssemblyInfo.cs b/Source/Monitorian/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.18.0.0")]
-[assembly: AssemblyFileVersion("2.18.0.0")]
+[assembly: AssemblyVersion("2.18.1.0")]
+[assembly: AssemblyFileVersion("2.18.1.0")]
 [assembly: Guid("a4cc5362-9b08-465b-ad64-5cfabc72a4c7")]
 [assembly: NeutralResourcesLanguage("en-US")]