From 2156fb402b560058dca4ffec87e10b26e6dffdff Mon Sep 17 00:00:00 2001
From: Tagadda <36127788+Tagadda@users.noreply.github.com>
Date: Mon, 31 Jan 2022 00:57:00 +0000
Subject: [PATCH] settings migration

---
 locales/en.json                                  |  4 ++--
 .../0024_global_settings_to_configpanel.py       | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index e4e14772c..8be16738a 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -485,8 +485,8 @@
     "log_user_permission_reset": "Reset permission '{}'",
     "log_user_permission_update": "Update accesses for permission '{}'",
     "log_user_update": "Update info for user '{}'",
-    "log_settings_set": "Apply setting '{}'",
-    "log_settings_reset": "Reset setting '{}'",
+    "log_settings_set": "Apply settings",
+    "log_settings_reset": "Reset setting",
     "log_settings_reset_all": "Reset all setting",
     "mail_alias_remove_failed": "Could not remove e-mail alias '{mail}'",
     "mail_domain_unknown": "Invalid e-mail address for domain '{domain}'. Please, use a domain administrated by this server.",
diff --git a/src/migrations/0024_global_settings_to_configpanel.py b/src/migrations/0024_global_settings_to_configpanel.py
index b165b75b9..7283f168b 100644
--- a/src/migrations/0024_global_settings_to_configpanel.py
+++ b/src/migrations/0024_global_settings_to_configpanel.py
@@ -1,16 +1,16 @@
 import subprocess
 import time
+import urllib
 
 from yunohost.utils.error import YunohostError
 from moulinette.utils.log import getActionLogger
 
 from yunohost.tools import Migration
-from yunohost.utils.legacy import LEGACY_SETTINGS, translate_legacy_settings_to_configpanel_settings
 from yunohost.settings import settings_set
 
 logger = getActionLogger("yunohost.migration")
 
-SETTINGS_PATH = "/etc/yunohost/settings.json"
+OLD_SETTINGS_PATH = "/etc/yunohost/settings.json"
 
 class MyMigration(Migration):
 
@@ -19,14 +19,16 @@ class MyMigration(Migration):
     dependencies = ["migrate_to_bullseye"]
 
     def run(self):
-        if not os.path.exists(SETTINGS_PATH):
+        if not os.path.exists(OLD_SETTINGS_PATH):
             return
 
         try:
-            old_settings = json.load(open(SETTINGS_PATH))
+            old_settings = json.load(open(OLD_SETTINGS_PATH))
         except Exception as e:
             raise YunohostError("global_settings_cant_open_settings", reason=e)
 
-        for key, value in old_settings.items():
-            if key in LEGACY_SETTINGS:
-                settings_set(key=key, value=value)
+        settings = { k: v['values'] for k,v in old_settings.items() }
+        
+        args = urllib.parse.urlencode(settings)
+        settings_set(args=args)
+