From c483e745d9848b39f328516b2b6c97c34d865622 Mon Sep 17 00:00:00 2001
From: morkt <muvluv.ru@gmail.com>
Date: Fri, 3 Feb 2017 08:53:34 +0400
Subject: [PATCH] (GUI): added string resources.

---
 GUI/FileErrorDialog.xaml            |  7 +++---
 GUI/GarExtract.cs                   | 20 +++-------------
 GUI/Strings/guiStrings.Designer.cs  | 36 +++++++++++++++++++++++++++++
 GUI/Strings/guiStrings.ko-KR.resx   | 18 ++++++++++++++-
 GUI/Strings/guiStrings.resx         | 12 ++++++++++
 GUI/Strings/guiStrings.ru-RU.resx   | 14 ++++++++++-
 GUI/Strings/guiStrings.zh-Hans.resx | 16 +++++++++++++
 7 files changed, 101 insertions(+), 22 deletions(-)

diff --git a/GUI/FileErrorDialog.xaml b/GUI/FileErrorDialog.xaml
index 89fd9dc9..bed67536 100644
--- a/GUI/FileErrorDialog.xaml
+++ b/GUI/FileErrorDialog.xaml
@@ -2,6 +2,7 @@
                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                xmlns:w="clr-namespace:Rnd.Windows"
+               xmlns:s="clr-namespace:GARbro.GUI.Strings"
                Title="{Binding Title}" ShowInTaskbar="False" WindowStartupLocation="CenterOwner"
                ResizeMode="NoResize" SizeToContent="WidthAndHeight" ShowActivated="True"
                Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
@@ -9,9 +10,9 @@
         <TextBox x:Name="ErrorText" Text="{Binding Text}" IsReadOnly="True" Background="Transparent" BorderThickness="0" Margin="10"/>
         <Separator/>
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
-            <CheckBox x:Name="IgnoreErrors" Content="_Ignore further errors" Margin="10" VerticalAlignment="Center"/>
-            <Button Content="_Continue" Margin="10" Width="75" Height="25" IsDefault="True" Click="ContinueButton_Click"/>
-            <Button Content="_Abort" Margin="10" Width="75" Height="25" IsCancel="True" Click="AbortButton_Click"/>
+            <CheckBox x:Name="IgnoreErrors" Content="{x:Static s:guiStrings.LabelIgnoreErrors}" Margin="10" VerticalAlignment="Center"/>
+            <Button Content="{x:Static s:guiStrings.ButtonContinue}" Margin="10" Width="75" Height="25" IsDefault="True" Click="ContinueButton_Click"/>
+            <Button Content="{x:Static s:guiStrings.ButtonAbort}" Margin="10" Width="75" Height="25" IsCancel="True" Click="AbortButton_Click"/>
         </StackPanel>
     </StackPanel>
     <Window.InputBindings>
diff --git a/GUI/GarExtract.cs b/GUI/GarExtract.cs
index 8d10048a..be5a0a10 100644
--- a/GUI/GarExtract.cs
+++ b/GUI/GarExtract.cs
@@ -2,7 +2,7 @@
 //! \date       Fri Jul 25 05:52:27 2014
 //! \brief      Extract archive frontend.
 //
-// Copyright (C) 2014-2015 by morkt
+// Copyright (C) 2014-2017 by morkt
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to
@@ -119,7 +119,6 @@ namespace GARbro.GUI
         private int                 m_skip_count;
         private bool                m_extract_in_progress = false;
         private ProgressDialog      m_progress_dialog;
-        private Exception           m_pending_error;
 
         public bool IsActive { get { return m_extract_in_progress; } }
 
@@ -270,7 +269,6 @@ namespace GARbro.GUI
                 m_progress_dialog.ProgressBarStyle = ProgressBarStyle.MarqueeProgressBar;
             }
             m_convert_audio = !m_skip_audio && Settings.Default.appConvertAudio;
-            m_pending_error = null;
             m_progress_dialog.DoWork += (s, e) => ExtractWorker (file_list);
             m_progress_dialog.RunWorkerCompleted += OnExtractComplete;
             m_progress_dialog.ShowDialog (m_main);
