From 2f50351b9d692e75cd00882ff53836fa0805dd0a Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Wed, 5 Nov 2025 21:38:15 +0100 Subject: [PATCH] fix: disable config if bitwarden is not selected --- .../rougail_user_data_bitwarden.po | 70 ++++++++++-------- locale/rougail_user_data_bitwarden.pot | 36 +++++---- src/rougail/user_data_bitwarden/config.py | 21 ++++-- .../rougail_user_data_bitwarden.mo | Bin 2185 -> 1973 bytes 4 files changed, 75 insertions(+), 52 deletions(-) diff --git a/locale/fr/LC_MESSAGES/rougail_user_data_bitwarden.po b/locale/fr/LC_MESSAGES/rougail_user_data_bitwarden.po index d9faf42..f23cb86 100644 --- a/locale/fr/LC_MESSAGES/rougail_user_data_bitwarden.po +++ b/locale/fr/LC_MESSAGES/rougail_user_data_bitwarden.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2025-04-09 14:13+0200\n" -"PO-Revision-Date: 2025-04-09 14:14+0200\n" +"POT-Creation-Date: 2025-11-05 08:24+0100\n" +"PO-Revision-Date: 2025-11-05 08:24+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: fr\n" @@ -14,82 +14,88 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" -"X-Generator: Poedit 3.5\n" +"X-Generator: Poedit 3.7\n" -#: src/rougail/user_data_bitwarden/data.py:52 +#: src/rougail/user_data_bitwarden/config.py:46 +msgid "Configuration rougail-user-data-bitwarden" +msgstr "Configuration de rougail-user-data-bitwarden" + +#: src/rougail/user_data_bitwarden/config.py:54 +msgid "Application used to retrieve secrets" +msgstr "Application utilisé pour récupérer des secrets" + +#: src/rougail/user_data_bitwarden/data.py:53 msgid "\"bitwarden\" is not set in step.user_data" msgstr "\"bitwarden\" n'est pas dans step.user_data" -#: src/rougail/user_data_bitwarden/data.py:74 +#: src/rougail/user_data_bitwarden/data.py:75 msgid "\"rbw\" or \"bw\"" msgstr "\"rbw\" ou \"bw\"" -#: src/rougail/user_data_bitwarden/data.py:76 +#: src/rougail/user_data_bitwarden/data.py:77 msgid "\"{0}\"" msgstr "\"{0}\"" -#: src/rougail/user_data_bitwarden/data.py:78 +#: src/rougail/user_data_bitwarden/data.py:80 msgid "please unlock Bitwarden password database with {0}" msgstr "" "veuillez déverrouiller la base de donnée de mot de passe Bitwarden avec {0}" -#: src/rougail/user_data_bitwarden/data.py:79 +#: src/rougail/user_data_bitwarden/data.py:85 msgid "cannot find Bitwarden command {0} please install it" msgstr "ne peut trouver la commande Bitwarden {0} veuillez l'installer" -#: src/rougail/user_data_bitwarden/data.py:153 -msgid "" -"the value for \"{0}\" at index {1} is already set while it should be filled " -"in by Bitwarden" -msgstr "" -"la valeur de \"{0}\" à l'index {1} est déjà renseigné alors que celle doit " -"devrait être renseigné par Bitwarden" - -#: src/rougail/user_data_bitwarden/data.py:155 -msgid "" -"the value for \"{0}\" is already set while it should be filled in by " -"Bitwarden" -msgstr "" -"la valeur de \"{0}\" est déjà renseignée alors que celle doit devrait être " -"renseignée par Bitwarden" - -#: src/rougail/user_data_bitwarden/data.py:185 +#: src/rougail/user_data_bitwarden/data.py:163 msgid "the default value for \"{0}\" must be the Bitwarden item name" msgstr "" "la valeur par défaut pour \"{0}\" doit être un nom d'élément de Bitwarden" -#: src/rougail/user_data_bitwarden/data.py:198 +#: src/rougail/user_data_bitwarden/data.py:186 msgid "cannot execute the \"{0}\" commandline from Bitwarden for \"{1}\": {2}" msgstr "" "ne peut exécuter la ligne de commande \"{0}\" pour Bitwarden pour \"{1}\": " "{2}" -#: src/rougail/user_data_bitwarden/data.py:201 +#: src/rougail/user_data_bitwarden/data.py:195 msgid "item \"{0}\" in Bitwarden is not found for \"{1}\"" msgstr "l'élément \"{0}\" dans Bitwarden n'est pas trouvé pour \"{1}\"" -#: src/rougail/user_data_bitwarden/data.py:208 +#: src/rougail/user_data_bitwarden/data.py:210 msgid "several items found with name \"{0}\" in Bitwarden for \"{1}\": \"{2}\"" msgstr "" "plusieurs éléments trouvés avec le nom \"{0}\" dans Bitwarden pour \"{1}\": " "\"{2}\"" -#: src/rougail/user_data_bitwarden/data.py:219 +#: src/rougail/user_data_bitwarden/data.py:229 msgid "unexpected datas \"{0}\" from Bitwarden for \"{1}\": {2}" msgstr "données inattendues \"{0}\" pour Bitwarden pour \"{1}\": {2}" -#: src/rougail/user_data_bitwarden/data.py:224 +#: src/rougail/user_data_bitwarden/data.py:237 msgid "password" msgstr "de mot de passe" -#: src/rougail/user_data_bitwarden/data.py:226 +#: src/rougail/user_data_bitwarden/data.py:239 msgid "username" msgstr "de nom d'utilisateur" -#: src/rougail/user_data_bitwarden/data.py:227 +#: src/rougail/user_data_bitwarden/data.py:241 msgid "item \"{0}\" in Bitwarden has no {1} for \"{2}\"" msgstr "l'élément \"{0}\" dans Bitwarden n'a pas {1} for \"{2}\"" +#~ msgid "" +#~ "the value for \"{0}\" at index {1} is already set while it should be " +#~ "filled in by Bitwarden" +#~ msgstr "" +#~ "la valeur de \"{0}\" à l'index {1} est déjà renseigné alors que celle " +#~ "doit devrait être renseigné par Bitwarden" + +#~ msgid "" +#~ "the value for \"{0}\" is already set while it should be filled in by " +#~ "Bitwarden" +#~ msgstr "" +#~ "la valeur de \"{0}\" est déjà renseignée alors que celle doit devrait " +#~ "être renseignée par Bitwarden" + #~ msgid "cannot find {0} \"{1}\" from Bitwarden for \"{2}\"" #~ msgstr "ne peut trouver {0} \"{1}\" pour Bitwarden pour \"{2}\"" diff --git a/locale/rougail_user_data_bitwarden.pot b/locale/rougail_user_data_bitwarden.pot index f9dc227..f439ef5 100644 --- a/locale/rougail_user_data_bitwarden.pot +++ b/locale/rougail_user_data_bitwarden.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2025-10-05 21:30+0200\n" +"POT-Creation-Date: 2025-11-05 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,55 +15,63 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: src/rougail/user_data_bitwarden/data.py:54 +#: src/rougail/user_data_bitwarden/config.py:46 +msgid "Configuration rougail-user-data-bitwarden" +msgstr "" + +#: src/rougail/user_data_bitwarden/config.py:54 +msgid "Application used to retrieve secrets" +msgstr "" + +#: src/rougail/user_data_bitwarden/data.py:53 msgid "\"bitwarden\" is not set in step.user_data" msgstr "" -#: src/rougail/user_data_bitwarden/data.py:76 +#: src/rougail/user_data_bitwarden/data.py:75 msgid "\"rbw\" or \"bw\"" msgstr "" -#: src/rougail/user_data_bitwarden/data.py:78 +#: src/rougail/user_data_bitwarden/data.py:77 msgid "\"{0}\"" msgstr "" -#: src/rougail/user_data_bitwarden/data.py:81 +#: src/rougail/user_data_bitwarden/data.py:80 msgid "please unlock Bitwarden password database with {0}" msgstr "" -#: src/rougail/user_data_bitwarden/data.py:86 +#: src/rougail/user_data_bitwarden/data.py:85 msgid "cannot find Bitwarden command {0} please install it" msgstr "" -#: src/rougail/user_data_bitwarden/data.py:202 +#: src/rougail/user_data_bitwarden/data.py:163 msgid "the default value for \"{0}\" must be the Bitwarden item name" msgstr "" -#: src/rougail/user_data_bitwarden/data.py:225 +#: src/rougail/user_data_bitwarden/data.py:186 msgid "cannot execute the \"{0}\" commandline from Bitwarden for \"{1}\": {2}" msgstr "" -#: src/rougail/user_data_bitwarden/data.py:234 +#: src/rougail/user_data_bitwarden/data.py:195 msgid "item \"{0}\" in Bitwarden is not found for \"{1}\"" msgstr "" -#: src/rougail/user_data_bitwarden/data.py:249 +#: src/rougail/user_data_bitwarden/data.py:210 msgid "several items found with name \"{0}\" in Bitwarden for \"{1}\": \"{2}\"" msgstr "" -#: src/rougail/user_data_bitwarden/data.py:268 +#: src/rougail/user_data_bitwarden/data.py:229 msgid "unexpected datas \"{0}\" from Bitwarden for \"{1}\": {2}" msgstr "" -#: src/rougail/user_data_bitwarden/data.py:276 +#: src/rougail/user_data_bitwarden/data.py:237 msgid "password" msgstr "" -#: src/rougail/user_data_bitwarden/data.py:278 +#: src/rougail/user_data_bitwarden/data.py:239 msgid "username" msgstr "" -#: src/rougail/user_data_bitwarden/data.py:280 +#: src/rougail/user_data_bitwarden/data.py:241 msgid "item \"{0}\" in Bitwarden has no {1} for \"{2}\"" msgstr "" diff --git a/src/rougail/user_data_bitwarden/config.py b/src/rougail/user_data_bitwarden/config.py index 3ef8bf8..a8c719b 100644 --- a/src/rougail/user_data_bitwarden/config.py +++ b/src/rougail/user_data_bitwarden/config.py @@ -19,30 +19,39 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ +from .i18n import _ + def get_rougail_config( *, backward_compatibility=True, ) -> dict: - options = """ + options = f""" step: structural: redefine: true default: jinja: |- - {% if step.user_data is not propertyerror and 'bitwarden' in step.user_data %} + {{% if step.user_data is not propertyerror and 'bitwarden' in step.user_data %}} bitwarden - {% endif %} - {% if step.user_data is not propertyerror and 'risotto' in step.user_data %} + {{% endif %}} + {{% if step.user_data is not propertyerror and 'risotto' in step.user_data %}} risotto - {% else %} + {{% else %}} directory - {% endif %} + {{% endif %}} bitwarden: + description: {_("Configuration rougail-user-data-bitwarden")} + disabled: + jinja: | + {{% if step.user_data is propertyerror or 'bitwarden' not in step.user_data %}} + disabled + {{% endif %}} command: + description: {_("Application used to retrieve secrets")} choices: - rbw - bw diff --git a/src/rougail/user_data_bitwarden/locale/fr/LC_MESSAGES/rougail_user_data_bitwarden.mo b/src/rougail/user_data_bitwarden/locale/fr/LC_MESSAGES/rougail_user_data_bitwarden.mo index ef079881ee478e68a268ffc05888df00adacf997..5610032d74cd8e4136b3745df22e3406c29d1510 100644 GIT binary patch delta 529 zcmaLSze~eV5C`y!ZQ81}Md;-8hAu@TP5oW9SVa)TACseyCa)!0n)s6FpwQVx#QX!U znWZ{Q2XPTc!O7J>KpYhOK1IPn501}0a_`;cc(9W_oonZb=u#mnz(=?U)gGcTxB^Gu z5gdgPOu+|Of={ptb1|Y>xCO`I8I*lD@EzVm`Tkv;XaK%K6(&?_la3;dlN?lmt8f=q z;1!&NFK`}e38Jk04%grz+=RDK-Wy61&A>X$!E=az`U!bgF4l|0PKdCqWD0#KGDx`_ zUZOM-D}L_S55FTB?kUUbRo89Wrs3O8iv=FHnC~#bePQ!`&OC0S_Grmz)$K+gzS@Kn zGz`0`pDPcLa@d2{wYyJQL delta 733 zcmb8r%S#(k6bIllCTV;%BD(Lvg%8w{XcUZAe9)B&cButr^q!c}A<;WGMv;(p7J@o! z!L6@or=i`@49|bI9t%%b&xD~v1{1NE7{|N zRGGbiU0;i<_Bjy4rJUyrdxnEtq3A1KL!jsTq7cGs`#j^BlB<>E>8;GKlJ)#&w(vNz zl}M%slVhApXHx0@dpv+vwEgR_xKK_^us9ikg+Y3{pE|zvtg55*Svs^G&?g zk`Kh&$k)y>T|o!DgFmn?7=%>;(<#~2F05S`E%m3jU0pY0UCnQQi@sS!-d9E#b;9rQ F