diff options
| author | Kali Kaneko <kali@leap.se> | 2013-09-03 11:25:02 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-09-03 11:25:02 +0200 |
| commit | d7100189a3d572d0dbe20933d13f20b7decc2b68 (patch) | |
| tree | 93bffe1ff83586f2aed6d5e6a75dd5abad5e9f3e /src/leap/bitmask/config | |
| parent | ceeba60a8d37128d0609046089859d9a3d7dcfa3 (diff) | |
| parent | e4e79e29c01e6389d37d12ed72b0ba9f972d2ede (diff) | |
Merge remote-tracking branch 'ivan-github/bug/3657_display-correct-service-name-in-wizard' into develop
Diffstat (limited to 'src/leap/bitmask/config')
| -rw-r--r-- | src/leap/bitmask/config/providerconfig.py | 10 |
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() |