Merge branch 'master' of https://github.com/SCKorea/Shatagon

SCKorea · Mar 13, 2021 · 126d119 · 126d119
2 parents fdadd1f + d7189a1
commit 126d119
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 4 deletions.
diff --git a/SCTools/SCTool_Redesigned/Properties/Resources.Designer.cs b/SCTools/SCTool_Redesigned/Properties/Resources.Designer.cs
diff --git a/SCTools/SCTool_Redesigned/Properties/Resources.ko-KR.resx b/SCTools/SCTool_Redesigned/Properties/Resources.ko-KR.resx
@@ -181,6 +181,12 @@
   <data name="MSG_Decs_SelectLocalization" xml:space="preserve">
     <value>게임에 적용할 언어팩을 선택하십시오.</value>
   </data>
+  <data name="MSG_Desc_Disable" xml:space="preserve">
+    <value>패치 비활성화 완료</value>
+  </data>
+  <data name="MSG_Desc_Enable" xml:space="preserve">
+    <value>패치 활성화 완료</value>
+  </data>
   <data name="MSG_Desc_InstallWarning" xml:space="preserve">
     <value>여러분,
 본 프로젝트에 관심을 가져주셔서 감사합니다!
@@ -195,6 +201,9 @@
   <data name="MSG_Desc_InvalidAccess" xml:space="preserve">
     <value>잘못된 접근입니다.</value>
   </data>
+  <data name="MSG_Desc_Uninstall" xml:space="preserve">
+    <value>패치 제거 완료</value>
+  </data>
   <data name="MSG_Title_CannotOpenLink" xml:space="preserve">
     <value>하이퍼링크를 열 수 없음</value>
   </data>

diff --git a/SCTools/SCTool_Redesigned/Properties/Resources.resx b/SCTools/SCTool_Redesigned/Properties/Resources.resx
@@ -187,6 +187,12 @@
   <data name="MSG_Decs_SelectLocalization" xml:space="preserve">
     <value>Please select the localization to apply to the game.</value>
   </data>
+  <data name="MSG_Desc_Disable" xml:space="preserve">
+    <value>Localization disabled.</value>
+  </data>
+  <data name="MSG_Desc_Enable" xml:space="preserve">
+    <value>Localization enabled.</value>
+  </data>
   <data name="MSG_Desc_InstallWarning" xml:space="preserve">
     <value>Dear friend,
 We are happy to see the interest to our project.
@@ -201,6 +207,9 @@ By clicking "Yes", you confirm that you have read and understood the warning and
   <data name="MSG_Desc_InvalidAccess" xml:space="preserve">
     <value>Invalid Access</value>
   </data>
+  <data name="MSG_Desc_Uninstall" xml:space="preserve">
+    <value>Localization removed successful</value>
+  </data>
   <data name="MSG_Title_CannotOpenLink" xml:space="preserve">
     <value>Could't open hyperlink</value>
   </data>

diff --git a/SCTools/SCTool_Redesigned/Windows/MainWindow.xaml.cs b/SCTools/SCTool_Redesigned/Windows/MainWindow.xaml.cs
@@ -101,7 +101,7 @@ public int Phase
                                 Properties.Resources.MSG_Title_GeneralError, MessageBoxButton.OK, MessageBoxImage.Error);
                             return;
                         }
-                        if (!App.Settings.AcceptInstallWarning)
+                        if (value == 6 && !App.Settings.AcceptInstallWarning)
                         {
                             var dialogResult = MessageBox.Show(Properties.Resources.MSG_Desc_InstallWarning,
                                 Properties.Resources.MSG_Title_GeneralWarning, MessageBoxButton.YesNo,
@@ -357,7 +357,7 @@ private void UninstallBtn_Click(object sender, RoutedEventArgs e)
         {
             _installmode = InstallerMode.uninstall;
             Phase = 6;
-            MessageBox.Show("패치 제거 완료");    //왜인진 몰라도 이거 빼면 frame_all content가 안 비워짐....
+            MessageBox.Show(Properties.Resources.MSG_Desc_Uninstall);    //왜인진 몰라도 이거 빼면 frame_all content가 안 비워짐....
             Phase = 3;
         }
 
@@ -366,9 +366,9 @@ private void DisableBtn_Click(object sender, RoutedEventArgs e)
             _installmode = InstallerMode.disable;
             Phase = 6;
             if (RepositoryManager.TargetInstallation.IsEnabled)
-                MessageBox.Show("패치 활성화 완료");
+                MessageBox.Show(Properties.Resources.MSG_Desc_Enable);
             else
-                MessageBox.Show("패치 비활성화 완료");
+                MessageBox.Show(Properties.Resources.MSG_Desc_Disable);
             Phase = 3;
         }