@@ -305,8 +303,7 @@ namespace GARbro.GUI
                 {
                     if (!m_ignore_errors)
                     {
-                        var error_text = string.Format ("{0}\n{1}\n{2}", "Failed to extract file",
-                                                        entry.Name, X.Message);
+                        var error_text = string.Format (guiStrings.TextErrorExtracting, entry.Name, X.Message);
                         if (!m_main.Dispatcher.Invoke (() => ShowErrorDialog (error_text)))
                             break;
                     }
@@ -416,7 +413,7 @@ namespace GARbro.GUI
 
         bool ShowErrorDialog (string error_text)
         {
-            var dialog = new FileErrorDialog ("File extraction error", error_text);
+            var dialog = new FileErrorDialog (guiStrings.TextExtractionError, error_text);
             var progress_dialog_hwnd = m_progress_dialog.GetWindowHandle(); 
             if (progress_dialog_hwnd != IntPtr.Zero)
             {
@@ -449,17 +446,6 @@ namespace GARbro.GUI
                 m_main.Dispatcher.Invoke (m_main.RefreshView);
             }
             m_main.SetStatusText (Localization.Format ("MsgExtractedFiles", m_extract_count));
-            if (null != m_pending_error)
-            {
-                if (m_pending_error is OperationCanceledException)
-                    m_main.SetStatusText (m_pending_error.Message);
-                else
-                {
-                    string message = string.Format (guiStrings.TextErrorExtracting,
-                                                    m_progress_dialog.Description, m_pending_error.Message);
-                    m_main.PopupError (message, guiStrings.MsgErrorExtracting);
-                }
-            }
             this.Dispose();
         }
         
diff --git a/GUI/Strings/guiStrings.Designer.cs b/GUI/Strings/guiStrings.Designer.cs
index 9bcca2f4..b03f1416 100644
--- a/GUI/Strings/guiStrings.Designer.cs
+++ b/GUI/Strings/guiStrings.Designer.cs
@@ -60,6 +60,15 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to _Abort.
+        /// </summary>
+        public static string ButtonAbort {
+            get {
+                return ResourceManager.GetString("ButtonAbort", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Cancel.
         /// </summary>
@@ -69,6 +78,15 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to _Continue.
+        /// </summary>
+        public static string ButtonContinue {
+            get {
+                return ResourceManager.GetString("ButtonContinue", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Convert.
         /// </summary>
@@ -384,6 +402,15 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to _Ignore further errors.
+        /// </summary>
+        public static string LabelIgnoreErrors {
+            get {
+                return ResourceManager.GetString("LabelIgnoreErrors", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Skip incovertible files..
         /// </summary>
@@ -965,6 +992,15 @@ namespace GARbro.GUI.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to File extraction error.
+        /// </summary>
+        public static string TextExtractionError {
+            get {
+                return ResourceManager.GetString("TextExtractionError", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Extract text.
         /// </summary>
diff --git a/GUI/Strings/guiStrings.ko-KR.resx b/GUI/Strings/guiStrings.ko-KR.resx
index f4b22c62..b3009ef5 100644
--- a/GUI/Strings/guiStrings.ko-KR.resx
+++ b/GUI/Strings/guiStrings.ko-KR.resx
@@ -458,4 +458,20 @@
   <data name="CtxMenuSelectByMask" xml:space="preserve">
     <value>마스크로 파일 선택...</value>
   </data>
-</root>
+  <data name="ButtonAbort" xml:space="preserve">
+    <value>Abort</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="ButtonContinue" xml:space="preserve">
+    <value>Continue</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="LabelIgnoreErrors" xml:space="preserve">
+    <value>Ignore further errors</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="TextExtractionError" xml:space="preserve">
+    <value>File extraction error</value>
+    <comment>translation pending</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/GUI/Strings/guiStrings.resx b/GUI/Strings/guiStrings.resx
index d2ad5db1..f08e7fab 100644
--- a/GUI/Strings/guiStrings.resx
+++ b/GUI/Strings/guiStrings.resx
@@ -462,4 +462,16 @@ Overwrite?</value>
   <data name="CtxMenuSelectByMask" xml:space="preserve">
     <value>Select files by mask...</value>
   </data>
+  <data name="ButtonAbort" xml:space="preserve">
+    <value>_Abort</value>
+  </data>
+  <data name="ButtonContinue" xml:space="preserve">
+    <value>_Continue</value>
+  </data>
+  <data name="LabelIgnoreErrors" xml:space="preserve">
+    <value>_Ignore further errors</value>
+  </data>
+  <data name="TextExtractionError" xml:space="preserve">
+    <value>File extraction error</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/GUI/Strings/guiStrings.ru-RU.resx b/GUI/Strings/guiStrings.ru-RU.resx
index 8650f6c1..83b3bed3 100644
--- a/GUI/Strings/guiStrings.ru-RU.resx
+++ b/GUI/Strings/guiStrings.ru-RU.resx
@@ -460,7 +460,7 @@
     <value>Выбрать файлы</value>
   </data>
   <data name="TextErrorExtracting" xml:space="preserve">
-    <value>Произошёл сбой во время извлечения файла
+    <value>Не удалось извлечь файл
 {0}
 {1}</value>
   </data>
@@ -483,4 +483,16 @@
   <data name="CtxMenuSelectByMask" xml:space="preserve">
     <value>Выбрать файлы по маске...</value>
   </data>
+  <data name="ButtonAbort" xml:space="preserve">
+    <value>Прервать</value>
+  </data>
+  <data name="ButtonContinue" xml:space="preserve">
+    <value>Продолжить</value>
+  </data>
+  <data name="LabelIgnoreErrors" xml:space="preserve">
+    <value>Игнорировать дальнейшие ошибки</value>
+  </data>
+  <data name="TextExtractionError" xml:space="preserve">
+    <value>Ошибка извлечения файла</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/GUI/Strings/guiStrings.zh-Hans.resx b/GUI/Strings/guiStrings.zh-Hans.resx
index f175744f..beefb52d 100644
--- a/GUI/Strings/guiStrings.zh-Hans.resx
+++ b/GUI/Strings/guiStrings.zh-Hans.resx
@@ -460,4 +460,20 @@
     <value>Select files by mask...</value>
     <comment>translation pending</comment>
   </data>
+  <data name="ButtonAbort" xml:space="preserve">
+    <value>Abort</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="ButtonContinue" xml:space="preserve">
+    <value>Continue</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="LabelIgnoreErrors" xml:space="preserve">
+    <value>Ignore further errors</value>
+    <comment>translation pending</comment>
+  </data>
+  <data name="TextExtractionError" xml:space="preserve">
+    <value>File extraction error</value>
+    <comment>translation pending</comment>
+  </data>
 </root>
\ No newline at end of file