IsAppropriateForTranslate method obselete, CanBeTranslated implemented.

DynamicTranslator · Jul 16, 2016 · d37b2d1 · d37b2d1
1 parent 9149c2d
commit d37b2d1
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 13 deletions.
diff --git a/src/DynamicTranslator.Bing/BingTranslatorFinder.cs b/src/DynamicTranslator.Bing/BingTranslatorFinder.cs
@@ -35,7 +35,7 @@ public class BingTranslatorFinder : IMeanFinder
 
         public async Task<TranslateResult> Find(TranslateRequest translateRequest)
         {
-            if (!bingConfiguration.IsAppropriateForTranslation(translateRequest.FromLanguageExtension))
+            if (!bingConfiguration.CanBeTranslated())
                 return new TranslateResult(false, new Maybe<string>());
 
             var requestObject = new

diff --git a/src/DynamicTranslator.Bing/DynamicTranslatorBingModule.cs b/src/DynamicTranslator.Bing/DynamicTranslatorBingModule.cs
@@ -1,13 +1,15 @@
 using System.Reflection;
 
 using Abp.Dependency;
+using Abp.Modules;
 
 using DynamicTranslator.Application;
 using DynamicTranslator.Bing.Configuration;
 using DynamicTranslator.LanguageManagement;
 
 namespace DynamicTranslator.Bing
 {
+    [DependsOn(typeof(DynamicTranslatorApplicationModule))]
     public class DynamicTranslatorBingModule : DynamicTranslatorModule
     {
         public override void Initialize()

diff --git a/src/DynamicTranslator.Google/DynamicTranslatorGoogleModule.cs b/src/DynamicTranslator.Google/DynamicTranslatorGoogleModule.cs
@@ -1,13 +1,15 @@
 using System.Reflection;
 
 using Abp.Dependency;
+using Abp.Modules;
 
 using DynamicTranslator.Application;
 using DynamicTranslator.Google.Configuration;
 using DynamicTranslator.LanguageManagement;
 
 namespace DynamicTranslator.Google
 {
+    [DependsOn(typeof(DynamicTranslatorApplicationModule))]
     public class DynamicTranslatorGoogleModule : DynamicTranslatorModule
     {
         private const string GoogleTranslateUrl = "https://translate.googleapis.com/translate_a/single?client=gtx&sl=auto&tl={0}&hl={1}&dt=t&dt=bd&dj=1&source=bubble&q={2}";

diff --git a/src/DynamicTranslator.Google/GoogleTranslateFinder.cs b/src/DynamicTranslator.Google/GoogleTranslateFinder.cs
@@ -34,7 +34,7 @@ public class GoogleTranslateFinder : IMeanFinder
 
         public async Task<TranslateResult> Find(TranslateRequest translateRequest)
         {
-            if (!googleConfiguration.IsAppropriateForTranslation(translateRequest.FromLanguageExtension))
+            if (!googleConfiguration.CanBeTranslated())
                 return new TranslateResult(false, new Maybe<string>());
 
             var uri = string.Format(

diff --git a/src/DynamicTranslator.SesliSozluk/DynamicTranslatorSesliSozlukModule.cs b/src/DynamicTranslator.SesliSozluk/DynamicTranslatorSesliSozlukModule.cs
@@ -1,13 +1,15 @@
 using System.Reflection;
 
 using Abp.Dependency;
+using Abp.Modules;
 
 using DynamicTranslator.Application;
 using DynamicTranslator.LanguageManagement;
 using DynamicTranslator.SesliSozluk.Configuration;
 
 namespace DynamicTranslator.SesliSozluk
 {
+    [DependsOn(typeof(DynamicTranslatorApplicationModule))]
     public class DynamicTranslatorSesliSozlukModule : DynamicTranslatorModule
     {
         public override void Initialize()

diff --git a/src/DynamicTranslator.SesliSozluk/SesliSozlukFinder.cs b/src/DynamicTranslator.SesliSozluk/SesliSozlukFinder.cs
@@ -37,7 +37,7 @@ public class SesliSozlukFinder : IMeanFinder
 
         public async Task<TranslateResult> Find(TranslateRequest translateRequest)
         {
-            if (!sesliSozlukConfiguration.IsAppropriateForTranslation(translateRequest.FromLanguageExtension))
+            if (!sesliSozlukConfiguration.CanBeTranslated())
                 return new TranslateResult(false, new Maybe<string>());
 
             var parameter =

diff --git a/src/DynamicTranslator.Tureng/Configuration/TurengTranslatorConfiguration.cs b/src/DynamicTranslator.Tureng/Configuration/TurengTranslatorConfiguration.cs
@@ -8,9 +8,9 @@ namespace DynamicTranslator.Tureng.Configuration
 {
     public class TurengTranslatorConfiguration : AbstractTranslatorConfiguration, ITurengTranslatorConfiguration
     {
-        public override bool IsAppropriateForTranslation(string fromLanguageExtension)
+        public override bool CanBeTranslated()
         {
-            return base.IsAppropriateForTranslation(fromLanguageExtension) && ApplicationConfiguration.IsToLanguageTurkish;
+            return base.CanBeTranslated() && ApplicationConfiguration.IsToLanguageTurkish;
         }
 
         public override IList<Language> SupportedLanguages { get; set; }

diff --git a/src/DynamicTranslator.Tureng/DynamicTranslatorTurengModule.cs b/src/DynamicTranslator.Tureng/DynamicTranslatorTurengModule.cs
@@ -1,13 +1,15 @@
 using System.Reflection;
 
 using Abp.Dependency;
+using Abp.Modules;
 
 using DynamicTranslator.Application;
 using DynamicTranslator.LanguageManagement;
 using DynamicTranslator.Tureng.Configuration;
 
 namespace DynamicTranslator.Tureng
 {
+    [DependsOn(typeof(DynamicTranslatorApplicationModule))]
     public class DynamicTranslatorTurengModule : DynamicTranslatorModule
     {
         public override void Initialize()

diff --git a/src/DynamicTranslator.Tureng/TurengFinder.cs b/src/DynamicTranslator.Tureng/TurengFinder.cs
@@ -29,7 +29,7 @@ public TurengFinder(IMeanOrganizerFactory meanOrganizerFactory, ITurengTranslato
 
         public async Task<TranslateResult> Find(TranslateRequest translateRequest)
         {
-            if (!turengConfiguration.IsAppropriateForTranslation(translateRequest.FromLanguageExtension))
+            if (!turengConfiguration.CanBeTranslated())
                 return new TranslateResult(false, new Maybe<string>());
 
             var uri = new Uri(turengConfiguration.Url + translateRequest.CurrentText);

diff --git a/src/DynamicTranslator.Wpf/DynamicTranslatorWpfModule.cs b/src/DynamicTranslator.Wpf/DynamicTranslatorWpfModule.cs
@@ -2,7 +2,6 @@
 
 using Abp.Modules;
 
-using DynamicTranslator.Application;
 using DynamicTranslator.Bing;
 using DynamicTranslator.Google;
 using DynamicTranslator.SesliSozluk;
@@ -11,7 +10,7 @@
 
 namespace DynamicTranslator.Wpf
 {
-    [DependsOn(typeof(DynamicTranslatorApplicationModule),
+    [DependsOn(
         typeof(DynamicTranslatorGoogleModule),
         typeof(DynamicTranslatorYandexModule),
         typeof(DynamicTranslatorBingModule),

diff --git a/src/DynamicTranslator.Yandex/DynamicTranslatorYandexModule.cs b/src/DynamicTranslator.Yandex/DynamicTranslatorYandexModule.cs
@@ -1,13 +1,15 @@
 using System.Reflection;
 
 using Abp.Dependency;
+using Abp.Modules;
 
 using DynamicTranslator.Application;
 using DynamicTranslator.LanguageManagement;
 using DynamicTranslator.Yandex.Configuration;
 
 namespace DynamicTranslator.Yandex
 {
+    [DependsOn(typeof(DynamicTranslatorApplicationModule))]
     public class DynamicTranslatorYandexModule : DynamicTranslatorModule
     {
         private const string Url = "https://translate.yandex.net/api/v1.5/tr/translate?";

diff --git a/src/DynamicTranslator.Yandex/YandexFinder.cs b/src/DynamicTranslator.Yandex/YandexFinder.cs
@@ -28,7 +28,7 @@ public YandexFinder(IYandexTranslatorConfiguration configuration, IMeanOrganizer
 
         public async Task<TranslateResult> Find(TranslateRequest translateRequest)
         {
-            if (!configuration.IsAppropriateForTranslation(translateRequest.FromLanguageExtension))
+            if (!configuration.CanBeTranslated())
                 return new TranslateResult(false, new Maybe<string>());
 
             var address = new Uri(

diff --git a/src/DynamicTranslator.Zargan/DynamicTranslatorZarganModule.cs b/src/DynamicTranslator.Zargan/DynamicTranslatorZarganModule.cs
@@ -1,13 +1,15 @@
 using System.Reflection;
 
 using Abp.Dependency;
+using Abp.Modules;
 
 using DynamicTranslator.Application;
 using DynamicTranslator.LanguageManagement;
 using DynamicTranslator.Zargan.Configuration;
 
 namespace DynamicTranslator.Zargan
 {
+    [DependsOn(typeof(DynamicTranslatorApplicationModule))]
     public class DynamicTranslatorZarganModule : DynamicTranslatorModule
     {
         public override void Initialize()

diff --git a/src/DynamicTranslator.Zargan/ZarganFinder.cs b/src/DynamicTranslator.Zargan/ZarganFinder.cs
@@ -26,7 +26,7 @@ public ZarganFinder(IZarganTranslatorConfiguration configuration, IMeanOrganizer
 
         public async Task<TranslateResult> Find(TranslateRequest translateRequest)
         {
-            if (!configuration.IsAppropriateForTranslation(translateRequest.FromLanguageExtension))
+            if (!configuration.CanBeTranslated())
                 return new TranslateResult(false, new Maybe<string>());
 
             var uri = string.Format(configuration.Url, HttpUtility.UrlEncode(translateRequest.CurrentText, Encoding.UTF8));

diff --git a/src/DynamicTranslator/Configuration/Startup/AbstractTranslatorConfiguration.cs b/src/DynamicTranslator/Configuration/Startup/AbstractTranslatorConfiguration.cs
@@ -15,9 +15,9 @@ public abstract class AbstractTranslatorConfiguration : ITranslatorConfiguration
 
         public IApplicationConfiguration ApplicationConfiguration { get; set; }
 
-        public virtual bool IsAppropriateForTranslation(string fromLanguageExtension)
+        public virtual bool CanBeTranslated()
         {
-            return SupportedLanguages.Any(x => x.Extension == fromLanguageExtension)
+            return SupportedLanguages.Any(x => x.Extension == ApplicationConfiguration.ToLanguage.Extension)
                    && ActiveTranslatorConfiguration.ActiveTranslators
                                                    .Any(x => x.Type == TranslatorType
                                                              && x.IsActive

diff --git a/src/DynamicTranslator/Configuration/Startup/ITranslatorConfiguration.cs b/src/DynamicTranslator/Configuration/Startup/ITranslatorConfiguration.cs
@@ -6,6 +6,6 @@ public interface ITranslatorConfiguration : IMustHaveUrl, IMustHaveSupportedLang
     {
         TranslatorType TranslatorType { get; }
 
-        bool IsAppropriateForTranslation(string fromLanguageExtension);
+        bool CanBeTranslated();
     }
 }