From 491dbdcac47755f365b1ccc0c36b0e314083fc67 Mon Sep 17 00:00:00 2001 From: Nikolaj Olsson Date: Fri, 15 Jan 2021 19:43:05 +0100 Subject: [PATCH] v1.9 --- src/.vs/XmlContentTranslator/v16/.suo | Bin 0 -> 65024 bytes src/XmlContentTranslator/Main.Designer.cs | 11 ++++++----- src/XmlContentTranslator/Main.cs | 13 +++++++++---- .../Properties/AssemblyInfo.cs | 4 ++-- .../Properties/Resources.Designer.cs | 4 ++-- .../Properties/Settings.Designer.cs | 4 ++-- .../Translator/Formatting.cs | 2 +- .../XmlContentTranslator.csproj | 6 ++++-- src/XmlContentTranslator/app.config | 2 +- 9 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 src/.vs/XmlContentTranslator/v16/.suo diff --git a/src/.vs/XmlContentTranslator/v16/.suo b/src/.vs/XmlContentTranslator/v16/.suo new file mode 100644 index 0000000000000000000000000000000000000000..8bae89a5d825adc41ca4329499788d09d839302d GIT binary patch literal 65024 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 literal 0 HcmV?d00001 diff --git a/src/XmlContentTranslator/Main.Designer.cs b/src/XmlContentTranslator/Main.Designer.cs index 04426d4..f4f702a 100644 --- a/src/XmlContentTranslator/Main.Designer.cs +++ b/src/XmlContentTranslator/Main.Designer.cs @@ -90,19 +90,19 @@ private void InitializeComponent() this.translateViaGoogleToolStripMenuItem, this.setValueFromMasterToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(216, 48); + this.contextMenuStrip1.Size = new System.Drawing.Size(215, 48); // // translateViaGoogleToolStripMenuItem // this.translateViaGoogleToolStripMenuItem.Name = "translateViaGoogleToolStripMenuItem"; - this.translateViaGoogleToolStripMenuItem.Size = new System.Drawing.Size(215, 22); + this.translateViaGoogleToolStripMenuItem.Size = new System.Drawing.Size(214, 22); this.translateViaGoogleToolStripMenuItem.Text = "Translate via google"; this.translateViaGoogleToolStripMenuItem.Click += new System.EventHandler(this.translateViaGoogleToolStripMenuItem_Click); // // setValueFromMasterToolStripMenuItem // this.setValueFromMasterToolStripMenuItem.Name = "setValueFromMasterToolStripMenuItem"; - this.setValueFromMasterToolStripMenuItem.Size = new System.Drawing.Size(215, 22); + this.setValueFromMasterToolStripMenuItem.Size = new System.Drawing.Size(214, 22); this.setValueFromMasterToolStripMenuItem.Text = "Transfer value from master"; this.setValueFromMasterToolStripMenuItem.Click += new System.EventHandler(this.setValueFromMasterToolStripMenuItem_Click); // @@ -203,7 +203,7 @@ private void InitializeComponent() this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.googleTranslateSelectedLinesToolStripMenuItem}); this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20); + this.toolsToolStripMenuItem.Size = new System.Drawing.Size(46, 20); this.toolsToolStripMenuItem.Text = "&Tools"; // // googleTranslateSelectedLinesToolStripMenuItem @@ -332,10 +332,11 @@ private void InitializeComponent() this.MainMenuStrip = this.menuStrip1; this.MinimumSize = new System.Drawing.Size(820, 350); this.Name = "Main"; - this.Text = "XML Content Translator 1.8"; + this.Text = "XML Content Translator 1.9"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1FormClosing); this.Load += new System.EventHandler(this.Form1Load); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form1KeyDown); + this.Resize += new System.EventHandler(this.Main_Resize); this.contextMenuStrip1.ResumeLayout(false); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); diff --git a/src/XmlContentTranslator/Main.cs b/src/XmlContentTranslator/Main.cs index ee27ad5..3c8a02f 100644 --- a/src/XmlContentTranslator/Main.cs +++ b/src/XmlContentTranslator/Main.cs @@ -554,11 +554,11 @@ public static string TranslateTextViaScreenScraping(string input, string languag input = input.Replace("'", "'"); //string url = String.Format("https://www.google.com/translate_t?hl=en&ie=UTF8&text={0}&langpair={1}", HttpUtility.UrlEncode(input), languagePair); - string url = String.Format("https://translate.google.com/?hl=en&eotf=1&sl={0}&tl={1}&q={2}", languagePair.Substring(0, 2), languagePair.Substring(3), HttpUtility.UrlEncode(input)); + var url = $"https://translate.google.com/?hl=en&eotf=1&sl={languagePair.Substring(0, 2)}&tl={languagePair.Substring(3)}&q={HttpUtility.UrlEncode(input)}"; var webClient = new WebClient { Encoding = Encoding.Default }; - string result = webClient.DownloadString(url); - int startIndex = result.IndexOf(" 0) { @@ -577,7 +577,7 @@ public static string TranslateTextViaScreenScraping(string input, string languag } } } - string res = sb.ToString(); + var res = sb.ToString(); res = res.Replace("
", Environment.NewLine); res = res.Replace("
", Environment.NewLine); res = res.Replace("< BR />", Environment.NewLine); @@ -615,6 +615,7 @@ private void GoogleTranslateSelectedLines() foreach (ListViewItem item in listViewLanguageTags.SelectedItems) { oldText = item.SubItems[1].Text; + oldText = string.Join(Environment.NewLine, oldText.SplitToLines()); oldLines.Add(oldText); var urlEncode = HttpUtility.UrlEncode(sb + newText); if (urlEncode.Length >= 1000) @@ -1016,5 +1017,9 @@ private void listViewLanguageTags_DoubleClick(object sender, EventArgs e) } } + private void Main_Resize(object sender, EventArgs e) + { + listViewLanguageTags.Columns[listViewLanguageTags.Columns.Count - 1].Width = -2; + } } } \ No newline at end of file diff --git a/src/XmlContentTranslator/Properties/AssemblyInfo.cs b/src/XmlContentTranslator/Properties/AssemblyInfo.cs index d6e45d2..80fc04b 100644 --- a/src/XmlContentTranslator/Properties/AssemblyInfo.cs +++ b/src/XmlContentTranslator/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 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("1.7.0.0")] -[assembly: AssemblyFileVersion("1.7.0.0")] +[assembly: AssemblyVersion("1.9.0.0")] +[assembly: AssemblyFileVersion("1.9.0.0")] diff --git a/src/XmlContentTranslator/Properties/Resources.Designer.cs b/src/XmlContentTranslator/Properties/Resources.Designer.cs index 28e5b20..b228607 100644 --- a/src/XmlContentTranslator/Properties/Resources.Designer.cs +++ b/src/XmlContentTranslator/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace XmlContentTranslator.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/XmlContentTranslator/Properties/Settings.Designer.cs b/src/XmlContentTranslator/Properties/Settings.Designer.cs index 8879cd0..1248709 100644 --- a/src/XmlContentTranslator/Properties/Settings.Designer.cs +++ b/src/XmlContentTranslator/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace XmlContentTranslator.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/XmlContentTranslator/Translator/Formatting.cs b/src/XmlContentTranslator/Translator/Formatting.cs index 51422cd..d630ad4 100644 --- a/src/XmlContentTranslator/Translator/Formatting.cs +++ b/src/XmlContentTranslator/Translator/Formatting.cs @@ -49,7 +49,7 @@ public string SetTagsAndReturnTrimmed(string text, string source) char.IsLetterOrDigit(lines[0][lines[0].Length - 1]) && char.IsLower(lines[1][0])) { - text = text.Replace(Environment.NewLine, " ").Replace(" ", " "); + text = string.Join(" ", text.SplitToLines()).Replace(" ", " "); AutoBreak = true; } } diff --git a/src/XmlContentTranslator/XmlContentTranslator.csproj b/src/XmlContentTranslator/XmlContentTranslator.csproj index e1cc092..676a8db 100644 --- a/src/XmlContentTranslator/XmlContentTranslator.csproj +++ b/src/XmlContentTranslator/XmlContentTranslator.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties XmlContentTranslator XmlContentTranslator - v4.0 + v4.6.2 512 Web_XML.ico @@ -28,6 +28,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -36,6 +37,7 @@ TRACE prompt 4 + false diff --git a/src/XmlContentTranslator/app.config b/src/XmlContentTranslator/app.config index fcd0c93..2a0024f 100644 --- a/src/XmlContentTranslator/app.config +++ b/src/XmlContentTranslator/app.config @@ -1,3 +1,3 @@ - +