From 9ff04d53fb62bceca1f4245722ec6acff6622b18 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Mon, 22 Dec 2025 19:06:54 +0100 Subject: [PATCH] fix: add permissive properties for unaccessible modes --- locale/fr/LC_MESSAGES/rougail_cli.po | 18 +++++++++--------- locale/rougail_cli.pot | 10 +++++----- src/rougail/cli/__main__.py | 4 ++++ .../cli/locale/fr/LC_MESSAGES/rougail_cli.mo | Bin 3269 -> 3269 bytes tests/rougailcli_file/warnings.txt | 2 +- tests/rougailcli_file/warnings3.txt | 2 +- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/locale/fr/LC_MESSAGES/rougail_cli.po b/locale/fr/LC_MESSAGES/rougail_cli.po index e0181cd..d3b85e8 100644 --- a/locale/fr/LC_MESSAGES/rougail_cli.po +++ b/locale/fr/LC_MESSAGES/rougail_cli.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2025-12-22 15:24+0100\n" -"PO-Revision-Date: 2025-12-22 15:28+0100\n" +"POT-Creation-Date: 2025-12-22 19:05+0100\n" +"PO-Revision-Date: 2025-12-22 19:06+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: fr\n" @@ -16,23 +16,23 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "X-Generator: Poedit 3.8\n" -#: src/rougail/cli/__main__.py:237 +#: src/rougail/cli/__main__.py:241 msgid "cannot find \"user_data\" module \"{0}\"" msgstr "ne peut trouve le module \"user_data\" \"{0}\"" -#: src/rougail/cli/__main__.py:245 +#: src/rougail/cli/__main__.py:249 msgid "" "interactive user data \"{0}\" is loader before uninteractive user data " "\"{1}\"" msgstr "" -"Les données utilisateur interactifs \"{0}\" sont chargées avant les données " +"les données utilisateur interactifs \"{0}\" sont chargées avant les données " "utilisateur non interactif \"{1}\"" -#: src/rougail/cli/__main__.py:281 +#: src/rougail/cli/__main__.py:285 msgid "cannot find cli file for \"output_name\" module \"{0}\"" msgstr "ne peut trouve le fichier cli pour le module \"output_name\" \"{0}\"" -#: src/rougail/cli/__main__.py:306 +#: src/rougail/cli/__main__.py:310 msgid "ERROR: {0}" msgstr "ERREUR : {0}" @@ -99,8 +99,8 @@ msgstr "" "Pour identifier les différentes variables, on utilise la description de la " "variable. Il y a quatre type de descriptions:\n" "\n" -" - name_and_description : qui contient le nom de la variable suivi de sa " -"description\n" +" - name_and_description : qui contient le nom de la variable suivi de " +"sa description\n" " - path : le chemin de la variable\n" " - name : le nom de la variable\n" " - description : la description de la variable" diff --git a/locale/rougail_cli.pot b/locale/rougail_cli.pot index 2604ae3..c21b86a 100644 --- a/locale/rougail_cli.pot +++ b/locale/rougail_cli.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-12-22 15:31+0100\n" +"POT-Creation-Date: 2025-12-22 19:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,19 +15,19 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: src/rougail/cli/__main__.py:237 +#: src/rougail/cli/__main__.py:241 msgid "cannot find \"user_data\" module \"{0}\"" msgstr "" -#: src/rougail/cli/__main__.py:245 +#: src/rougail/cli/__main__.py:249 msgid "interactive user data \"{0}\" is loader before uninteractive user data \"{1}\"" msgstr "" -#: src/rougail/cli/__main__.py:281 +#: src/rougail/cli/__main__.py:285 msgid "cannot find cli file for \"output_name\" module \"{0}\"" msgstr "" -#: src/rougail/cli/__main__.py:306 +#: src/rougail/cli/__main__.py:310 msgid "ERROR: {0}" msgstr "" diff --git a/src/rougail/cli/__main__.py b/src/rougail/cli/__main__.py index 0dd2a36..c34d997 100644 --- a/src/rougail/cli/__main__.py +++ b/src/rougail/cli/__main__.py @@ -195,10 +195,14 @@ def load_user_data(rougailconfig): subconfig.property.setdefault( frozenset(subconfig.property.default("read_only", "remove") | (read_write - read_only)), "read_only", "remove" ) + for p in read_write: + subconfig.permissive.add(p) if read_only: subconfig.property.setdefault( frozenset(subconfig.property.default("read_only", "append") | read_only), "read_only", "append" ) + for p in read_only: + subconfig.permissive.add(p) if read_write or read_only: subconfig.property.read_write() except: diff --git a/src/rougail/cli/locale/fr/LC_MESSAGES/rougail_cli.mo b/src/rougail/cli/locale/fr/LC_MESSAGES/rougail_cli.mo index 84363d0b81a0b688db0409e021c32c07ea202129..ded6492d64887dab32583ddbac75a0b457a3b1bc 100644 GIT binary patch delta 23 fcmX>qc~o*k6dQ}Bm4VsjIJS$dj5(7Hc%}jXU3&*; delta 23 fcmX>qc~o*k6dQ}Fm665fIJS$dj6RbMc%}jXT+s(e diff --git a/tests/rougailcli_file/warnings.txt b/tests/rougailcli_file/warnings.txt index ec23967..954ea9c 100644 --- a/tests/rougailcli_file/warnings.txt +++ b/tests/rougailcli_file/warnings.txt @@ -1 +1 @@ -["family \"configuration rougail-json\" is disabled, so cannot access to \"test mandatories variables before display in json\", it will be ignored when loading from the YAML file \"warnings.yml\""] \ No newline at end of file +["family \"configuration rougail-json\" has property disabled, so cannot access to \"test mandatories variables before display in json\", it will be ignored when loading from the YAML file \"warnings.yml\""] \ No newline at end of file diff --git a/tests/rougailcli_file/warnings3.txt b/tests/rougailcli_file/warnings3.txt index 699a0ef..eeaf5cc 100644 --- a/tests/rougailcli_file/warnings3.txt +++ b/tests/rougailcli_file/warnings3.txt @@ -1 +1 @@ -["family \"configuration rougail-json\" is disabled, so cannot access to \"test mandatories variables before display in json\", it will be ignored when loading from the YAML file \"warnings3.yml\"", "\"validators\" is a calculation for my_variable but has no description in \"structures/file.yml\" and \"structures_warnings/file.yml\""] \ No newline at end of file +["family \"configuration rougail-json\" has property disabled, so cannot access to \"test mandatories variables before display in json\", it will be ignored when loading from the YAML file \"warnings3.yml\"", "\"validators\" is a calculation for my_variable but has no description in \"structures/file.yml\" and \"structures_warnings/file.yml\""] \ No newline at end of file