Cleanups + version 2.5

Author: salarcode

AutoResxTranslator/Properties/AssemblyInfo.cs

@@ -17,7 +17,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Salar Khalilzadeh")]
 [assembly: AssemblyProduct("AutoResxTranslator")]
-[assembly: AssemblyCopyright("Copyright © Salar Khalilzadeh 2021")]
+[assembly: AssemblyCopyright("Copyright © Salar Khalilzadeh 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("b7bafe70-b0e7-494a-aa38-49b8eee414f1")]
 
-[assembly: AssemblyVersion("2.4.0.0")]
-[assembly: AssemblyFileVersion("2.4.0.0")]
+[assembly: AssemblyVersion("2.5.0.0")]
+[assembly: AssemblyFileVersion("2.5.0.0")]

AutoResxTranslator/frmMain.cs

@@ -19,7 +19,7 @@
 
 namespace AutoResxTranslator
 {
-    public partial class frmMain : Form
+	public partial class frmMain : Form
 	{
 		public frmMain()
 		{
@@ -258,7 +258,7 @@ void TranslateResxFiles()
 			};
 
 			IsBusy(true);
-			new Action<string, string, TranslationOptions, List<string>, string, ResxProgressCallback, bool, bool>(TranslateResxFilesAsync).BeginInvoke(
+			new Action<string, string, TranslationOptions, List<string>, string, ResxProgressCallback, bool, bool, bool, string>(TranslateResxFilesAsync).BeginInvoke(
 				txtSourceResx.Text,
 				srcLng,
 				translationOptions,
@@ -267,6 +267,8 @@ void TranslateResxFiles()
 				ResxWorkingProgress,
 				translateFromKey,
 				checkBoxTranslateOnlyNew.Checked,
+				chkCSVOutput.Checked,
+				txtCSVOutputDir.Text,
 				(x) => IsBusy(false),
 				null);
 		}
@@ -280,7 +282,9 @@ async void TranslateResxFilesAsync(
 			List<string> desLanguages, string destDir,
 			ResxProgressCallback progress,
 			bool translateFromKey,
-			bool translateOnlyNewKeys)
+			bool translateOnlyNewKeys,
+			bool generateCsv,
+			string generateCsvDir)
 		{
 			int max = 0;
 			int pos = 0;
@@ -300,7 +304,10 @@ async void TranslateResxFilesAsync(
 				var dataList = ResxTranslator.ReadResxData(doc);
 				max = dataList.Count;
 
-				string[] CSVOutputArray = new string[max];
+				string[] csvOutputDataBuffer = null;
+				if (generateCsv)
+					csvOutputDataBuffer = new string[max];
+
 				List<XmlNode> destinationDataList = null;
 				var destTranslateOnlyNewKeys =
 						translateOnlyNewKeys &&
@@ -339,8 +346,8 @@ async void TranslateResxFilesAsync(
 							if (destNode == keyNode)
 							{
 								valueNode.InnerText = ResxTranslator.GetDataValueNode(destinationDataList.ElementAt(destIndex)).InnerText;
-								if (chkCSVOutput.Checked)
-									CSVOutputArray[index] = keyNode + "," + valueNode.InnerText;
+								if (generateCsv)
+									csvOutputDataBuffer[index] = keyNode + "," + valueNode.InnerText;
 								continue;
 							}
 							else
@@ -420,20 +427,23 @@ async void TranslateResxFilesAsync(
 								catch { }
 							}
 						}
-						if (chkCSVOutput.Checked)
-							CSVOutputArray[index]= keyNode + "," + valueNode.InnerText;
+						if (generateCsv)
+							csvOutputDataBuffer[index] = keyNode + "," + valueNode.InnerText;
 					}
 				}
 				finally
 				{
-					// now save that shit!
+					// now save the data!
 					doc.Save(destFile);
-					if (chkCSVOutput.Checked)
+
+					if (generateCsv)
 					{
-						if (!Directory.Exists(txtCSVOutputDir.Text))
-							Directory.CreateDirectory(txtCSVOutputDir.Text);
-						File.WriteAllLines(txtCSVOutputDir.Text  + "\\" + sourceResxFilename + "." + destLng + ".resx.csv", new string[] { "KEY,Value" }, System.Text.Encoding.UTF8);
-						File.AppendAllLines(txtCSVOutputDir.Text + "\\" + sourceResxFilename + "." + destLng + ".resx.csv", CSVOutputArray, System.Text.Encoding.UTF8);              
+						if (!Directory.Exists(generateCsvDir))
+							Directory.CreateDirectory(generateCsvDir);
+						var csvFile = Path.Combine(generateCsvDir, sourceResxFilename + "." + destLng + ".resx.csv");
+
+						File.WriteAllLines(csvFile, new string[] { "KEY,Value" }, Encoding.UTF8);
+						File.AppendAllLines(csvFile, csvOutputDataBuffer, Encoding.UTF8);
 					}
 				}
 			}
@@ -795,15 +805,18 @@ private void RbtnMsTranslateService_CheckedChanged(object sender, EventArgs e)
 			txtMsTranslationRegion.Enabled = rbtnMsTranslateService.Checked;
 		}
 
-        private void chkCSVOutput_CheckedChanged(object sender, EventArgs e)
-        {
+		private void chkCSVOutput_CheckedChanged(object sender, EventArgs e)
+		{
 			txtCSVOutputDir.Enabled = btnSelectCSVOutputDir.Enabled = chkCSVOutput.Checked;
-        }
+		}
 
-        private void btnSelectCSVOutputDir_Click(object sender, EventArgs e)
-        {
-			var dlg = new FolderBrowserDialog();
-			dlg.ShowNewFolderButton = true;
+		private void btnSelectCSVOutputDir_Click(object sender, EventArgs e)
+		{
+			var dlg = new FolderBrowserDialog
+			{
+				ShowNewFolderButton = true,
+				Description = "Please select output directory for CSV files:"
+			};
 			if (txtCSVOutputDir.Text.Length > 0)
 			{
 				dlg.SelectedPath = txtCSVOutputDir.Text;
@@ -813,5 +826,5 @@ private void btnSelectCSVOutputDir_Click(object sender, EventArgs e)
 				txtCSVOutputDir.Text = dlg.SelectedPath;
 			}
 		}
-    }
+	}
 }