From e36e5ea89c4da9a9498d387c40dc195eb283c7f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Thu, 23 Apr 2020 22:00:08 +0200
Subject: [PATCH] Improve label

---
 data/other/ldap_scheme.yml                          |  2 +-
 .../0015_extends_permissions_features_1.py          | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/data/other/ldap_scheme.yml b/data/other/ldap_scheme.yml
index 8fdded8ac..aa2b46ad3 100644
--- a/data/other/ldap_scheme.yml
+++ b/data/other/ldap_scheme.yml
@@ -74,7 +74,7 @@ depends_children:
         groupPermission:
             - "cn=all_users,ou=groups,dc=yunohost,dc=org"
         authHeader: "FALSE"
-        label: "Mail"
+        label: "E-mail"
         showTile: "FALSE"
         isProtected: "TRUE"
     cn=xmpp.main,ou=permission:
diff --git a/src/yunohost/data_migrations/0015_extends_permissions_features_1.py b/src/yunohost/data_migrations/0015_extends_permissions_features_1.py
index d11d4f136..9bbe8baeb 100644
--- a/src/yunohost/data_migrations/0015_extends_permissions_features_1.py
+++ b/src/yunohost/data_migrations/0015_extends_permissions_features_1.py
@@ -43,15 +43,22 @@ class MyMigration(Migration):
             app_setting(app, 'label', delete=True)
 
         for permission in permission_list:
-            if permission.split('.')[0] in SYSTEM_PERMS:
+            if permission.split('.')[0] == 'mail':
                 ldap.update('cn=%s,ou=permission' % permission, {
                     'authHeader': ["FALSE"],
-                    'label': [permission.split('.')[0].title()],
+                    'label': 'E-mail',
+                    'showTile': ["FALSE"],
+                    'isProtected': ["TRUE"],
+                })
+            elif permission.split('.')[0] == 'xmpp':
+                ldap.update('cn=%s,ou=permission' % permission, {
+                    'authHeader': ["FALSE"],
+                    'label': 'XMPP',
                     'showTile': ["FALSE"],
                     'isProtected': ["TRUE"],
                 })
             else:
-                label = labels[permission.split('.')[0]]
+                label = labels[permission.split('.')[0]].title()
 
                 if permission.endswith(".main"):
                     ldap.update('cn=%s,ou=permission' % permission, {