mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/Kwoth/master' into dev

Browse Source
This commit is contained in:
appelemac 2016-06-17 17:05:31 +02:00
commit f6b25dffb7
1 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NadekoBot/Modules/Translator/Helpers/GoogleTranslator.cs
View File

@ -75,6 +75,7 @@ namespace NadekoBot.Modules.Translator.Helpers
this.TranslationTime = TimeSpan.Zero; this.TranslationTime = TimeSpan.Zero;
DateTime tmStart = DateTime.Now; DateTime tmStart = DateTime.Now;
string translation = string.Empty; string translation = string.Empty;
string text = string.Empty;
try try
{ {
@ -83,19 +84,15 @@ namespace NadekoBot.Modules.Translator.Helpers
GoogleTranslator.LanguageEnumToIdentifier(sourceLanguage), GoogleTranslator.LanguageEnumToIdentifier(sourceLanguage),
GoogleTranslator.LanguageEnumToIdentifier(targetLanguage), GoogleTranslator.LanguageEnumToIdentifier(targetLanguage),
HttpUtility.UrlEncode(sourceText)); HttpUtility.UrlEncode(sourceText));
string outputFile = Path.GetTempFileName();
using (WebClient wc = new WebClient()) using (WebClient wc = new WebClient())
{ {
wc.Headers.Add("user-agent", "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36"); wc.Headers.Add("user-agent", "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36");
wc.DownloadFile(url, outputFile); text = wc.DownloadString(url);
} }
// Get translated text // Get translated text
if (File.Exists(outputFile))
{
// Get phrase collection // Get phrase collection
string text = File.ReadAllText(outputFile); // string text = File.ReadAllText(outputFile);
int index = text.IndexOf(string.Format(",,\"{0}\"", GoogleTranslator.LanguageEnumToIdentifier(sourceLanguage))); int index = text.IndexOf(string.Format(",,\"{0}\"", GoogleTranslator.LanguageEnumToIdentifier(sourceLanguage)));
if (index == -1) if (index == -1)
{ {
@ -144,7 +141,6 @@ namespace NadekoBot.Modules.Translator.Helpers
this.TranslationSpeechUrl = string.Format("https://translate.googleapis.com/translate_tts?ie=UTF-8&q={0}&tl={1}&total=1&idx=0&textlen={2}&client=gtx", this.TranslationSpeechUrl = string.Format("https://translate.googleapis.com/translate_tts?ie=UTF-8&q={0}&tl={1}&total=1&idx=0&textlen={2}&client=gtx",
HttpUtility.UrlEncode(translation), GoogleTranslator.LanguageEnumToIdentifier(targetLanguage), translation.Length); HttpUtility.UrlEncode(translation), GoogleTranslator.LanguageEnumToIdentifier(targetLanguage), translation.Length);
} }
}
catch (Exception ex) catch (Exception ex)
{ {
this.Error = ex; this.Error = ex;