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

1 files changed, 7 insertions, 3 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()