v1.9

SubtitleEdit · Jan 15, 2021 · 491dbdc · 491dbdc
1 parent ff3c114
commit 491dbdc
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 19 deletions.
diff --git a/src/.vs/XmlContentTranslator/v16/.suo b/src/.vs/XmlContentTranslator/v16/.suo
diff --git a/src/XmlContentTranslator/Main.Designer.cs b/src/XmlContentTranslator/Main.Designer.cs
diff --git 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("'", "&apos;");
 
             //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("<span id=result_box", StringComparison.Ordinal);
+            var result = webClient.DownloadString(url);
+            var startIndex = result.IndexOf("<span id=result_box", StringComparison.Ordinal);
             var sb = new StringBuilder();
             if (startIndex > 0)
             {
@@ -577,7 +577,7 @@ public static string TranslateTextViaScreenScraping(string input, string languag
                     }
                 }
             }
-            string res = sb.ToString();
+            var res = sb.ToString();
             res = res.Replace("<BR/>", Environment.NewLine);
             res = res.Replace("<BR />", 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;
+        }
     }
 }
diff --git 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
diff --git a/src/XmlContentTranslator/Properties/Settings.Designer.cs b/src/XmlContentTranslator/Properties/Settings.Designer.cs
diff --git 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>XmlContentTranslator</RootNamespace>
     <AssemblyName>XmlContentTranslator</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ApplicationIcon>Web_XML.ico</ApplicationIcon>
     <FileUpgradeFlags>
@@ -28,6 +28,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -36,6 +37,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/src/XmlContentTranslator/app.config b/src/XmlContentTranslator/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>