# HG changeset patch # User Thierry Florac # Date 1569491766 -7200 # Node ID f77dafa1a966281a75fa551045b10508a3a06cd5 # Parent 8a1a1e258f43d3a36284d4e5761bde09b6a4f528 Version 0.1.27 diff -r 8a1a1e258f43 -r f77dafa1a966 .installed.cfg --- a/.installed.cfg Wed Sep 25 09:46:48 2019 +0200 +++ b/.installed.cfg Thu Sep 26 11:56:06 2019 +0200 @@ -92,3 +92,38 @@ location = /home/tflorac/Dropbox/src/PyAMS/pyams_portal/parts/test recipe = zc.recipe.testrunner script = /home/tflorac/Dropbox/src/PyAMS/pyams_portal/bin/test + +[buildout] +installed_develop_eggs = /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-template.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-form.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-default-theme.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/lingua.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-portal.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-pagelet.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-workflow.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-catalog.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-viewlet.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-utils.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-sequence.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-security.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-thesaurus.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-file.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-zmq.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-content.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-mail.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-media.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-zmi.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-skin.egg-link + /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-i18n.egg-link + +[buildout] +parts = i18n pyflakes test package + +[buildout] +parts = pyflakes test package i18n + +[buildout] +parts = test package i18n pyflakes + +[buildout] +parts = package i18n pyflakes test diff -r 8a1a1e258f43 -r f77dafa1a966 buildout.cfg --- a/buildout.cfg Wed Sep 25 09:46:48 2019 +0200 +++ b/buildout.cfg Thu Sep 26 11:56:06 2019 +0200 @@ -79,4 +79,4 @@ eggs = pyams_portal [test] [versions] -pyams_portal = 0.1.26 +pyams_portal = 0.1.27 diff -r 8a1a1e258f43 -r f77dafa1a966 docs/HISTORY.txt --- a/docs/HISTORY.txt Wed Sep 25 09:46:48 2019 +0200 +++ b/docs/HISTORY.txt Thu Sep 26 11:56:06 2019 +0200 @@ -1,6 +1,10 @@ History ======= +0.1.27 +------ + - in portlets preview, display selected renderer name when not default + 0.1.26 ------ - added generic method in portlet renderer to generate cache key so that it can be easilly overriden diff -r 8a1a1e258f43 -r f77dafa1a966 setup.py --- a/setup.py Wed Sep 25 09:46:48 2019 +0200 +++ b/setup.py Thu Sep 26 11:56:06 2019 +0200 @@ -22,7 +22,7 @@ README = os.path.join(DOCS, 'README.txt') HISTORY = os.path.join(DOCS, 'HISTORY.txt') -version = '0.1.26' +version = '0.1.27' long_description = open(README).read() + '\n\n' + open(HISTORY).read() tests_require = [] diff -r 8a1a1e258f43 -r f77dafa1a966 src/pyams_portal.egg-info/PKG-INFO --- a/src/pyams_portal.egg-info/PKG-INFO Wed Sep 25 09:46:48 2019 +0200 +++ b/src/pyams_portal.egg-info/PKG-INFO Thu Sep 26 11:56:06 2019 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pyams-portal -Version: 0.1.26 +Version: 0.1.27 Summary: PyAMS portal and portlets interfaces and classes Home-page: http://hg.ztfy.org/pyams/pyams_portal Author: Thierry Florac @@ -98,6 +98,10 @@ History ======= + 0.1.27 + ------ + - in portlets preview, display selected renderer name when not default + 0.1.26 ------ - added generic method in portlet renderer to generate cache key so that it can be easilly overriden diff -r 8a1a1e258f43 -r f77dafa1a966 src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.mo Binary file src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.mo has changed diff -r 8a1a1e258f43 -r f77dafa1a966 src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po --- a/src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po Wed Sep 25 09:46:48 2019 +0200 +++ b/src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po Thu Sep 26 11:56:06 2019 +0200 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2019-03-26 12:09+0100\n" +"POT-Creation-Date: 2019-09-24 11:54+0200\n" "PO-Revision-Date: 2015-05-12 12:10+0200\n" "Last-Translator: Thierry Florac \n" "Language-Team: French \n" @@ -16,9 +16,9 @@ "Generated-By: Lingua 3.10.dev0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/pyams_portal/template.py:81 -msgid "Portal template" -msgstr "Modèle de présentation" +#: src/pyams_portal/portlet.py:177 +msgid "Renderer:" +msgstr "Mode de rendu :" #: src/pyams_portal/__init__.py:46 msgid "Manage portal templates" @@ -32,7 +32,7 @@ msgid "Portlet" msgstr "Composant" -#: src/pyams_portal/interfaces.py:69 src/pyams_portal/interfaces.py:201 +#: src/pyams_portal/interfaces.py:69 src/pyams_portal/interfaces.py:208 msgid "Slot name" msgstr "Nom du panneau" @@ -60,27 +60,27 @@ "Cette option n'est disponible que si le parent utilise le même modèle de " "présentation..." -#: src/pyams_portal/interfaces.py:202 +#: src/pyams_portal/interfaces.py:209 msgid "This name must be unique in a given template" msgstr "Ce nom doit être unique au sein d'un modèle de présentation" -#: src/pyams_portal/interfaces.py:205 +#: src/pyams_portal/interfaces.py:212 msgid "Row ID" msgstr "Numéro de la ligne" -#: src/pyams_portal/interfaces.py:219 +#: src/pyams_portal/interfaces.py:226 msgid "Visible slot?" msgstr "Panneau visible ?" -#: src/pyams_portal/interfaces.py:220 +#: src/pyams_portal/interfaces.py:227 msgid "Select 'no' to hide this slot..." msgstr "Choisir 'non' pour masquer ce panneau..." -#: src/pyams_portal/interfaces.py:224 +#: src/pyams_portal/interfaces.py:231 msgid "Extra small device width" msgstr "Largeur sur très petits périphériques" -#: src/pyams_portal/interfaces.py:225 +#: src/pyams_portal/interfaces.py:232 msgid "" "Slot width, in columns count, on extra small devices (phones...); set to 0 " "to hide the portlet" @@ -88,11 +88,11 @@ "Largeur du panneau, en nombre de colonnes, sur les très petits périphériques " "(téléphones...) ; indiquez une valeur de 0 pour masquer ce composant" -#: src/pyams_portal/interfaces.py:231 +#: src/pyams_portal/interfaces.py:238 msgid "Small device width" msgstr "Largeur sur petits périphériques" -#: src/pyams_portal/interfaces.py:232 +#: src/pyams_portal/interfaces.py:239 msgid "" "Slot width, in columns count, on small devices (tablets...); set to 0 to " "hide the portlet" @@ -100,11 +100,11 @@ "Largeur du panneau, en nombre de colonnes, sur les petits périphériques " "(tablettes...) ; indiquez une valeur de 0 pour masquer ce composant" -#: src/pyams_portal/interfaces.py:238 +#: src/pyams_portal/interfaces.py:245 msgid "Medium devices width" msgstr "Largeur sur périphériques moyens" -#: src/pyams_portal/interfaces.py:239 +#: src/pyams_portal/interfaces.py:246 msgid "" "Slot width, in columns count, on medium desktop devices (>= 992 pixels); set " "to 0 to hide the portlet" @@ -112,11 +112,11 @@ "Largeur du panneau, en nombre de colonnes, sur les périphériques moyens (>= " "992 pixels) ; indiquez une valeur de 0 pour masquer ce composant" -#: src/pyams_portal/interfaces.py:245 +#: src/pyams_portal/interfaces.py:252 msgid "Large devices width" msgstr "Largeur sur grands périphériques" -#: src/pyams_portal/interfaces.py:246 +#: src/pyams_portal/interfaces.py:253 msgid "" "Slot width, in columns count, on large desktop devices (>= 1200 pixels); set " "to 0 to hide the portlet" @@ -124,27 +124,27 @@ "Largeur du panneau, en nombre de colonnes, sur les grands périphériques (>= " "1200 pixels) ; indiquez une valeur de 0 pour masquer ce composant" -#: src/pyams_portal/interfaces.py:252 +#: src/pyams_portal/interfaces.py:259 msgid "CSS class" msgstr "Class CSS" -#: src/pyams_portal/interfaces.py:253 +#: src/pyams_portal/interfaces.py:260 msgid "CSS class applied to this slot" msgstr "Classe CSS spécifique appliquée à ce panneau" -#: src/pyams_portal/interfaces.py:366 +#: src/pyams_portal/interfaces.py:373 msgid "Template name" msgstr "Nom du modèle" -#: src/pyams_portal/interfaces.py:367 +#: src/pyams_portal/interfaces.py:374 msgid "Two registered templates can't share the same name..." msgstr "Deux modèles partagés ne peuvent pas utiliser le même nom..." -#: src/pyams_portal/interfaces.py:388 +#: src/pyams_portal/interfaces.py:395 msgid "Toolbar portlets" msgstr "Composants de la barre d'outils" -#: src/pyams_portal/interfaces.py:389 +#: src/pyams_portal/interfaces.py:396 msgid "" "These portlets will be directly available in templates configuration page " "toolbar" @@ -152,55 +152,88 @@ "Ces composants seront directement accessibles dans la page de configuration " "des modèles de présentation sous la forme d'une barre d'icônes" -#: src/pyams_portal/interfaces.py:418 +#: src/pyams_portal/interfaces.py:425 msgid "Inherit parent template?" msgstr "Hériter du modèle du parent ?" -#: src/pyams_portal/interfaces.py:419 +#: src/pyams_portal/interfaces.py:426 msgid "Should we reuse parent template?" msgstr "Doit-on ré-utiliser le modèle du parent ?" -#: src/pyams_portal/interfaces.py:423 +#: src/pyams_portal/interfaces.py:430 msgid "Override parent template?" msgstr "Ne pas hériter du modèle du parent ?" -#: src/pyams_portal/interfaces.py:424 +#: src/pyams_portal/interfaces.py:431 msgid "Should we override parent template?" msgstr "Doit-on remplacer le modèle de présentation du parent ?" -#: src/pyams_portal/interfaces.py:428 +#: src/pyams_portal/interfaces.py:435 msgid "Use local template?" msgstr "Utiliser un modèle local ?" -#: src/pyams_portal/interfaces.py:429 +#: src/pyams_portal/interfaces.py:436 msgid "" "If 'yes', you can define a custom local template instead of a shared template" msgstr "" "Si 'oui', vous pouvez définir un modèle de présentation local au lieu d'un " "modèle partagé" -#: src/pyams_portal/interfaces.py:434 +#: src/pyams_portal/interfaces.py:441 msgid "Local template" msgstr "Modèle local" -#: src/pyams_portal/interfaces.py:439 +#: src/pyams_portal/interfaces.py:446 msgid "Use shared template?" msgstr "Utiliser un modèle partagé" -#: src/pyams_portal/interfaces.py:440 +#: src/pyams_portal/interfaces.py:447 msgid "If 'yes', you can select a shared template" msgstr "" "Si 'oui', vous pouvez sélectionner un modèle de présentation partagé au lieu " "d'un modèle local" -#: src/pyams_portal/interfaces.py:444 +#: src/pyams_portal/interfaces.py:451 msgid "Page template" msgstr "Modèle de page" -#: src/pyams_portal/interfaces.py:445 +#: src/pyams_portal/interfaces.py:452 msgid "Template used for this page" msgstr "Modèle de présentation utilisé pour cette page" +#: src/pyams_portal/template.py:81 +msgid "Portal template" +msgstr "Modèle de présentation" + +#: src/pyams_portal/zmi/widget.py:28 src/pyams_portal/zmi/portlet.py:176 +msgid "Edit renderer properties" +msgstr "Propriétés de ce mode de rendu" + +#: src/pyams_portal/zmi/container.py:64 src/pyams_portal/zmi/container.py:93 +#: src/pyams_portal/zmi/template.py:143 +msgid "Portal templates" +msgstr "Modèles de présentation" + +#: src/pyams_portal/zmi/container.py:102 +msgid "Shared portal templates" +msgstr "Modèles de présentation partagés" + +#: src/pyams_portal/zmi/container.py:139 +msgid "Delete template" +msgstr "Supprimer le modèle" + +#: src/pyams_portal/zmi/container.py:189 +msgid "Selected portlets..." +msgstr "Composants sélectionnés" + +#: src/pyams_portal/zmi/container.py:208 +msgid "Portal templates container" +msgstr "Gestionnaire des modèles" + +#: src/pyams_portal/zmi/container.py:209 +msgid "Edit selected portlets" +msgstr "Sélection des composants" + #: src/pyams_portal/zmi/portlet.py:61 msgid "Edit portlet settings" msgstr "Propriétés du composant" @@ -218,11 +251,6 @@ msgid "Main properties" msgstr "Propriétés" -#: src/pyams_portal/zmi/portlet.py:176 -#: src/pyams_portal/zmi/templates/renderer-input.pt:4 -msgid "Edit renderer properties" -msgstr "Propriétés de ce mode de rendu" - #: src/pyams_portal/zmi/portlet.py:82 src/pyams_portal/zmi/portlet.py:88 msgid "Override template settings" msgstr "Remplacer le paramétrage du modèle sélectionné" @@ -249,74 +277,6 @@ "Vous avez choisi un nouveau mode de rendu, pensez à vérifier son " "paramétrage !" -#: src/pyams_portal/zmi/page.py:65 -msgid "Presentation" -msgstr "Présentation" - -#: src/pyams_portal/zmi/page.py:87 -msgid "Edit template configuration" -msgstr "Choix du modèle de présentation" - -#: src/pyams_portal/zmi/page.py:88 -msgid "Inherit parent template" -msgstr "Hériter du modèle de présentation du parent" - -#: src/pyams_portal/zmi/page.py:145 -msgid "" -"If you choose a shared template, you can only adjust settings of each " -"portlet individually but can't change portlets list or page configuration.\n" -"If you use a local template, you can define a whole custom configuration but " -"the template definition can't be reused anywhere..." -msgstr "" -"Si vous choisissez d'utiliser un modèle de présentation partagé, vous " -"pourrez ajuster les paramètres de chaque composant mais ne pourrez pas " -"modifier la liste des composants ou leur position, ni la configuration de la " -"page.\n" -"Si vous choisissez d'utiliser un modèle de présentation « local », vous " -"pourrez définir l'ensemble de la configuration, mais ce modèle ne pourra pas " -"être réutilisé en dehors des sous-niveaux qui pourront en hériter..." - -#: src/pyams_portal/zmi/page.py:161 -msgid "Template properties" -msgstr "Configuration du modèle" - -#: src/pyams_portal/zmi/page.py:131 -msgid "You must select which shared template to use!" -msgstr "Vous devez sélectionner le modèle de présentation partagé à utiliser !" - -#: src/pyams_portal/zmi/template.py:132 -msgid "Add template" -msgstr "Ajouter un modèle" - -#: src/pyams_portal/zmi/template.py:143 src/pyams_portal/zmi/container.py:64 -#: src/pyams_portal/zmi/container.py:93 -msgid "Portal templates" -msgstr "Modèles de présentation" - -#: src/pyams_portal/zmi/template.py:144 -msgid "Add shared template" -msgstr "Ajout d'un modèle de présentation" - -#: src/pyams_portal/zmi/template.py:60 -msgid "Presentation template" -msgstr "Présentation" - -#: src/pyams_portal/zmi/template.py:167 src/pyams_portal/zmi/layout.py:281 -#: src/pyams_portal/zmi/layout.py:661 -msgid "Specified name is already used!" -msgstr "Le nom indiqué est déjà utilisé !" - -#: src/pyams_portal/zmi/template.py:111 src/pyams_portal/zmi/layout.py:240 -#: src/pyams_portal/zmi/layout.py:337 src/pyams_portal/zmi/layout.py:421 -#, python-format -msgid "« {0} » portal template" -msgstr "Modèle de présentation « {0} »" - -#: src/pyams_portal/zmi/template.py:87 -#, python-format -msgid "{0} (local template)" -msgstr "{0} (modèle local)" - #: src/pyams_portal/zmi/layout.py:81 msgid "Properties" msgstr "Propriétés" @@ -377,6 +337,11 @@ msgid "{{ missing portlet }}" msgstr "{{ composant indisponible }}" +#: src/pyams_portal/zmi/layout.py:281 src/pyams_portal/zmi/layout.py:661 +#: src/pyams_portal/zmi/template.py:167 +msgid "Specified name is already used!" +msgstr "Le nom indiqué est déjà utilisé !" + #: src/pyams_portal/zmi/layout.py:103 msgid "Inherited local template configuration" msgstr "Configuration d'un modèle local hérité" @@ -390,6 +355,12 @@ "Ajouter un composant : {0}
Faire un glisser/déposer du " "bouton dans le modèle de présentation pour positionner le nouveau composant." +#: src/pyams_portal/zmi/layout.py:240 src/pyams_portal/zmi/layout.py:337 +#: src/pyams_portal/zmi/layout.py:421 src/pyams_portal/zmi/template.py:111 +#, python-format +msgid "« {0} » portal template" +msgstr "Modèle de présentation « {0} »" + #: src/pyams_portal/zmi/layout.py:342 #, python-format msgid "Edit « {0} » slot properties" @@ -409,25 +380,57 @@ msgid "Row ID must be between 1 and {0}!" msgstr "Le numéro de ligne doit être compris entre 1 et {0}" -#: src/pyams_portal/zmi/container.py:102 -msgid "Shared portal templates" -msgstr "Modèles de présentation partagés" +#: src/pyams_portal/zmi/template.py:132 +msgid "Add template" +msgstr "Ajouter un modèle" + +#: src/pyams_portal/zmi/template.py:144 +msgid "Add shared template" +msgstr "Ajout d'un modèle de présentation" + +#: src/pyams_portal/zmi/template.py:60 +msgid "Presentation template" +msgstr "Présentation" -#: src/pyams_portal/zmi/container.py:139 -msgid "Delete template" -msgstr "Supprimer le modèle" +#: src/pyams_portal/zmi/template.py:87 +#, python-format +msgid "{0} (local template)" +msgstr "{0} (modèle local)" + +#: src/pyams_portal/zmi/page.py:65 +msgid "Presentation" +msgstr "Présentation" + +#: src/pyams_portal/zmi/page.py:87 +msgid "Edit template configuration" +msgstr "Choix du modèle de présentation" -#: src/pyams_portal/zmi/container.py:189 -msgid "Selected portlets..." -msgstr "Composants sélectionnés" +#: src/pyams_portal/zmi/page.py:88 +msgid "Inherit parent template" +msgstr "Hériter du modèle de présentation du parent" -#: src/pyams_portal/zmi/container.py:208 -msgid "Portal templates container" -msgstr "Gestionnaire des modèles" +#: src/pyams_portal/zmi/page.py:145 +msgid "" +"If you choose a shared template, you can only adjust settings of each " +"portlet individually but can't change portlets list or page configuration.\n" +"If you use a local template, you can define a whole custom configuration but " +"the template definition can't be reused anywhere..." +msgstr "" +"Si vous choisissez d'utiliser un modèle de présentation partagé, vous " +"pourrez ajuster les paramètres de chaque composant mais ne pourrez pas " +"modifier la liste des composants ou leur position, ni la configuration de la " +"page.\n" +"Si vous choisissez d'utiliser un modèle de présentation « local », vous " +"pourrez définir l'ensemble de la configuration, mais ce modèle ne pourra pas " +"être réutilisé en dehors des sous-niveaux qui pourront en hériter..." -#: src/pyams_portal/zmi/container.py:209 -msgid "Edit selected portlets" -msgstr "Sélection des composants" +#: src/pyams_portal/zmi/page.py:161 +msgid "Template properties" +msgstr "Configuration du modèle" + +#: src/pyams_portal/zmi/page.py:131 +msgid "You must select which shared template to use!" +msgstr "Vous devez sélectionner le modèle de présentation partagé à utiliser !" #: src/pyams_portal/zmi/templates/portlet.pt:137 #: src/pyams_portal/portlets/html/interfaces.py:30 @@ -442,18 +445,6 @@ msgid "Tab label" msgstr "Libellé de l'onglet" -#: src/pyams_portal/zmi/templates/template-properties.pt:59 -msgid "Use shared template" -msgstr "Utiliser un modèle de présentation partagé" - -#: src/pyams_portal/zmi/templates/template-properties.pt:65 -msgid "Selected template" -msgstr "Modèle sélectionné" - -#: src/pyams_portal/zmi/templates/template-properties.pt:79 -msgid "Use custom local template" -msgstr "Utiliser un modèle de présentation spécifique (mode « local »)" - #: src/pyams_portal/zmi/templates/layout.pt:24 msgid "Add row
Drag and drop button to page template to position new row" msgstr "" @@ -529,55 +520,21 @@ msgid "Delete portlet..." msgstr "Supprimer le composant" -#: src/pyams_portal/portlets/image/__init__.py:58 -msgid "Image" -msgstr "Image" - -#: src/pyams_portal/portlets/image/interfaces.py:30 -msgid "Selected image" -msgstr "Image sélectionnée" - -#: src/pyams_portal/portlets/image/skin/__init__.py:37 -msgid "Responsive image renderer" -msgstr "Image responsive (par défaut)" +#: src/pyams_portal/zmi/templates/template-properties.pt:59 +msgid "Use shared template" +msgstr "Utiliser un modèle de présentation partagé" -#: src/pyams_portal/portlets/spacer/__init__.py:39 -msgid "Spacer" -msgstr "Espacement" - -#: src/pyams_portal/portlets/spacer/interfaces.py:29 -msgid "Transparent spacer?" -msgstr "Fond transparent ?" - -#: src/pyams_portal/portlets/spacer/interfaces.py:30 -msgid "If 'no', spacer background will be defined by selected color" -msgstr "Si 'non', vous pouvez sélectionner la couleur du fond ci-dessous..." +#: src/pyams_portal/zmi/templates/template-properties.pt:65 +msgid "Selected template" +msgstr "Modèle sélectionné" -#: src/pyams_portal/portlets/spacer/interfaces.py:34 -msgid "Background color" -msgstr "Couleur de fond" - -#: src/pyams_portal/portlets/spacer/interfaces.py:35 -msgid "Color selected for background, if transparency is disabled" -msgstr "" -"Couleur de fond attachée au composant, si la transparence est désactivée" - -#: src/pyams_portal/portlets/spacer/interfaces.py:39 -msgid "Horizontal ruler?" -msgstr "Filet horizontal ?" +#: src/pyams_portal/zmi/templates/template-properties.pt:79 +msgid "Use custom local template" +msgstr "Utiliser un modèle de présentation spécifique (mode « local »)" -#: src/pyams_portal/portlets/spacer/interfaces.py:40 -msgid "" -"If 'yes', an horizontal ruler will be displayed in the middle of the spacer" -msgstr "Si 'oui', un filet horizontal sera affiché au centre du composant" - -#: src/pyams_portal/portlets/spacer/skin/__init__.py:54 -msgid "Default spacer" -msgstr "Espace simple (par défaut)" - -#: src/pyams_portal/portlets/spacer/skin/__init__.py:65 -msgid "Double spacer" -msgstr "Espace double" +#: src/pyams_portal/skin/__init__.py:36 +msgid "Hidden portlet" +msgstr "NON affiché" #: src/pyams_portal/portlets/html/__init__.py:52 #: src/pyams_portal/portlets/html/interfaces.py:33 @@ -621,9 +578,55 @@ msgid "Default text renderer" msgstr "Texte HTML formatté (par défaut)" -#: src/pyams_portal/skin/__init__.py:36 -msgid "Hidden portlet" -msgstr "NON affiché" +#: src/pyams_portal/portlets/spacer/__init__.py:39 +msgid "Spacer" +msgstr "Espacement" + +#: src/pyams_portal/portlets/spacer/interfaces.py:29 +msgid "Transparent spacer?" +msgstr "Fond transparent ?" + +#: src/pyams_portal/portlets/spacer/interfaces.py:30 +msgid "If 'no', spacer background will be defined by selected color" +msgstr "Si 'non', vous pouvez sélectionner la couleur du fond ci-dessous..." + +#: src/pyams_portal/portlets/spacer/interfaces.py:34 +msgid "Background color" +msgstr "Couleur de fond" + +#: src/pyams_portal/portlets/spacer/interfaces.py:35 +msgid "Color selected for background, if transparency is disabled" +msgstr "" +"Couleur de fond attachée au composant, si la transparence est désactivée" + +#: src/pyams_portal/portlets/spacer/interfaces.py:39 +msgid "Horizontal ruler?" +msgstr "Filet horizontal ?" + +#: src/pyams_portal/portlets/spacer/interfaces.py:40 +msgid "" +"If 'yes', an horizontal ruler will be displayed in the middle of the spacer" +msgstr "Si 'oui', un filet horizontal sera affiché au centre du composant" + +#: src/pyams_portal/portlets/spacer/skin/__init__.py:54 +msgid "Default spacer" +msgstr "Espace simple (par défaut)" + +#: src/pyams_portal/portlets/spacer/skin/__init__.py:65 +msgid "Double spacer" +msgstr "Espace double" + +#: src/pyams_portal/portlets/image/__init__.py:58 +msgid "Image" +msgstr "Image" + +#: src/pyams_portal/portlets/image/interfaces.py:30 +msgid "Selected image" +msgstr "Image sélectionnée" + +#: src/pyams_portal/portlets/image/skin/__init__.py:37 +msgid "Responsive image renderer" +msgstr "Image responsive (par défaut)" #~ msgid "Double spacer with horizontal ruler" #~ msgstr "Espace double avec trait horizontal" diff -r 8a1a1e258f43 -r f77dafa1a966 src/pyams_portal/locales/pyams_portal.pot --- a/src/pyams_portal/locales/pyams_portal.pot Wed Sep 25 09:46:48 2019 +0200 +++ b/src/pyams_portal/locales/pyams_portal.pot Thu Sep 26 11:56:06 2019 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2019-03-26 12:09+0100\n" +"POT-Creation-Date: 2019-09-24 11:54+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Lingua 3.10.dev0\n" -#: ./src/pyams_portal/template.py:81 -msgid "Portal template" +#: ./src/pyams_portal/portlet.py:177 +msgid "Renderer:" msgstr "" #: ./src/pyams_portal/__init__.py:46 @@ -32,7 +32,7 @@ msgid "Portlet" msgstr "" -#: ./src/pyams_portal/interfaces.py:69 ./src/pyams_portal/interfaces.py:201 +#: ./src/pyams_portal/interfaces.py:69 ./src/pyams_portal/interfaces.py:208 msgid "Slot name" msgstr "" @@ -58,133 +58,167 @@ "template..." msgstr "" -#: ./src/pyams_portal/interfaces.py:202 +#: ./src/pyams_portal/interfaces.py:209 msgid "This name must be unique in a given template" msgstr "" -#: ./src/pyams_portal/interfaces.py:205 +#: ./src/pyams_portal/interfaces.py:212 msgid "Row ID" msgstr "" -#: ./src/pyams_portal/interfaces.py:219 +#: ./src/pyams_portal/interfaces.py:226 msgid "Visible slot?" msgstr "" -#: ./src/pyams_portal/interfaces.py:220 +#: ./src/pyams_portal/interfaces.py:227 msgid "Select 'no' to hide this slot..." msgstr "" -#: ./src/pyams_portal/interfaces.py:224 +#: ./src/pyams_portal/interfaces.py:231 msgid "Extra small device width" msgstr "" -#: ./src/pyams_portal/interfaces.py:225 +#: ./src/pyams_portal/interfaces.py:232 msgid "" "Slot width, in columns count, on extra small devices (phones...); set to 0 to" " hide the portlet" msgstr "" -#: ./src/pyams_portal/interfaces.py:231 +#: ./src/pyams_portal/interfaces.py:238 msgid "Small device width" msgstr "" -#: ./src/pyams_portal/interfaces.py:232 +#: ./src/pyams_portal/interfaces.py:239 msgid "" "Slot width, in columns count, on small devices (tablets...); set to 0 to hide" " the portlet" msgstr "" -#: ./src/pyams_portal/interfaces.py:238 +#: ./src/pyams_portal/interfaces.py:245 msgid "Medium devices width" msgstr "" -#: ./src/pyams_portal/interfaces.py:239 +#: ./src/pyams_portal/interfaces.py:246 msgid "" "Slot width, in columns count, on medium desktop devices (>= 992 pixels); set " "to 0 to hide the portlet" msgstr "" -#: ./src/pyams_portal/interfaces.py:245 +#: ./src/pyams_portal/interfaces.py:252 msgid "Large devices width" msgstr "" -#: ./src/pyams_portal/interfaces.py:246 +#: ./src/pyams_portal/interfaces.py:253 msgid "" "Slot width, in columns count, on large desktop devices (>= 1200 pixels); set " "to 0 to hide the portlet" msgstr "" -#: ./src/pyams_portal/interfaces.py:252 +#: ./src/pyams_portal/interfaces.py:259 msgid "CSS class" msgstr "" -#: ./src/pyams_portal/interfaces.py:253 +#: ./src/pyams_portal/interfaces.py:260 msgid "CSS class applied to this slot" msgstr "" -#: ./src/pyams_portal/interfaces.py:366 +#: ./src/pyams_portal/interfaces.py:373 msgid "Template name" msgstr "" -#: ./src/pyams_portal/interfaces.py:367 +#: ./src/pyams_portal/interfaces.py:374 msgid "Two registered templates can't share the same name..." msgstr "" -#: ./src/pyams_portal/interfaces.py:388 +#: ./src/pyams_portal/interfaces.py:395 msgid "Toolbar portlets" msgstr "" -#: ./src/pyams_portal/interfaces.py:389 +#: ./src/pyams_portal/interfaces.py:396 msgid "" "These portlets will be directly available in templates configuration page " "toolbar" msgstr "" -#: ./src/pyams_portal/interfaces.py:418 +#: ./src/pyams_portal/interfaces.py:425 msgid "Inherit parent template?" msgstr "" -#: ./src/pyams_portal/interfaces.py:419 +#: ./src/pyams_portal/interfaces.py:426 msgid "Should we reuse parent template?" msgstr "" -#: ./src/pyams_portal/interfaces.py:423 +#: ./src/pyams_portal/interfaces.py:430 msgid "Override parent template?" msgstr "" -#: ./src/pyams_portal/interfaces.py:424 +#: ./src/pyams_portal/interfaces.py:431 msgid "Should we override parent template?" msgstr "" -#: ./src/pyams_portal/interfaces.py:428 +#: ./src/pyams_portal/interfaces.py:435 msgid "Use local template?" msgstr "" -#: ./src/pyams_portal/interfaces.py:429 +#: ./src/pyams_portal/interfaces.py:436 msgid "" "If 'yes', you can define a custom local template instead of a shared template" msgstr "" -#: ./src/pyams_portal/interfaces.py:434 +#: ./src/pyams_portal/interfaces.py:441 msgid "Local template" msgstr "" -#: ./src/pyams_portal/interfaces.py:439 +#: ./src/pyams_portal/interfaces.py:446 msgid "Use shared template?" msgstr "" -#: ./src/pyams_portal/interfaces.py:440 +#: ./src/pyams_portal/interfaces.py:447 msgid "If 'yes', you can select a shared template" msgstr "" -#: ./src/pyams_portal/interfaces.py:444 +#: ./src/pyams_portal/interfaces.py:451 msgid "Page template" msgstr "" -#: ./src/pyams_portal/interfaces.py:445 +#: ./src/pyams_portal/interfaces.py:452 msgid "Template used for this page" msgstr "" +#: ./src/pyams_portal/template.py:81 +msgid "Portal template" +msgstr "" + +#: ./src/pyams_portal/zmi/widget.py:28 ./src/pyams_portal/zmi/portlet.py:176 +msgid "Edit renderer properties" +msgstr "" + +#: ./src/pyams_portal/zmi/container.py:64 +#: ./src/pyams_portal/zmi/container.py:93 +#: ./src/pyams_portal/zmi/template.py:143 +msgid "Portal templates" +msgstr "" + +#: ./src/pyams_portal/zmi/container.py:102 +msgid "Shared portal templates" +msgstr "" + +#: ./src/pyams_portal/zmi/container.py:139 +msgid "Delete template" +msgstr "" + +#: ./src/pyams_portal/zmi/container.py:189 +msgid "Selected portlets..." +msgstr "" + +#: ./src/pyams_portal/zmi/container.py:208 +msgid "Portal templates container" +msgstr "" + +#: ./src/pyams_portal/zmi/container.py:209 +msgid "Edit selected portlets" +msgstr "" + #: ./src/pyams_portal/zmi/portlet.py:61 msgid "Edit portlet settings" msgstr "" @@ -199,11 +233,6 @@ msgid "Main properties" msgstr "" -#: ./src/pyams_portal/zmi/portlet.py:176 -#: ./src/pyams_portal/zmi/templates/renderer-input.pt:4 -msgid "Edit renderer properties" -msgstr "" - #: ./src/pyams_portal/zmi/portlet.py:82 ./src/pyams_portal/zmi/portlet.py:88 msgid "Override template settings" msgstr "" @@ -228,66 +257,6 @@ "properties..." msgstr "" -#: ./src/pyams_portal/zmi/page.py:65 -msgid "Presentation" -msgstr "" - -#: ./src/pyams_portal/zmi/page.py:87 -msgid "Edit template configuration" -msgstr "" - -#: ./src/pyams_portal/zmi/page.py:88 -msgid "Inherit parent template" -msgstr "" - -#: ./src/pyams_portal/zmi/page.py:145 -msgid "" -"If you choose a shared template, you can only adjust settings of each portlet individually but can't change portlets list or page configuration.\n" -"If you use a local template, you can define a whole custom configuration but the template definition can't be reused anywhere..." -msgstr "" - -#: ./src/pyams_portal/zmi/page.py:161 -msgid "Template properties" -msgstr "" - -#: ./src/pyams_portal/zmi/page.py:131 -msgid "You must select which shared template to use!" -msgstr "" - -#: ./src/pyams_portal/zmi/template.py:132 -msgid "Add template" -msgstr "" - -#: ./src/pyams_portal/zmi/template.py:143 -#: ./src/pyams_portal/zmi/container.py:64 -#: ./src/pyams_portal/zmi/container.py:93 -msgid "Portal templates" -msgstr "" - -#: ./src/pyams_portal/zmi/template.py:144 -msgid "Add shared template" -msgstr "" - -#: ./src/pyams_portal/zmi/template.py:60 -msgid "Presentation template" -msgstr "" - -#: ./src/pyams_portal/zmi/template.py:167 ./src/pyams_portal/zmi/layout.py:281 -#: ./src/pyams_portal/zmi/layout.py:661 -msgid "Specified name is already used!" -msgstr "" - -#: ./src/pyams_portal/zmi/template.py:111 ./src/pyams_portal/zmi/layout.py:240 -#: ./src/pyams_portal/zmi/layout.py:337 ./src/pyams_portal/zmi/layout.py:421 -#, python-format -msgid "« {0} » portal template" -msgstr "" - -#: ./src/pyams_portal/zmi/template.py:87 -#, python-format -msgid "{0} (local template)" -msgstr "" - #: ./src/pyams_portal/zmi/layout.py:81 msgid "Properties" msgstr "" @@ -348,6 +317,11 @@ msgid "{{ missing portlet }}" msgstr "" +#: ./src/pyams_portal/zmi/layout.py:281 ./src/pyams_portal/zmi/layout.py:661 +#: ./src/pyams_portal/zmi/template.py:167 +msgid "Specified name is already used!" +msgstr "" + #: ./src/pyams_portal/zmi/layout.py:103 msgid "Inherited local template configuration" msgstr "" @@ -359,6 +333,12 @@ " row" msgstr "" +#: ./src/pyams_portal/zmi/layout.py:240 ./src/pyams_portal/zmi/layout.py:337 +#: ./src/pyams_portal/zmi/layout.py:421 ./src/pyams_portal/zmi/template.py:111 +#, python-format +msgid "« {0} » portal template" +msgstr "" + #: ./src/pyams_portal/zmi/layout.py:342 #, python-format msgid "Edit « {0} » slot properties" @@ -378,24 +358,47 @@ msgid "Row ID must be between 1 and {0}!" msgstr "" -#: ./src/pyams_portal/zmi/container.py:102 -msgid "Shared portal templates" +#: ./src/pyams_portal/zmi/template.py:132 +msgid "Add template" +msgstr "" + +#: ./src/pyams_portal/zmi/template.py:144 +msgid "Add shared template" msgstr "" -#: ./src/pyams_portal/zmi/container.py:139 -msgid "Delete template" +#: ./src/pyams_portal/zmi/template.py:60 +msgid "Presentation template" +msgstr "" + +#: ./src/pyams_portal/zmi/template.py:87 +#, python-format +msgid "{0} (local template)" +msgstr "" + +#: ./src/pyams_portal/zmi/page.py:65 +msgid "Presentation" msgstr "" -#: ./src/pyams_portal/zmi/container.py:189 -msgid "Selected portlets..." +#: ./src/pyams_portal/zmi/page.py:87 +msgid "Edit template configuration" +msgstr "" + +#: ./src/pyams_portal/zmi/page.py:88 +msgid "Inherit parent template" msgstr "" -#: ./src/pyams_portal/zmi/container.py:208 -msgid "Portal templates container" +#: ./src/pyams_portal/zmi/page.py:145 +msgid "" +"If you choose a shared template, you can only adjust settings of each portlet individually but can't change portlets list or page configuration.\n" +"If you use a local template, you can define a whole custom configuration but the template definition can't be reused anywhere..." msgstr "" -#: ./src/pyams_portal/zmi/container.py:209 -msgid "Edit selected portlets" +#: ./src/pyams_portal/zmi/page.py:161 +msgid "Template properties" +msgstr "" + +#: ./src/pyams_portal/zmi/page.py:131 +msgid "You must select which shared template to use!" msgstr "" #: ./src/pyams_portal/zmi/templates/portlet.pt:137 @@ -411,18 +414,6 @@ msgid "Tab label" msgstr "" -#: ./src/pyams_portal/zmi/templates/template-properties.pt:59 -msgid "Use shared template" -msgstr "" - -#: ./src/pyams_portal/zmi/templates/template-properties.pt:65 -msgid "Selected template" -msgstr "" - -#: ./src/pyams_portal/zmi/templates/template-properties.pt:79 -msgid "Use custom local template" -msgstr "" - #: ./src/pyams_portal/zmi/templates/layout.pt:24 msgid "Add row
Drag and drop button to page template to position new row" msgstr "" @@ -492,53 +483,20 @@ msgid "Delete portlet..." msgstr "" -#: ./src/pyams_portal/portlets/image/__init__.py:58 -msgid "Image" -msgstr "" - -#: ./src/pyams_portal/portlets/image/interfaces.py:30 -msgid "Selected image" -msgstr "" - -#: ./src/pyams_portal/portlets/image/skin/__init__.py:37 -msgid "Responsive image renderer" -msgstr "" - -#: ./src/pyams_portal/portlets/spacer/__init__.py:39 -msgid "Spacer" -msgstr "" - -#: ./src/pyams_portal/portlets/spacer/interfaces.py:29 -msgid "Transparent spacer?" -msgstr "" - -#: ./src/pyams_portal/portlets/spacer/interfaces.py:30 -msgid "If 'no', spacer background will be defined by selected color" +#: ./src/pyams_portal/zmi/templates/template-properties.pt:59 +msgid "Use shared template" msgstr "" -#: ./src/pyams_portal/portlets/spacer/interfaces.py:34 -msgid "Background color" -msgstr "" - -#: ./src/pyams_portal/portlets/spacer/interfaces.py:35 -msgid "Color selected for background, if transparency is disabled" -msgstr "" - -#: ./src/pyams_portal/portlets/spacer/interfaces.py:39 -msgid "Horizontal ruler?" +#: ./src/pyams_portal/zmi/templates/template-properties.pt:65 +msgid "Selected template" msgstr "" -#: ./src/pyams_portal/portlets/spacer/interfaces.py:40 -msgid "" -"If 'yes', an horizontal ruler will be displayed in the middle of the spacer" +#: ./src/pyams_portal/zmi/templates/template-properties.pt:79 +msgid "Use custom local template" msgstr "" -#: ./src/pyams_portal/portlets/spacer/skin/__init__.py:54 -msgid "Default spacer" -msgstr "" - -#: ./src/pyams_portal/portlets/spacer/skin/__init__.py:65 -msgid "Double spacer" +#: ./src/pyams_portal/skin/__init__.py:36 +msgid "Hidden portlet" msgstr "" #: ./src/pyams_portal/portlets/html/__init__.py:52 @@ -580,6 +538,51 @@ msgid "Default text renderer" msgstr "" -#: ./src/pyams_portal/skin/__init__.py:36 -msgid "Hidden portlet" +#: ./src/pyams_portal/portlets/spacer/__init__.py:39 +msgid "Spacer" +msgstr "" + +#: ./src/pyams_portal/portlets/spacer/interfaces.py:29 +msgid "Transparent spacer?" +msgstr "" + +#: ./src/pyams_portal/portlets/spacer/interfaces.py:30 +msgid "If 'no', spacer background will be defined by selected color" +msgstr "" + +#: ./src/pyams_portal/portlets/spacer/interfaces.py:34 +msgid "Background color" +msgstr "" + +#: ./src/pyams_portal/portlets/spacer/interfaces.py:35 +msgid "Color selected for background, if transparency is disabled" +msgstr "" + +#: ./src/pyams_portal/portlets/spacer/interfaces.py:39 +msgid "Horizontal ruler?" msgstr "" + +#: ./src/pyams_portal/portlets/spacer/interfaces.py:40 +msgid "" +"If 'yes', an horizontal ruler will be displayed in the middle of the spacer" +msgstr "" + +#: ./src/pyams_portal/portlets/spacer/skin/__init__.py:54 +msgid "Default spacer" +msgstr "" + +#: ./src/pyams_portal/portlets/spacer/skin/__init__.py:65 +msgid "Double spacer" +msgstr "" + +#: ./src/pyams_portal/portlets/image/__init__.py:58 +msgid "Image" +msgstr "" + +#: ./src/pyams_portal/portlets/image/interfaces.py:30 +msgid "Selected image" +msgstr "" + +#: ./src/pyams_portal/portlets/image/skin/__init__.py:37 +msgid "Responsive image renderer" +msgstr ""