fear ..dll

This commit is contained in:
Paul Schneider 2019-12-10 09:16:17 +00:00
commit c3a6d5ec7e
12 changed files with 16 additions and 76 deletions

View file

@ -25,7 +25,7 @@
"defaultNamespace": "Yavsc"
},
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"Newtonsoft.Json": "6.0.0",
"Gapi.net45": "1.0.1",
"RestSharp": "103.4.0"
},

View file

@ -26,7 +26,7 @@
"defaultNamespace": "Yavsc"
},
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"Newtonsoft.Json": "6.0.0",
"Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*",
"OAuth.AspNet.Token": {
"type": "build",
@ -38,4 +38,4 @@
"frameworkAssemblies": {}
}
}
}
}

View file

@ -26,7 +26,7 @@
"defaultNamespace": "Yavsc"
},
"dependencies": {
"Newtonsoft.Json": "9.0.1",
"Newtonsoft.Json": "6.0.0",
"Microsoft.AspNet.Authentication.JwtBearer": "1.0.0-rc1-final",
"Microsoft.AspNet.DataProtection": "1.0.0-rc1-final"
},
@ -35,4 +35,4 @@
"frameworkAssemblies": {}
}
}
}
}

View file

@ -28,7 +28,7 @@
"defaultNamespace": "Yavsc"
},
"dependencies": {
"Newtonsoft.Json": "9.0.1"
"Newtonsoft.Json": "6.0.0"
},
"frameworks": {
"dnx451": {

View file

@ -52,8 +52,6 @@
"Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final",
"Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc1-final",
"Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final",
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-rc1-final",
"Microsoft.Extensions.Localization.Abstractions": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging": "1.0.0-rc1-final",
@ -62,7 +60,7 @@
"Microsoft.Extensions.Logging.TraceSource": "1.0.0-rc1-final",
"Microsoft.Extensions.Options": "0.0.1-alpha",
"Microsoft.Extensions.Localization": "1.0.0-rc1-final",
"Newtonsoft.Json": "9.0.1",
"Newtonsoft.Json": "6.0.0",
"Gapi.net45": "1.0.1",
"PayPalMerchant-net451": "2.7.109",
"MailKit": "1.12.0",

View file

@ -10,8 +10,8 @@ BASERESX= Resources/Yavsc.Models.IT.Fixing.Resources.resx \
Resources/Yavsc.ViewModels.EnrolerViewModel.resx \
Resources/Yavsc.YavscLocalisation.resx
BASERESXGEN=$(BASERESX:.resx=.Designer.cs)
MCS_OPTIONS=--debug
MONO_OPTIONS=--debug
MCS_OPTIONS=-debug
MONO_OPTIONS="--debug"
include $(MAKEFILE_DIR)/versioning.mk
include $(MAKEFILE_DIR)/dnx.mk

View file

@ -1,60 +0,0 @@
using Yavsc.Server;
using GoogleTranslateNET;
using System;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.OptionsModel;
using Microsoft.AspNet.Localization;
using System.Linq;
namespace Yavsc.Services.GoogleApis
{
public class Translator : ITranslator
{
GoogleTranslate _gg;
ILogger _logger;
public Translator(ILoggerFactory loggerFactory,
IOptions<RequestLocalizationOptions> rqLocOptions,
IOptions<GoogleAuthSettings> gSettings)
{
_gg = new GoogleTranslate(gSettings.Value.ApiKey);
_logger = loggerFactory.CreateLogger<Translator>();
}
/// <summary>
///
/// </summary>
/// <param name="lang"></param>
/// <returns></returns>
static Language GetLanguageFromCountryCode(string lang)
{
switch (lang) {
case "fr":
case "fr-FR":
case "French":
return Language.French;
case "en":
case "en-GB":
case "en-US":
case "English":
return Language.English;
case "pt":
case "br":
return Language.Portuguese;
}
return Language.Automatic;
}
public string[] Translate(string slang, string dlang, string[] text)
{
var destinationLanguage = GetLanguageFromCountryCode(dlang);
if (destinationLanguage == Language.Unknown)
throw new Exception ("destinationLanguage == Language.Unknown");
var sourceLanguage = GetLanguageFromCountryCode(slang);
var gResult = _gg.Translate(sourceLanguage, destinationLanguage, text);
return gResult.Select(tr => tr.TranslatedText).ToArray();
}
}
}

View file

@ -150,8 +150,7 @@
"Yavsc.Server": {
"target": "project",
"type": "build"
},
"GoogleTranslate": "1.0.5"
}
},
"commands": {
"ef": "EntityFramework.Commands",

View file

@ -45,7 +45,7 @@
"Microsoft.Extensions.WebEncoders.Core": "1.0.0-rc1-final",
"Microsoft.Framework.Configuration.Json": "1.0.0-beta8",
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4",
"Newtonsoft.Json": "9.0.1",
"Newtonsoft.Json": "6.0.0",
"NJsonSchema.CodeGeneration.CSharp": "10.0.27",
"Yavsc": {
"version": "1.0.6-rc05",

View file

@ -29,7 +29,7 @@
"Microsoft.Extensions.Logging": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final",
"Newtonsoft.Json": "9.0.1"
"Newtonsoft.Json": "6.0.0"
},
"commands": {
"web": "Microsoft.AspNet.Server.Kestrel --server.urls=http://*:5002"

View file

@ -39,7 +39,7 @@
"EntityFramework.Commands": "7.0.0-rc1-final",
"EntityFramework7.Npgsql": "3.1.0-rc1-3",
"EntityFramework7.Npgsql.Design": "3.1.0-rc1-5",
"Newtonsoft.Json": "9.0.1",
"Newtonsoft.Json": "6.0.0",
"xunit": "2.1.0",
"xunit.analyzers": "0.9.0",
"xunit.assert": "2.1.0",