Merge remote-tracking branch 'ivan/feature/preferences-select-services' into develop

Conflicts:
	src/leap/bitmask/gui/mainwindow.py
	src/leap/bitmask/gui/preferenceswindow.py

1 files changed, 35 insertions, 0 deletions

diff --git a/src/leap/bitmask/services/__init__.py b/src/leap/bitmask/services/__init__.py
index 253359cd..924ca547 100644
--- a/src/leap/bitmask/services/__init__.py
+++ b/src/leap/bitmask/services/__init__.py
@@ -17,9 +17,44 @@
 """
 Services module.
 """
+from PySide import QtCore
+from leap.bitmask.util.privilege_policies import is_missing_policy_permissions
+
 DEPLOYED = ["openvpn", "mx"]
 
 
+def get_service_display_name(service, standalone=False):
+    """
+    Returns the name to display of the given service.
+
+    :param service: the 'machine' service name
+    :type service: str
+    :param standalone: True if the app is running in a standalone mode, used
+                       to display messages according that.
+    :type standalone: bool
+
+    :rtype: str
+    """
+    # qt translator method helper
+    _tr = QtCore.QObject().tr
+
+    # Correspondence for services and their name to display
+    EIP_LABEL = _tr("Encrypted Internet")
+    MX_LABEL = _tr("Encrypted Mail")
+
+    service_display = [EIP_LABEL, MX_LABEL]
+    service_config = ["openvpn", "mx"]
+
+    # If we need to add a warning about eip needing
+    # administrative permissions to start. That can be either
+    # because we are running in standalone mode, or because we could
+    # not find the needed privilege escalation mechanisms being operative.
+    if standalone or is_missing_policy_permissions():
+        EIP_LABEL += " " + _tr("(will need admin password to start)")
+
+    return service_display[service_config.index(service)]
+
+
 def get_supported(services):
     """
     Returns a list of the available services.