[gedit-plugins/translate-server] Fixes

[Jordi Mas <jmas src gnome org>]

commit f0414cc3ae8d93eae51b3087026b5f4009066ee8
Author: Jordi Mas <jmas softcatala org>
Date:   Sat Oct 17 22:10:21 2020 +0200

    Fixes

 plugins/translate/translate/__init__.py          |  3 +--
 plugins/translate/translate/services/apertium.py | 12 ++----------
 2 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/plugins/translate/translate/__init__.py b/plugins/translate/translate/__init__.py
index e468add..cd69d88 100644
--- a/plugins/translate/translate/__init__.py
+++ b/plugins/translate/translate/__init__.py
@@ -45,8 +45,7 @@ def _get_translation_service_shared(service_id):
         service.set_api_key(key)
 
     if service_id == Services.APERTIUM_ID:
-        #server = settings.get_apertium_server()
-        server = 'https://www.apertium.com/apy'
+        server = settings.get_apertium_server()
         print("Init:" + server)
         service.set_server(server)
 
diff --git a/plugins/translate/translate/services/apertium.py 
b/plugins/translate/translate/services/apertium.py
index 6a6bcaf..3043b2d 100644
--- a/plugins/translate/translate/services/apertium.py
+++ b/plugins/translate/translate/services/apertium.py
@@ -39,7 +39,6 @@ class Apertium(Service):
             "eng|cat",
     ]
 
-    DEFAULT_SERVER = "https://www.apertium.org/apy";
 
     @staticmethod
     def _clean_for_ut():
@@ -63,18 +62,15 @@ class Apertium(Service):
         pass
 
     def init(self):
-        self.server = self.DEFAULT_SERVER
-        self.tried_fetched_names = False
+        self._fetch_remote_language_names_and_pairs()
    
     def get_language_names(self):
-        self._fetch_remote_language_names_and_pairs_once()
         if len(Apertium.g_language_codes) > 0 and len(Apertium.g_language_names) > 0:
             return Apertium.g_language_names
 
         return self.DEFAULT_LANGUAGE_NAMES
 
     def get_language_codes(self):
-        self._fetch_remote_language_names_and_pairs_once()
         if len(Apertium.g_language_codes) > 0 and len(Apertium.g_language_names) > 0:
             return Apertium.g_language_codes
 
@@ -107,8 +103,6 @@ class Apertium(Service):
         return language_name
 
     def get_language_pair_name(self, source, target, locales_names=None):
-        self._fetch_remote_language_names_and_pairs_once()
-
         if locales_names is None:
             locales_names = Apertium.g_locales_names
 
@@ -134,11 +128,9 @@ class Apertium(Service):
 
     def _fetch_remote_language_names_and_pairs_once(self):
 
-        if self.tried_fetched_names:
+        if len(Apertium.g_language_names) > 0:
             return
 
-        self.tried_fetched_names = True
-
         try:
             language_names = []
             en_names_requested = False