From 96b112ac7f397b966d3a67cd9b80d8ee5776ab82 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 16 Sep 2021 17:49:58 +0200
Subject: [PATCH] config get: Also inject ask strings in full mode

---
 src/yunohost/utils/config.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/yunohost/utils/config.py b/src/yunohost/utils/config.py
index b11d95138..abb901e84 100644
--- a/src/yunohost/utils/config.py
+++ b/src/yunohost/utils/config.py
@@ -65,10 +65,6 @@ class ConfigPanel:
         self._load_current_values()
         self._hydrate()
 
-        # Format result in full mode
-        if mode == "full":
-            return self.config
-
         # In 'classic' mode, we display the current value if key refer to an option
         if self.filter_key.count(".") == 2 and mode == "classic":
             option = self.filter_key.split(".")[-1]
@@ -81,13 +77,19 @@ class ConfigPanel:
             key = f"{panel['id']}.{section['id']}.{option['id']}"
             if mode == "export":
                 result[option["id"]] = option.get("current_value")
+                continue
+
+            ask = None
+            if "ask" in option:
+                ask = _value_for_locale(option["ask"])
+            elif "i18n" in self.config:
+                ask = m18n.n(self.config["i18n"] + "_" + option["id"])
+
+            if mode == "full":
+                # edit self.config directly
+                option["ask"] = ask
             else:
-                if "ask" in option:
-                    result[key] = {"ask": _value_for_locale(option["ask"])}
-                elif "i18n" in self.config:
-                    result[key] = {
-                        "ask": m18n.n(self.config["i18n"] + "_" + option["id"])
-                    }
+                result[key] = {"ask": ask}
                 if "current_value" in option:
                     question_class = ARGUMENTS_TYPE_PARSERS[
                         option.get("type", "string")
@@ -96,7 +98,10 @@ class ConfigPanel:
                         option["current_value"], option
                     )
 
-        return result
+        if mode == "full":
+            return self.config
+        else:
+            return result
 
     def set(
         self, key=None, value=None, args=None, args_file=None, operation_logger=None