From 5ff47ac5c9b24303af562fee320d8970fadd039b Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Mon, 19 Aug 2019 14:13:56 +0200 Subject: [PATCH] rc 11 --- ChangeLog | 8 +- tiramisu/__init__.py | 2 +- tiramisu/locale/fr/LC_MESSAGES/tiramisu.po | 188 ++++++++++----------- tiramisu/locale/tiramisu.pot | 174 +++++++++---------- 4 files changed, 183 insertions(+), 189 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1ee976..8006b79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ +Mon Aug 19 08:02:27 2019 +0200 Emmanuel Garette + * version 3.0 rc11 + * Config could have multiple parents + * todict works with Metaconfig + * separate Cache from values and settings + Fri Jul 26 09:43:03 2019 +0200 Emmanuel Garette - * version 3.0 rc9 + * version 3.0 rc9 and rc10 * better todict support (especially for leadership * can add display_name method to Config init to change the name a option in errors diff --git a/tiramisu/__init__.py b/tiramisu/__init__.py index 3e2b21d..03b7e2d 100644 --- a/tiramisu/__init__.py +++ b/tiramisu/__init__.py @@ -45,4 +45,4 @@ allfuncs.extend(all_options) del(all_options) __all__ = tuple(allfuncs) del(allfuncs) -__version__ = "3.0rc10" +__version__ = "3.0rc11" diff --git a/tiramisu/locale/fr/LC_MESSAGES/tiramisu.po b/tiramisu/locale/fr/LC_MESSAGES/tiramisu.po index f215ba8..8b74072 100644 --- a/tiramisu/locale/fr/LC_MESSAGES/tiramisu.po +++ b/tiramisu/locale/fr/LC_MESSAGES/tiramisu.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Tiramisu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-26 09:35+CEST\n" +"POT-Creation-Date: 2019-08-19 14:10+CEST\n" "PO-Revision-Date: \n" "Last-Translator: Emmanuel Garette \n" "Language-Team: Tiramisu's team \n" @@ -53,46 +53,46 @@ msgstr "l'index est obligatoire pour l'option suiveuse \"{}\"" msgid "unknown method {} in {}" msgstr "méthode {} inconnue dans {}" -#: tiramisu/api.py:393 +#: tiramisu/api.py:398 msgid "cannot add this property: \"{0}\"" msgstr "ne peut pas ajouter cette propriété : \"{0}\"" -#: tiramisu/api.py:549 tiramisu/config.py:252 +#: tiramisu/api.py:554 tiramisu/config.py:239 msgid "can't delete a SymLinkOption" msgstr "ne peut supprimer une valeur à une SymLinkOption" -#: tiramisu/api.py:709 tiramisu/api.py:1487 +#: tiramisu/api.py:714 tiramisu/api.py:1515 msgid "please specify a valid sub function ({})" msgstr "veuillez spécifier une sous fonction valide ({})" -#: tiramisu/api.py:770 tiramisu/api.py:1264 -msgid "unknown list type {}" -msgstr "type de liste inconnue {}" - -#: tiramisu/api.py:772 tiramisu/api.py:1266 -msgid "unknown group_type: {0}" -msgstr "group_type inconnu: {0}" - -#: tiramisu/api.py:826 tiramisu/api.py:1296 -msgid "please use .dict() before .updates()" -msgstr "faire .dict() avant .updates()" - -#: tiramisu/api.py:878 +#: tiramisu/api.py:734 msgid "unknown config type {}" msgstr "type de config {} inconnue" -#: tiramisu/api.py:1089 +#: tiramisu/api.py:795 tiramisu/api.py:1271 +msgid "unknown list type {}" +msgstr "type de liste inconnue {}" + +#: tiramisu/api.py:797 tiramisu/api.py:1273 +msgid "unknown group_type: {0}" +msgstr "group_type inconnu: {0}" + +#: tiramisu/api.py:1096 msgid "properties must be a frozenset" msgstr "une propriété doit être de type frozenset" -#: tiramisu/api.py:1095 tiramisu/api.py:1117 +#: tiramisu/api.py:1102 tiramisu/api.py:1124 msgid "unknown when {} (must be in append or remove)" msgstr "value {} inconsistent (doit être append ou remove)" -#: tiramisu/api.py:1107 tiramisu/api.py:1129 tiramisu/config.py:1268 +#: tiramisu/api.py:1114 tiramisu/api.py:1136 tiramisu/config.py:1262 msgid "unknown type {}" msgstr "type inconnu {}" +#: tiramisu/api.py:1440 +msgid "cannot set session_id and config together" +msgstr "session_id et config ne peut être mis ensemble" + #: tiramisu/autolib.py:96 msgid "unable to carry out a calculation for \"{}\", {}" msgstr "impossible d'effectuer le calcul pour \"{}\", {}" @@ -131,25 +131,25 @@ msgstr "" msgid "\"{0}\" must be an optiondescription, not an {1}" msgstr "\"{0}\" doit être une optiondescription, et non {1}" -#: tiramisu/config.py:213 +#: tiramisu/config.py:200 msgid "unknown option {}" msgstr "option {} inconnue" -#: tiramisu/config.py:221 +#: tiramisu/config.py:208 msgid "there is no option description for this config (may be GroupConfig)" msgstr "" "il n'y a pas d'option description trouvé pour cette config (peut être un " "GroupConfig)" -#: tiramisu/config.py:237 +#: tiramisu/config.py:224 msgid "can't assign to a SymLinkOption" msgstr "ne peut assigner une valeur à une SymLinkOption" -#: tiramisu/config.py:241 -msgid "cannot reduce length of a leader \"{}\"" -msgstr "il est impossible de réduire la longueur de l'option leader \"{}\"" +#: tiramisu/config.py:228 +msgid "cannot reduce length of the leader \"{}\"" +msgstr "il est impossible de réduire la longueur du leader \"{}\"" -#: tiramisu/config.py:321 +#: tiramisu/config.py:308 msgid "" "the follower option \"{}\" has greater length ({}) than the leader length " "({})" @@ -157,19 +157,19 @@ msgstr "" "l'option suiveuse \"{}\" a une longueur supérieur ({}) à la longueur de " "l'option leader ({})" -#: tiramisu/config.py:418 +#: tiramisu/config.py:405 msgid "no option found in config with these criteria" msgstr "aucune option trouvée dans la config avec ces critères" -#: tiramisu/config.py:468 +#: tiramisu/config.py:455 msgid "make_dict can't filtering with value without option" msgstr "make_dict ne peut filtrer sur une valeur mais sans option" -#: tiramisu/config.py:521 +#: tiramisu/config.py:508 msgid "unexpected path \"{0}\", should start with \"{1}\"" msgstr "chemin inconsistant \"{0}\", devrait commencé par \"{1}\"" -#: tiramisu/config.py:669 +#: tiramisu/config.py:659 msgid "cannot duplicate {}" msgstr "ne peut dupliquer : {0}" @@ -182,41 +182,33 @@ msgid "cannot set dynoptiondescription object has root optiondescription" msgstr "" "ne peut assigner un objet dynoptiondescription comme optiondescription racine" -#: tiramisu/config.py:764 tiramisu/config.py:811 +#: tiramisu/config.py:767 tiramisu/config.py:812 msgid "invalid session ID: {0} for config" msgstr "ID de session invalide : {0} pour une config" -#: tiramisu/config.py:795 +#: tiramisu/config.py:796 msgid "groupconfig's children must be a list" msgstr "enfants d'une groupconfig doit être une liste" -#: tiramisu/config.py:799 +#: tiramisu/config.py:800 msgid "groupconfig's children must be Config, MetaConfig or GroupConfig" msgstr "" "les enfants d'un groupconfig doivent être des Config, MetaConfig ou " "GroupConfig" -#: tiramisu/config.py:806 +#: tiramisu/config.py:807 msgid "config name must be uniq in groupconfig for \"{0}\"" msgstr "le nom d'un config doit être unique dans un groupconfig pour \"{0}\"" -#: tiramisu/config.py:976 +#: tiramisu/config.py:977 msgid "unknown config \"{}\"" msgstr "config \"{}\" inconnue" -#: tiramisu/config.py:1003 tiramisu/config.py:1243 -msgid "{}config's children should be config, not {}" -msgstr "enfants d'un {}config doit être une config, pas {}" - -#: tiramisu/config.py:1008 +#: tiramisu/config.py:998 msgid "child must be a Config, MixConfig or MetaConfig" msgstr "l'enfant doit être une Config, MixConfig ou MetaConfig" -#: tiramisu/config.py:1010 -msgid "child has already a {}config's" -msgstr "enfant a déjà un {}config" - -#: tiramisu/config.py:1039 +#: tiramisu/config.py:1030 msgid "" "force_default, force_default_if_same or force_dont_change_value cannot be " "set with only_config" @@ -224,38 +216,34 @@ msgstr "" "force_default, force_default_if_same ou force_dont_change_value ne peuvent " "pas être spécifié avec only_config" -#: tiramisu/config.py:1061 +#: tiramisu/config.py:1052 msgid "force_default and force_dont_change_value cannot be set together" msgstr "" "force_default et force_dont_change_value ne peuvent pas être mis ensemble" -#: tiramisu/config.py:1192 -msgid "config is already in a metaconfig" -msgstr "la config est déjà dans une metaconfig" - -#: tiramisu/config.py:1194 tiramisu/config.py:1266 +#: tiramisu/config.py:1183 tiramisu/config.py:1260 msgid "config name must be uniq in groupconfig for {0}" msgstr "le nom de la config doit être unique dans un groupconfig pour {0}" -#: tiramisu/config.py:1208 +#: tiramisu/config.py:1200 tiramisu/config.py:1209 msgid "cannot find the config {}" msgstr "ne peut pas trouver la config {0}" -#: tiramisu/config.py:1229 +#: tiramisu/config.py:1231 msgid "MetaConfig with optiondescription must have string has child, not {}" msgstr "" "MetaConfig avec une optiondescription doit avoir un nom comme enfant, pas {}" -#: tiramisu/config.py:1249 +#: tiramisu/config.py:1243 msgid "child must be a Config or MetaConfig" msgstr "enfant doit être une une Config ou une MetaConfig" -#: tiramisu/config.py:1253 +#: tiramisu/config.py:1247 msgid "all config in metaconfig must have the same optiondescription" msgstr "" "toutes les configs d'une metaconfig doivent avoir la même optiondescription" -#: tiramisu/config.py:1304 +#: tiramisu/config.py:1298 msgid "metaconfig must have the same optiondescription" msgstr "metaconfig doivent avoir la même optiondescription" @@ -271,11 +259,11 @@ msgstr "ou" msgid " {} " msgstr " {} " -#: tiramisu/error.py:105 tiramisu/setting.py:599 +#: tiramisu/error.py:105 tiramisu/setting.py:601 msgid "property" msgstr "de la propriété" -#: tiramisu/error.py:107 tiramisu/setting.py:601 +#: tiramisu/error.py:107 tiramisu/setting.py:603 msgid "properties" msgstr "des propriétés" @@ -361,7 +349,7 @@ msgstr "" "paramètres définis pour la fonction de callback mais aucun callback défini " "pour l'option \"{0}\"" -#: tiramisu/option/baseoption.py:350 tiramisu/storage/dictionary/value.py:258 +#: tiramisu/option/baseoption.py:350 tiramisu/storage/dictionary/value.py:256 #: tiramisu/storage/sqlite3/value.py:201 msgid "information's item not found: {0}" msgstr "item '{0}' dans les informations non trouvée" @@ -673,21 +661,21 @@ msgstr "" "le masque de réseau ne correspond pas à l'IP \"{0}\" (\"{1}\") et au " "broadcast \"{2}\" (\"{3}\")" -#: tiramisu/option/leadership.py:57 +#: tiramisu/option/leadership.py:56 msgid "a leader and a follower are mandatories in leadership \"{}\"" msgstr "" "une option leader et une option suiveuse sont obligatoires dans une option " "leadership \"{}\"" -#: tiramisu/option/leadership.py:63 +#: tiramisu/option/leadership.py:62 msgid "leadership \"{0}\" shall not have a symlinkoption" msgstr "une option leadership \"{0}\" ne devrait pas avoir de symlinkoption" -#: tiramisu/option/leadership.py:66 +#: tiramisu/option/leadership.py:65 msgid "leadership \"{0}\" shall not have a subgroup" msgstr "une option leadership \"{0}\" ne devrait pas avoir de sous-groupe" -#: tiramisu/option/leadership.py:69 +#: tiramisu/option/leadership.py:68 msgid "" "only multi option allowed in leadership \"{0}\" but option \"{1}\" is not a " "multi" @@ -695,25 +683,25 @@ msgstr "" "seules des options multiples sont autorisés dans l'option leadership \"{0}\" " "alors que l'option \"{1}\" n'est pas une option multiple" -#: tiramisu/option/leadership.py:74 +#: tiramisu/option/leadership.py:73 msgid "" "not allowed default value for follower option \"{0}\" in leadership \"{1}\"" msgstr "" "valeur par défaut non autorisée pour l'option suiveuse \"{0}\" dans l'option " "leadership \"{1}\"" -#: tiramisu/option/leadership.py:90 +#: tiramisu/option/leadership.py:89 msgid "callback of leader's option shall not refered to a follower's ones" msgstr "" "callback d'une variable leader ne devrait pas référencer une variable " "suiveuse" -#: tiramisu/option/leadership.py:98 +#: tiramisu/option/leadership.py:97 msgid "leader {} have requirement, but Leadership {} too" msgstr "" "l'option leader {} a des requirements mais l'option leadership {} également" -#: tiramisu/option/leadership.py:113 +#: tiramisu/option/leadership.py:112 msgid "" "malformed requirements option \"{0}\" must not be in follower for \"{1}\"" msgstr "" @@ -898,7 +886,7 @@ msgstr "" msgid "the dynoption \"{0}\" cannot have \"force_store_value\" property" msgstr "la dynoption \"{0}\" ne peut avoir la propriété \"force_store_value\"" -#: tiramisu/option/optiondescription.py:99 tiramisu/setting.py:687 +#: tiramisu/option/optiondescription.py:99 tiramisu/setting.py:689 msgid "" "a leader ({0}) cannot have \"force_default_on_freeze\" or " "\"force_metaconfig_on_freeze\" property without \"frozen\"" @@ -1041,7 +1029,7 @@ msgstr "ne peut redéfinir ({0})" msgid "can't unbind {0}" msgstr "ne peut supprimer ({0})" -#: tiramisu/setting.py:539 +#: tiramisu/setting.py:541 msgid "" "malformed requirements imbrication detected for option: '{0}' with " "requirement on: '{1}'" @@ -1049,64 +1037,64 @@ msgstr "" "imbrication de requirements mal formés detectée pour l'option : '{0}' avec " "requirement sur : '{1}'" -#: tiramisu/setting.py:602 +#: tiramisu/setting.py:604 msgid "" "cannot access to option \"{0}\" because required option \"{1}\" has {2} {3}" msgstr "" "ne peut accéder à l'option \"{0}\" parce que l'option requise \"{1}\" a {2} " "{3}" -#: tiramisu/setting.py:630 +#: tiramisu/setting.py:632 msgid "the calculated value is {0}" msgstr "valeurs calculées est {0}" -#: tiramisu/setting.py:632 +#: tiramisu/setting.py:634 msgid "the calculated value is not {0}" msgstr "valeurs calculées n'est pas {0}" -#: tiramisu/setting.py:636 +#: tiramisu/setting.py:638 msgid "the value of \"{0}\" is {1}" msgstr "la valeur de \"{0}\" est {1}" -#: tiramisu/setting.py:638 +#: tiramisu/setting.py:640 msgid "the value of \"{0}\" is not {1}" msgstr "la valeur de \"{0}\" n'est pas {1}" -#: tiramisu/setting.py:677 +#: tiramisu/setting.py:679 msgid "cannot set property {} for option \"{}\" this property is calculated" msgstr "" "ne peut ajouter la propriété {} pour l'option \"{}\" cette propriété est " "calculée" -#: tiramisu/setting.py:682 +#: tiramisu/setting.py:684 msgid "can't assign property to the symlinkoption \"{}\"" msgstr "ne peut assigner une propriété à une symlinkoption \"{}\"" -#: tiramisu/setting.py:714 +#: tiramisu/setting.py:716 msgid "permissive must be a frozenset" msgstr "une permissive doit être de type frozenset" -#: tiramisu/setting.py:718 +#: tiramisu/setting.py:720 msgid "can't assign permissive to the symlinkoption \"{}\"" msgstr "ne peut assigner une permissive à la symlinkoption \"{}\"" -#: tiramisu/setting.py:725 +#: tiramisu/setting.py:727 msgid "cannot add those permissives: {0}" msgstr "ne peut ajouter ces permissives : {0}" -#: tiramisu/setting.py:742 +#: tiramisu/setting.py:744 msgid "can't reset properties to the symlinkoption \"{}\"" msgstr "ne peut réinitialiser les propriétés de la symlinkoption \"{}\"" -#: tiramisu/setting.py:757 +#: tiramisu/setting.py:759 msgid "can't reset permissives to the symlinkoption \"{}\"" msgstr "ne peut réinitialiser les permissive de la symlinkoption \"{}\"" -#: tiramisu/storage/__init__.py:60 +#: tiramisu/storage/__init__.py:61 msgid "cannot import the storage {0}" msgstr "ne peut pas importer le stockage {0}" -#: tiramisu/storage/__init__.py:72 +#: tiramisu/storage/__init__.py:73 msgid "storage_type is already set, cannot rebind it" msgstr "storage_type est déjà défini, impossible de le redéfinir" @@ -1119,12 +1107,12 @@ msgstr "session \"{}\" en court d'utilisation" msgid "a dictionary cannot be persistent" msgstr "un espace de stockage dictionary ne peut être persistant" -#: tiramisu/storage/dictionary/value.py:267 +#: tiramisu/storage/dictionary/value.py:265 #: tiramisu/storage/sqlite3/value.py:213 msgid "information's item not found {0}" msgstr "l'information de l'objet ne sont pas trouvé {0}" -#: tiramisu/storage/dictionary/value.py:286 +#: tiramisu/storage/dictionary/value.py:284 msgid "cannot delete none persistent session" msgstr "ne peut supprimer une session non persistante" @@ -1144,40 +1132,52 @@ msgstr "l'option {} ne fonctionne que si remotable n'est pas \"none\"" msgid "unable to transform tiramisu object to dict: {}" msgstr "impossible de transformer l'objet tiramisu en dict : {}" -#: tiramisu/todict.py:794 tiramisu/todict.py:926 +#: tiramisu/todict.py:795 tiramisu/todict.py:927 msgid "unknown form {}" msgstr "form {} inconnu" -#: tiramisu/todict.py:839 +#: tiramisu/todict.py:840 msgid "not in current area" msgstr "n'est pas dans l'espace courant" -#: tiramisu/todict.py:859 +#: tiramisu/todict.py:860 msgid "only multi option can have action \"add\", but \"{}\" is not a multi" msgstr "" "seules des options multiples peuvent avoir l'action \"add\", mais \"{}\" " "n'est pas une valeur multiple" -#: tiramisu/todict.py:861 +#: tiramisu/todict.py:862 msgid "unknown action" msgstr "action inconnue" -#: tiramisu/value.py:428 +#: tiramisu/value.py:425 msgid "can't set owner for the symlinkoption \"{}\"" msgstr "ne peut spécifier d'utilisateur à la symlinkoption \"{}\"" -#: tiramisu/value.py:431 tiramisu/value.py:641 +#: tiramisu/value.py:428 tiramisu/value.py:638 msgid "set owner \"{0}\" is forbidden" msgstr "assigner l'utilisateur \"{0}\" est interdit" -#: tiramisu/value.py:434 +#: tiramisu/value.py:431 msgid "no value for {0} cannot change owner to {1}" msgstr "pas de valeur pour {0} ne peut changer d'utilisateur pour {1}" -#: tiramisu/value.py:512 +#: tiramisu/value.py:509 msgid "index {} is greater than the length {} for option \"{}\"" msgstr "l'index {} est supérieur à la longueur \"{}\" pour l'option \"{}\"" +#~ msgid "please use .dict() before .updates()" +#~ msgstr "faire .dict() avant .updates()" + +#~ msgid "{}config's children should be config, not {}" +#~ msgstr "enfants d'un {}config doit être une config, pas {}" + +#~ msgid "child has already a {}config's" +#~ msgstr "enfant a déjà un {}config" + +#~ msgid "config is already in a metaconfig" +#~ msgstr "la config est déjà dans une metaconfig" + #~ msgid "some characters may cause problems" #~ msgstr "des caractères peuvent poser problèmes" diff --git a/tiramisu/locale/tiramisu.pot b/tiramisu/locale/tiramisu.pot index e1db416..882498b 100644 --- a/tiramisu/locale/tiramisu.pot +++ b/tiramisu/locale/tiramisu.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-07-26 09:35+CEST\n" +"POT-Creation-Date: 2019-08-19 14:10+CEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -51,46 +51,46 @@ msgstr "" msgid "unknown method {} in {}" msgstr "" -#: tiramisu/api.py:393 +#: tiramisu/api.py:398 msgid "cannot add this property: \"{0}\"" msgstr "" -#: tiramisu/api.py:549 tiramisu/config.py:252 +#: tiramisu/api.py:554 tiramisu/config.py:239 msgid "can't delete a SymLinkOption" msgstr "" -#: tiramisu/api.py:709 tiramisu/api.py:1487 +#: tiramisu/api.py:714 tiramisu/api.py:1515 msgid "please specify a valid sub function ({})" msgstr "" -#: tiramisu/api.py:770 tiramisu/api.py:1264 -msgid "unknown list type {}" -msgstr "" - -#: tiramisu/api.py:772 tiramisu/api.py:1266 -msgid "unknown group_type: {0}" -msgstr "" - -#: tiramisu/api.py:826 tiramisu/api.py:1296 -msgid "please use .dict() before .updates()" -msgstr "" - -#: tiramisu/api.py:878 +#: tiramisu/api.py:734 msgid "unknown config type {}" msgstr "" -#: tiramisu/api.py:1089 +#: tiramisu/api.py:795 tiramisu/api.py:1271 +msgid "unknown list type {}" +msgstr "" + +#: tiramisu/api.py:797 tiramisu/api.py:1273 +msgid "unknown group_type: {0}" +msgstr "" + +#: tiramisu/api.py:1096 msgid "properties must be a frozenset" msgstr "" -#: tiramisu/api.py:1095 tiramisu/api.py:1117 +#: tiramisu/api.py:1102 tiramisu/api.py:1124 msgid "unknown when {} (must be in append or remove)" msgstr "" -#: tiramisu/api.py:1107 tiramisu/api.py:1129 tiramisu/config.py:1268 +#: tiramisu/api.py:1114 tiramisu/api.py:1136 tiramisu/config.py:1262 msgid "unknown type {}" msgstr "" +#: tiramisu/api.py:1440 +msgid "cannot set session_id and config together" +msgstr "" + #: tiramisu/autolib.py:96 msgid "unable to carry out a calculation for \"{}\", {}" msgstr "" @@ -115,39 +115,39 @@ msgstr "" msgid "\"{0}\" must be an optiondescription, not an {1}" msgstr "" -#: tiramisu/config.py:213 +#: tiramisu/config.py:200 msgid "unknown option {}" msgstr "" -#: tiramisu/config.py:221 +#: tiramisu/config.py:208 msgid "there is no option description for this config (may be GroupConfig)" msgstr "" -#: tiramisu/config.py:237 +#: tiramisu/config.py:224 msgid "can't assign to a SymLinkOption" msgstr "" -#: tiramisu/config.py:241 -msgid "cannot reduce length of a leader \"{}\"" +#: tiramisu/config.py:228 +msgid "cannot reduce length of the leader \"{}\"" msgstr "" -#: tiramisu/config.py:321 +#: tiramisu/config.py:308 msgid "the follower option \"{}\" has greater length ({}) than the leader length ({})" msgstr "" -#: tiramisu/config.py:418 +#: tiramisu/config.py:405 msgid "no option found in config with these criteria" msgstr "" -#: tiramisu/config.py:468 +#: tiramisu/config.py:455 msgid "make_dict can't filtering with value without option" msgstr "" -#: tiramisu/config.py:521 +#: tiramisu/config.py:508 msgid "unexpected path \"{0}\", should start with \"{1}\"" msgstr "" -#: tiramisu/config.py:669 +#: tiramisu/config.py:659 msgid "cannot duplicate {}" msgstr "" @@ -159,71 +159,59 @@ msgstr "" msgid "cannot set dynoptiondescription object has root optiondescription" msgstr "" -#: tiramisu/config.py:764 tiramisu/config.py:811 +#: tiramisu/config.py:767 tiramisu/config.py:812 msgid "invalid session ID: {0} for config" msgstr "" -#: tiramisu/config.py:795 +#: tiramisu/config.py:796 msgid "groupconfig's children must be a list" msgstr "" -#: tiramisu/config.py:799 +#: tiramisu/config.py:800 msgid "groupconfig's children must be Config, MetaConfig or GroupConfig" msgstr "" -#: tiramisu/config.py:806 +#: tiramisu/config.py:807 msgid "config name must be uniq in groupconfig for \"{0}\"" msgstr "" -#: tiramisu/config.py:976 +#: tiramisu/config.py:977 msgid "unknown config \"{}\"" msgstr "" -#: tiramisu/config.py:1003 tiramisu/config.py:1243 -msgid "{}config's children should be config, not {}" -msgstr "" - -#: tiramisu/config.py:1008 +#: tiramisu/config.py:998 msgid "child must be a Config, MixConfig or MetaConfig" msgstr "" -#: tiramisu/config.py:1010 -msgid "child has already a {}config's" -msgstr "" - -#: tiramisu/config.py:1039 +#: tiramisu/config.py:1030 msgid "force_default, force_default_if_same or force_dont_change_value cannot be set with only_config" msgstr "" -#: tiramisu/config.py:1061 +#: tiramisu/config.py:1052 msgid "force_default and force_dont_change_value cannot be set together" msgstr "" -#: tiramisu/config.py:1192 -msgid "config is already in a metaconfig" -msgstr "" - -#: tiramisu/config.py:1194 tiramisu/config.py:1266 +#: tiramisu/config.py:1183 tiramisu/config.py:1260 msgid "config name must be uniq in groupconfig for {0}" msgstr "" -#: tiramisu/config.py:1208 +#: tiramisu/config.py:1200 tiramisu/config.py:1209 msgid "cannot find the config {}" msgstr "" -#: tiramisu/config.py:1229 +#: tiramisu/config.py:1231 msgid "MetaConfig with optiondescription must have string has child, not {}" msgstr "" -#: tiramisu/config.py:1249 +#: tiramisu/config.py:1243 msgid "child must be a Config or MetaConfig" msgstr "" -#: tiramisu/config.py:1253 +#: tiramisu/config.py:1247 msgid "all config in metaconfig must have the same optiondescription" msgstr "" -#: tiramisu/config.py:1304 +#: tiramisu/config.py:1298 msgid "metaconfig must have the same optiondescription" msgstr "" @@ -239,11 +227,11 @@ msgstr "" msgid " {} " msgstr "" -#: tiramisu/error.py:105 tiramisu/setting.py:599 +#: tiramisu/error.py:105 tiramisu/setting.py:601 msgid "property" msgstr "" -#: tiramisu/error.py:107 tiramisu/setting.py:601 +#: tiramisu/error.py:107 tiramisu/setting.py:603 msgid "properties" msgstr "" @@ -323,7 +311,7 @@ msgstr "" msgid "params defined for a callback function but no callback defined yet for option \"{0}\"" msgstr "" -#: tiramisu/option/baseoption.py:350 tiramisu/storage/dictionary/value.py:258 +#: tiramisu/option/baseoption.py:350 tiramisu/storage/dictionary/value.py:256 #: tiramisu/storage/sqlite3/value.py:201 msgid "information's item not found: {0}" msgstr "" @@ -593,35 +581,35 @@ msgstr "" msgid "the netmask does not match with IP \"{0}\" (\"{1}\") and broadcast \"{2}\" (\"{3}\")" msgstr "" -#: tiramisu/option/leadership.py:57 +#: tiramisu/option/leadership.py:56 msgid "a leader and a follower are mandatories in leadership \"{}\"" msgstr "" -#: tiramisu/option/leadership.py:63 +#: tiramisu/option/leadership.py:62 msgid "leadership \"{0}\" shall not have a symlinkoption" msgstr "" -#: tiramisu/option/leadership.py:66 +#: tiramisu/option/leadership.py:65 msgid "leadership \"{0}\" shall not have a subgroup" msgstr "" -#: tiramisu/option/leadership.py:69 +#: tiramisu/option/leadership.py:68 msgid "only multi option allowed in leadership \"{0}\" but option \"{1}\" is not a multi" msgstr "" -#: tiramisu/option/leadership.py:74 +#: tiramisu/option/leadership.py:73 msgid "not allowed default value for follower option \"{0}\" in leadership \"{1}\"" msgstr "" -#: tiramisu/option/leadership.py:90 +#: tiramisu/option/leadership.py:89 msgid "callback of leader's option shall not refered to a follower's ones" msgstr "" -#: tiramisu/option/leadership.py:98 +#: tiramisu/option/leadership.py:97 msgid "leader {} have requirement, but Leadership {} too" msgstr "" -#: tiramisu/option/leadership.py:113 +#: tiramisu/option/leadership.py:112 msgid "malformed requirements option \"{0}\" must not be in follower for \"{1}\"" msgstr "" @@ -786,7 +774,7 @@ msgstr "" msgid "the dynoption \"{0}\" cannot have \"force_store_value\" property" msgstr "" -#: tiramisu/option/optiondescription.py:99 tiramisu/setting.py:687 +#: tiramisu/option/optiondescription.py:99 tiramisu/setting.py:689 msgid "a leader ({0}) cannot have \"force_default_on_freeze\" or \"force_metaconfig_on_freeze\" property without \"frozen\"" msgstr "" @@ -910,63 +898,63 @@ msgstr "" msgid "can't unbind {0}" msgstr "" -#: tiramisu/setting.py:539 +#: tiramisu/setting.py:541 msgid "malformed requirements imbrication detected for option: '{0}' with requirement on: '{1}'" msgstr "" -#: tiramisu/setting.py:602 +#: tiramisu/setting.py:604 msgid "cannot access to option \"{0}\" because required option \"{1}\" has {2} {3}" msgstr "" -#: tiramisu/setting.py:630 +#: tiramisu/setting.py:632 msgid "the calculated value is {0}" msgstr "" -#: tiramisu/setting.py:632 +#: tiramisu/setting.py:634 msgid "the calculated value is not {0}" msgstr "" -#: tiramisu/setting.py:636 +#: tiramisu/setting.py:638 msgid "the value of \"{0}\" is {1}" msgstr "" -#: tiramisu/setting.py:638 +#: tiramisu/setting.py:640 msgid "the value of \"{0}\" is not {1}" msgstr "" -#: tiramisu/setting.py:677 +#: tiramisu/setting.py:679 msgid "cannot set property {} for option \"{}\" this property is calculated" msgstr "" -#: tiramisu/setting.py:682 +#: tiramisu/setting.py:684 msgid "can't assign property to the symlinkoption \"{}\"" msgstr "" -#: tiramisu/setting.py:714 +#: tiramisu/setting.py:716 msgid "permissive must be a frozenset" msgstr "" -#: tiramisu/setting.py:718 +#: tiramisu/setting.py:720 msgid "can't assign permissive to the symlinkoption \"{}\"" msgstr "" -#: tiramisu/setting.py:725 +#: tiramisu/setting.py:727 msgid "cannot add those permissives: {0}" msgstr "" -#: tiramisu/setting.py:742 +#: tiramisu/setting.py:744 msgid "can't reset properties to the symlinkoption \"{}\"" msgstr "" -#: tiramisu/setting.py:757 +#: tiramisu/setting.py:759 msgid "can't reset permissives to the symlinkoption \"{}\"" msgstr "" -#: tiramisu/storage/__init__.py:60 +#: tiramisu/storage/__init__.py:61 msgid "cannot import the storage {0}" msgstr "" -#: tiramisu/storage/__init__.py:72 +#: tiramisu/storage/__init__.py:73 msgid "storage_type is already set, cannot rebind it" msgstr "" @@ -979,12 +967,12 @@ msgstr "" msgid "a dictionary cannot be persistent" msgstr "" -#: tiramisu/storage/dictionary/value.py:267 +#: tiramisu/storage/dictionary/value.py:265 #: tiramisu/storage/sqlite3/value.py:213 msgid "information's item not found {0}" msgstr "" -#: tiramisu/storage/dictionary/value.py:286 +#: tiramisu/storage/dictionary/value.py:284 msgid "cannot delete none persistent session" msgstr "" @@ -1004,35 +992,35 @@ msgstr "" msgid "unable to transform tiramisu object to dict: {}" msgstr "" -#: tiramisu/todict.py:794 tiramisu/todict.py:926 +#: tiramisu/todict.py:795 tiramisu/todict.py:927 msgid "unknown form {}" msgstr "" -#: tiramisu/todict.py:839 +#: tiramisu/todict.py:840 msgid "not in current area" msgstr "" -#: tiramisu/todict.py:859 +#: tiramisu/todict.py:860 msgid "only multi option can have action \"add\", but \"{}\" is not a multi" msgstr "" -#: tiramisu/todict.py:861 +#: tiramisu/todict.py:862 msgid "unknown action" msgstr "" -#: tiramisu/value.py:428 +#: tiramisu/value.py:425 msgid "can't set owner for the symlinkoption \"{}\"" msgstr "" -#: tiramisu/value.py:431 tiramisu/value.py:641 +#: tiramisu/value.py:428 tiramisu/value.py:638 msgid "set owner \"{0}\" is forbidden" msgstr "" -#: tiramisu/value.py:434 +#: tiramisu/value.py:431 msgid "no value for {0} cannot change owner to {1}" msgstr "" -#: tiramisu/value.py:512 +#: tiramisu/value.py:509 msgid "index {} is greater than the length {} for option \"{}\"" msgstr ""