Merge remote-tracking branch 'ivan-github/bug/3657_display-correct-service-name-in-wizard' into develop

2 files changed, 14 insertions, 6 deletions

diff --git a/src/leap/bitmask/config/providerconfig.py b/src/leap/bitmask/config/providerconfig.py
index c65932be..a7808399 100644
--- a/src/leap/bitmask/config/providerconfig.py
+++ b/src/leap/bitmask/config/providerconfig.py
@@ -24,6 +24,7 @@ import os
 from leap.bitmask.config.provider_spec import leap_provider_spec
 from leap.common.check import leap_check
 from leap.common.config.baseconfig import BaseConfig, LocalizedKey
+from leap.bitmask.services import get_service_display_name
 
 logger = logging.getLogger(__name__)
 
@@ -130,9 +131,11 @@ class ProviderConfig(BaseConfig):
         Returns a string with the available services in the current
         provider, ready to be shown to the user.
         """
-        services_str = ", ".join(self.get_services())
-        services_str = services_str.replace(
-            "openvpn", "Encrypted Internet")
+        services = []
+        for service in self.get_services():
+            services.append(get_service_display_name(service))
+
+        services_str = ", ".join(services)
         return services_str
 
     def get_ca_cert_path(self, about_to_download=False):
@@ -216,3 +219,4 @@ if __name__ == "__main__":
         print provider.get_languages()
         print provider.get_name()
         print provider.get_services()
+        print provider.get_services_string()
diff --git a/src/leap/bitmask/services/__init__.py b/src/leap/bitmask/services/__init__.py
index 924ca547..339f9cc6 100644
--- a/src/leap/bitmask/services/__init__.py
+++ b/src/leap/bitmask/services/__init__.py
@@ -26,6 +26,8 @@ DEPLOYED = ["openvpn", "mx"]
 def get_service_display_name(service, standalone=False):
     """
     Returns the name to display of the given service.
+    If there is no configured name for that service, then returns the same
+    parameter
 
     :param service: the 'machine' service name
     :type service: str
@@ -42,8 +44,10 @@ def get_service_display_name(service, standalone=False):
     EIP_LABEL = _tr("Encrypted Internet")
     MX_LABEL = _tr("Encrypted Mail")
 
-    service_display = [EIP_LABEL, MX_LABEL]
-    service_config = ["openvpn", "mx"]
+    service_display = {
+        "openvpn": EIP_LABEL,
+        "mx": MX_LABEL
+    }
 
     # If we need to add a warning about eip needing
     # administrative permissions to start. That can be either
@@ -52,7 +56,7 @@ def get_service_display_name(service, standalone=False):
     if standalone or is_missing_policy_permissions():
         EIP_LABEL += " " + _tr("(will need admin password to start)")
 
-    return service_display[service_config.index(service)]
+    return service_display.get(service, service)
 
 
 def get_supported(services):