[gedit-plugins] Several small fixes

[Jordi Mas <jmas src gnome org>]

commit be3f71149d976997ca87f9278da67055978bf006
Author: Jordi Mas <jmas softcatala org>
Date:   Sat Mar 10 07:08:42 2018 +0100

    Several small fixes

 plugins/translate/translate/__init__.py          |    5 ++---
 plugins/translate/translate/services/apertium.py |    6 +++---
 plugins/translate/translate/services/yandex.py   |   11 +++++++----
 3 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/plugins/translate/translate/__init__.py b/plugins/translate/translate/__init__.py
index 57bd51b..066e1c9 100644
--- a/plugins/translate/translate/__init__.py
+++ b/plugins/translate/translate/__init__.py
@@ -91,9 +91,8 @@ class TranslateWindowActivatable(GObject.Object, Gedit.WindowActivatable, PeasGt
         service_id = settings.get_service()
         return Services.get_name(service_id)
      
-    def _get_translation_service(self):
+    def _get_translation_service(self, service_id):
         settings = Settings()
-        service_id = settings.get_service()
         service = Services.get(service_id)
         if service.has_api_key() is True:
             key = settings.get_apikey()
@@ -103,7 +102,7 @@ class TranslateWindowActivatable(GObject.Object, Gedit.WindowActivatable, PeasGt
         return service
  
     def get_languages_names_codes(self, service_id):
-        service = self._get_translation_service()
+        service = self._get_translation_service(service_id)
         return service.get_language_names(), service.get_language_codes()
 
     def do_create_configure_widget(self):
diff --git a/plugins/translate/translate/services/apertium.py 
b/plugins/translate/translate/services/apertium.py
index c1a51f2..48d783e 100644
--- a/plugins/translate/translate/services/apertium.py
+++ b/plugins/translate/translate/services/apertium.py
@@ -60,7 +60,7 @@ class Apertium(Service):
         pass
 
     def init(self):
-        self._get_remote_language_names_and_pairs()
+        self._fetch_remote_language_names_and_pairs()
 
     def get_language_names(self):
         if len(Apertium.g_language_codes) > 0 and len(Apertium.g_language_names) > 0:
@@ -124,7 +124,7 @@ class Apertium(Service):
         return locales_names
 
 
-    def _get_remote_language_names_and_pairs(self):
+    def _fetch_remote_language_names_and_pairs(self):
         if len(Apertium.g_language_names) > 0:
             return
 
@@ -154,7 +154,7 @@ class Apertium(Service):
             Apertium.g_language_codes = language_codes
 
         except Exception as e:
-            print("_get_remote_language_names_and_pairs exception {0}".format(e))
+            print("_fetch_remote_language_names_and_pairs exception {0}".format(e))
 
 
     def _get_remote_language_pairs(self):
diff --git a/plugins/translate/translate/services/yandex.py b/plugins/translate/translate/services/yandex.py
index c907f35..ae4ee1c 100644
--- a/plugins/translate/translate/services/yandex.py
+++ b/plugins/translate/translate/services/yandex.py
@@ -71,7 +71,7 @@ class Yandex(Service):
         self._key = key
 
     def init(self):
-        self._get_remote_language_names()
+        self._fetch_remote_language_names()
 
     def get_language_names(self):
         if len(Yandex.g_language_codes) > 0 and len(Yandex.g_language_names) > 0:
@@ -96,9 +96,13 @@ class Yandex(Service):
     def _get_language_name(self, langcode, locales_names):
         return locales_names[langcode]
 
-    def _get_remote_language_names(self):
+    def _fetch_remote_language_names(self):
 
         try:
+
+            if len(self._key) == 0:
+                return
+
             url = "{0}/getLangs?ui=en&key={1}".format(self.SERVER, self._key)
             response = urllib.request.urlopen(url)
             payload = json.loads(response.read().decode("utf-8"))
@@ -120,8 +124,7 @@ class Yandex(Service):
             Yandex.g_language_codes = language_codes
 
         except Exception as e:
-            print("_get_remote_language_names exception {0}".format(e))
-
+            print("_fetch_remote_language_names exception {0}".format(e))
 
     def translate_text(self, text, language_pair):
         language_pair = language_pair.replace('|', '-')