# HG changeset patch # User Thierry Florac # Date 1499862307 -7200 # Node ID f30ee9996da9b6dfa41d35e46bb1b26301648009 # Parent 2cbfaf8aa7592b40c0ee59a4651bad17fc2f2e69 Version 0.1.5 diff -r 2cbfaf8aa759 -r f30ee9996da9 buildout.cfg --- a/buildout.cfg Wed Jul 12 11:59:03 2017 +0200 +++ b/buildout.cfg Wed Jul 12 14:25:07 2017 +0200 @@ -92,4 +92,4 @@ eggs = pyams_content [test] [versions] -pyams_content = 0.1.4 +pyams_content = 0.1.5 diff -r 2cbfaf8aa759 -r f30ee9996da9 docs/HISTORY.txt --- a/docs/HISTORY.txt Wed Jul 12 11:59:03 2017 +0200 +++ b/docs/HISTORY.txt Wed Jul 12 14:25:07 2017 +0200 @@ -1,6 +1,25 @@ History ======= +0.1.5 +----- + - une generic function to generate all shared tools (pyams_content.generations) + - use dynamic dialog class based on background image width in image maps adding and editing forms + - add check against empty URLs before rendering imape map areas + - add constants for role names + - add workflow date indexes + - add role for templates managers + - add content publication properties subform + - added readonly attributes for creation and last modification labels of shared contents + - added content "push end date" and controls on publication effective and expiration dates + - added base of view content portlet + - changed content header to remove link to "new version" when the only version is in "retired" state + - changed content summary view + - moved news publication attributes to default workflow publication interface + - use different messages in content deletion form if removed version is the first one or not + - use simple adapter to get workflow associated with a given tool + - set body of HTML paragraphs as not required + 0.1.4 ----- - added content review features diff -r 2cbfaf8aa759 -r f30ee9996da9 setup.py --- a/setup.py Wed Jul 12 11:59:03 2017 +0200 +++ b/setup.py Wed Jul 12 14:25:07 2017 +0200 @@ -22,7 +22,7 @@ README = os.path.join(DOCS, 'README.txt') HISTORY = os.path.join(DOCS, 'HISTORY.txt') -version = '0.1.4' +version = '0.1.5' long_description = open(README).read() + '\n\n' + open(HISTORY).read() tests_require = [] @@ -96,6 +96,9 @@ 'zope.traversing' ], entry_points={ + 'console_scripts': [ + 'pyams_index = pyams_content.scripts.index:index_site' + ], 'fanstatic.libraries': [ 'pyams_content = pyams_content.skin:library' ] diff -r 2cbfaf8aa759 -r f30ee9996da9 src/pyams_content.egg-info/PKG-INFO --- a/src/pyams_content.egg-info/PKG-INFO Wed Jul 12 11:59:03 2017 +0200 +++ b/src/pyams_content.egg-info/PKG-INFO Wed Jul 12 14:25:07 2017 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pyams-content -Version: 0.1.4 +Version: 0.1.5 Summary: PyAMS base content interfaces and classes Home-page: http://hg.ztfy.org/pyams/pyams_content Author: Thierry Florac @@ -11,6 +11,25 @@ History ======= + 0.1.5 + ----- + - une generic function to generate all shared tools (pyams_content.generations) + - use dynamic dialog class based on background image width in image maps adding and editing forms + - add check against empty URLs before rendering imape map areas + - add constants for role names + - add workflow date indexes + - add role for templates managers + - add content publication properties subform + - added readonly attributes for creation and last modification labels of shared contents + - added content "push end date" and controls on publication effective and expiration dates + - added base of view content portlet + - changed content header to remove link to "new version" when the only version is in "retired" state + - changed content summary view + - moved news publication attributes to default workflow publication interface + - use different messages in content deletion form if removed version is the first one or not + - use simple adapter to get workflow associated with a given tool + - set body of HTML paragraphs as not required + 0.1.4 ----- - added content review features diff -r 2cbfaf8aa759 -r f30ee9996da9 src/pyams_content.egg-info/SOURCES.txt --- a/src/pyams_content.egg-info/SOURCES.txt Wed Jul 12 11:59:03 2017 +0200 +++ b/src/pyams_content.egg-info/SOURCES.txt Wed Jul 12 14:25:07 2017 +0200 @@ -93,6 +93,8 @@ src/pyams_content/root/zmi/__init__.py src/pyams_content/root/zmi/search.py src/pyams_content/root/zmi/templates/dashboard.pt +src/pyams_content/scripts/__init__.py +src/pyams_content/scripts/index.py src/pyams_content/shared/__init__.py src/pyams_content/shared/blog/__init__.py src/pyams_content/shared/blog/manager.py @@ -161,17 +163,26 @@ src/pyams_content/shared/news/manager.py src/pyams_content/shared/news/interfaces/__init__.py src/pyams_content/shared/news/zmi/__init__.py -src/pyams_content/shared/news/zmi/properties.py src/pyams_content/shared/site/__init__.py src/pyams_content/shared/site/interfaces/__init__.py src/pyams_content/shared/site/zmi/__init__.py src/pyams_content/shared/view/__init__.py src/pyams_content/shared/view/manager.py src/pyams_content/shared/view/reference.py +src/pyams_content/shared/view/theme.py src/pyams_content/shared/view/interfaces/__init__.py +src/pyams_content/shared/view/portlet/__init__.py +src/pyams_content/shared/view/portlet/interfaces.py +src/pyams_content/shared/view/portlet/templates/view-items-list.pt +src/pyams_content/shared/view/portlet/templates/view-with-images-list.pt +src/pyams_content/shared/view/portlet/zmi/__init__.py +src/pyams_content/shared/view/portlet/zmi/templates/view-items-list-preview.pt src/pyams_content/shared/view/zmi/__init__.py src/pyams_content/shared/view/zmi/properties.py src/pyams_content/shared/view/zmi/reference.py +src/pyams_content/shared/view/zmi/summary.py +src/pyams_content/shared/view/zmi/theme.py +src/pyams_content/shared/view/zmi/templates/summary.pt src/pyams_content/shared/zmi/__init__.py src/pyams_content/shared/zmi/sites.py src/pyams_content/shared/zmi/interfaces/__init__.py diff -r 2cbfaf8aa759 -r f30ee9996da9 src/pyams_content.egg-info/entry_points.txt --- a/src/pyams_content.egg-info/entry_points.txt Wed Jul 12 11:59:03 2017 +0200 +++ b/src/pyams_content.egg-info/entry_points.txt Wed Jul 12 14:25:07 2017 +0200 @@ -1,3 +1,6 @@ +[console_scripts] +pyams_index = pyams_content.scripts.index:index_site + [fanstatic.libraries] pyams_content = pyams_content.skin:library diff -r 2cbfaf8aa759 -r f30ee9996da9 src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.mo Binary file src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.mo has changed diff -r 2cbfaf8aa759 -r f30ee9996da9 src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po --- a/src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po Wed Jul 12 11:59:03 2017 +0200 +++ b/src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po Wed Jul 12 14:25:07 2017 +0200 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2017-05-16 11:49+0200\n" +"POT-Creation-Date: 2017-07-06 15:36+0200\n" "PO-Revision-Date: 2015-09-10 10:42+0200\n" "Last-Translator: Thierry Florac \n" "Language-Team: French\n" @@ -113,7 +113,7 @@ #: src/pyams_content/shared/common/zmi/dashboard.py:106 #: src/pyams_content/shared/common/zmi/templates/advanced-search.pt:188 #: src/pyams_content/shared/imagemap/zmi/container.py:121 -#: src/pyams_content/interfaces/__init__.py:54 +#: src/pyams_content/interfaces/__init__.py:70 msgid "Title" msgstr "Titre" @@ -195,7 +195,7 @@ #: src/pyams_content/component/gallery/interfaces/__init__.py:90 #: src/pyams_content/component/extfile/interfaces/__init__.py:45 #: src/pyams_content/component/links/interfaces/__init__.py:47 -#: src/pyams_content/shared/common/interfaces/__init__.py:113 +#: src/pyams_content/shared/common/interfaces/__init__.py:119 msgid "Description" msgstr "Description" @@ -376,6 +376,7 @@ msgstr "Liste des fichiers joints associés à cet objet" #: src/pyams_content/component/paragraph/zmi/summary.py:46 +#: src/pyams_content/shared/view/zmi/summary.py:44 #: src/pyams_content/shared/imagemap/zmi/summary.py:44 msgid "Quick preview" msgstr "Aperçu" @@ -495,6 +496,7 @@ #: src/pyams_content/component/theme/zmi/__init__.py:52 #: src/pyams_content/component/theme/zmi/manager.py:45 +#: src/pyams_content/shared/view/zmi/theme.py:49 msgid "Themes..." msgstr "Thèmes..." @@ -645,12 +647,26 @@ msgid "List of internal or external links linked to this object" msgstr "Liste des liens internes ou externes associés à cet objet" -#: src/pyams_content/shared/common/review.py:204 +#: src/pyams_content/component/links/interfaces/__init__.py:122 +msgid "Internal references" +msgstr "Références internes" + +#: src/pyams_content/component/links/interfaces/__init__.py:123 +msgid "List of internal references" +msgstr "Liste de références internes imposées dans la vue" + +#: src/pyams_content/shared/common/__init__.py:126 +#: src/pyams_content/shared/common/__init__.py:134 +#, python-format +msgid "{date} by {principal}" +msgstr "{date} par {principal}" + +#: src/pyams_content/shared/common/review.py:209 #, python-format msgid "A new comment was added on content « {0} »" msgstr "Un nouveau commentaire a été ajouté pour le contenu « {0} »" -#: src/pyams_content/shared/common/review.py:161 +#: src/pyams_content/shared/common/review.py:166 #, python-format msgid "[{service_name}] A content review is requested" msgstr "[{service_name}] Demande de relecture" @@ -693,88 +709,84 @@ msgid "Modified before..." msgstr "et le" -#: src/pyams_content/shared/common/zmi/properties.py:54 +#: src/pyams_content/shared/common/zmi/properties.py:57 msgid "Composition" msgstr "Composition" -#: src/pyams_content/shared/common/zmi/properties.py:64 +#: src/pyams_content/shared/common/zmi/properties.py:67 #: src/pyams_content/shared/common/zmi/manager.py:90 msgid "Properties" msgstr "Propriétés" -#: src/pyams_content/shared/common/zmi/properties.py:75 +#: src/pyams_content/shared/common/zmi/properties.py:78 msgid "Content properties" msgstr "Propriétés élémentaires" -#: src/pyams_content/shared/common/zmi/workflow.py:68 -msgid "Workflow" -msgstr "Workflow" - -#: src/pyams_content/shared/common/zmi/workflow.py:79 -msgid "Workflow details" -msgstr "Détails du workflow" - -#: src/pyams_content/shared/common/zmi/workflow.py:172 -#: src/pyams_content/shared/common/zmi/workflow.py:244 -#: src/pyams_content/shared/common/zmi/workflow.py:289 -#: src/pyams_content/shared/common/zmi/workflow.py:347 -#: src/pyams_content/shared/common/zmi/workflow.py:421 -#: src/pyams_content/shared/common/zmi/workflow.py:481 -#: src/pyams_content/shared/common/zmi/workflow.py:526 -#: src/pyams_content/shared/common/zmi/workflow.py:572 -#: src/pyams_content/shared/common/zmi/workflow.py:632 -#: src/pyams_content/shared/common/zmi/workflow.py:677 -#: src/pyams_content/shared/common/zmi/workflow.py:723 -#: src/pyams_content/shared/common/zmi/workflow.py:776 +#: src/pyams_content/shared/common/zmi/properties.py:110 +msgid "Publication settings" +msgstr "Dates de publication et de retrait" + +#: src/pyams_content/shared/common/zmi/workflow.py:116 +#: src/pyams_content/shared/common/zmi/workflow.py:201 +#: src/pyams_content/shared/common/zmi/workflow.py:246 +#: src/pyams_content/shared/common/zmi/workflow.py:304 +#: src/pyams_content/shared/common/zmi/workflow.py:384 +#: src/pyams_content/shared/common/zmi/workflow.py:444 +#: src/pyams_content/shared/common/zmi/workflow.py:489 +#: src/pyams_content/shared/common/zmi/workflow.py:535 +#: src/pyams_content/shared/common/zmi/workflow.py:583 +#: src/pyams_content/shared/common/zmi/workflow.py:628 +#: src/pyams_content/shared/common/zmi/workflow.py:674 +#: src/pyams_content/shared/common/zmi/workflow.py:727 #: src/pyams_content/shared/common/zmi/__init__.py:249 #: src/pyams_content/shared/common/zmi/owner.py:74 #: src/pyams_content/shared/common/zmi/review.py:90 msgid "Cancel" msgstr "Annuler" -#: src/pyams_content/shared/common/zmi/workflow.py:173 +#: src/pyams_content/shared/common/zmi/workflow.py:117 msgid "Request publication" msgstr "Demander la publication" -#: src/pyams_content/shared/common/zmi/workflow.py:245 +#: src/pyams_content/shared/common/zmi/workflow.py:202 #: src/pyams_content/workflow/__init__.py:259 msgid "Cancel publication request" msgstr "Annuler la demande de publication" -#: src/pyams_content/shared/common/zmi/workflow.py:290 +#: src/pyams_content/shared/common/zmi/workflow.py:247 msgid "Refuse publication request" msgstr "Refuser la demande de publication" -#: src/pyams_content/shared/common/zmi/workflow.py:348 +#: src/pyams_content/shared/common/zmi/workflow.py:305 msgid "Publish" msgstr "Publier" -#: src/pyams_content/shared/common/zmi/workflow.py:422 +#: src/pyams_content/shared/common/zmi/workflow.py:385 msgid "Request retire" msgstr "Demander le retrait" -#: src/pyams_content/shared/common/zmi/workflow.py:482 +#: src/pyams_content/shared/common/zmi/workflow.py:445 msgid "Cancel retire request" msgstr "Annuler la demande de retrait" -#: src/pyams_content/shared/common/zmi/workflow.py:527 +#: src/pyams_content/shared/common/zmi/workflow.py:490 msgid "Retire" msgstr "Retirer" -#: src/pyams_content/shared/common/zmi/workflow.py:573 +#: src/pyams_content/shared/common/zmi/workflow.py:536 #: src/pyams_content/workflow/__init__.py:371 msgid "Request archive" msgstr "Demander l'archivage" -#: src/pyams_content/shared/common/zmi/workflow.py:633 +#: src/pyams_content/shared/common/zmi/workflow.py:584 msgid "Cancel archive request" msgstr "Annuler la demande d'archivage" -#: src/pyams_content/shared/common/zmi/workflow.py:678 +#: src/pyams_content/shared/common/zmi/workflow.py:629 msgid "Archive" msgstr "Archiver" -#: src/pyams_content/shared/common/zmi/workflow.py:724 +#: src/pyams_content/shared/common/zmi/workflow.py:675 #: src/pyams_content/workflow/__init__.py:436 #: src/pyams_content/workflow/__init__.py:448 #: src/pyams_content/workflow/__init__.py:460 @@ -783,33 +795,36 @@ msgid "Create new version" msgstr "Créer une nouvelle version" -#: src/pyams_content/shared/common/zmi/workflow.py:777 +#: src/pyams_content/shared/common/zmi/workflow.py:728 #: src/pyams_content/workflow/__init__.py:496 msgid "Delete version" msgstr "Supprimer cette version" -#: src/pyams_content/shared/common/zmi/workflow.py:212 -#: src/pyams_content/shared/common/zmi/workflow.py:391 +#: src/pyams_content/shared/common/zmi/workflow.py:167 +#: src/pyams_content/shared/common/zmi/workflow.py:352 msgid "Publication start date is required" msgstr "La date de début de publication est obligatoire" -#: src/pyams_content/shared/common/zmi/workflow.py:215 -#: src/pyams_content/shared/common/zmi/workflow.py:317 -#: src/pyams_content/shared/common/zmi/workflow.py:452 -#: src/pyams_content/shared/common/zmi/workflow.py:603 +#: src/pyams_content/shared/common/zmi/workflow.py:170 +#: src/pyams_content/shared/common/zmi/workflow.py:274 +#: src/pyams_content/shared/common/zmi/workflow.py:415 msgid "A comment is required" msgstr "Le commentaire est obligatoire" -#: src/pyams_content/shared/common/zmi/workflow.py:793 +#: src/pyams_content/shared/common/zmi/workflow.py:751 +msgid "Delete content" +msgstr "Supprimer définitivement ce contenu" + +#: src/pyams_content/shared/common/zmi/workflow.py:760 msgid "Delete definitively" msgstr "Supprimer définitivement" -#: src/pyams_content/shared/common/zmi/workflow.py:137 +#: src/pyams_content/shared/common/zmi/workflow.py:81 #, python-format msgid "{state} | by {principal}" msgstr "{state} | par {principal}" -#: src/pyams_content/shared/common/zmi/workflow.py:133 +#: src/pyams_content/shared/common/zmi/workflow.py:77 #: src/pyams_content/workflow/__init__.py:551 #: src/pyams_content/workflow/__init__.py:574 #, python-format @@ -841,27 +856,49 @@ msgid "Created or modified in this version" msgstr "Créé ou modifié dans cette version" -#: src/pyams_content/shared/common/zmi/summary.py:50 +#: src/pyams_content/shared/common/zmi/summary.py:49 msgid "Display content summary" msgstr "Récapitulatif pour ce contenu" -#: src/pyams_content/shared/common/zmi/summary.py:74 +#: src/pyams_content/shared/common/zmi/summary.py:73 msgid "Identity card" msgstr "Carte d'identité" -#: src/pyams_content/shared/common/zmi/summary.py:86 -msgid "About this version" -msgstr "À propos de cette version" - -#: src/pyams_content/shared/common/zmi/summary.py:124 +#: src/pyams_content/shared/common/zmi/summary.py:85 +msgid "Requested action" +msgstr "Évolution demandée" + +#: src/pyams_content/shared/common/zmi/summary.py:125 +msgid "Publication and retire dates" +msgstr "Rappel des dates de publication et de retrait" + +#: src/pyams_content/shared/common/zmi/summary.py:138 +msgid "Current version" +msgstr "Version actuelle" + +#: src/pyams_content/shared/common/zmi/summary.py:168 msgid "Content history" msgstr "Historique de ce contenu" -#: src/pyams_content/shared/common/zmi/summary.py:109 +#: src/pyams_content/shared/common/zmi/summary.py:115 +msgid "Associated comment" +msgstr "Commentaire associé" + +#: src/pyams_content/shared/common/zmi/summary.py:150 #: src/pyams_content/shared/common/zmi/dashboard.py:144 msgid "Version" msgstr "Version" +#: src/pyams_content/shared/common/zmi/summary.py:106 +#, python-format +msgid "{state} {date} by {principal}" +msgstr "{state} {date} par {principal}" + +#: src/pyams_content/shared/common/zmi/summary.py:156 +#, python-format +msgid "{state} since {date}, by {principal}" +msgstr "{state} depuis {date}, par {principal}" + #: src/pyams_content/shared/common/zmi/manager.py:76 msgid "Tool management" msgstr "Gérer l'outil partagé" @@ -1308,11 +1345,11 @@ msgid "since {date}" msgstr "depuis {date}" -#: src/pyams_content/shared/common/zmi/header.py:117 +#: src/pyams_content/shared/common/zmi/header.py:118 msgid "access new version" msgstr "accéder à la nouvelle version en préparation" -#: src/pyams_content/shared/common/zmi/header.py:126 +#: src/pyams_content/shared/common/zmi/header.py:129 msgid "access published version" msgstr "accéder à la version en ligne" @@ -1359,8 +1396,9 @@ "After archiving, it will be backed up but you will not be able to publish it " "again except by creating a new version." msgstr "" -"Après l'archivage, il sera conservé mais vous ne pourrez plus le publier à " -"nouveau, sauf en créant une nouvelle version." +"L'archivage permet de conserver une version d'un contenu dans son état " +"actuel ; il pourra ensuite à nouveau être publié, en créant une nouvelle " +"version." #: src/pyams_content/shared/common/zmi/templates/dashboard.pt:18 msgid "Quick search..." @@ -1403,8 +1441,8 @@ "A unique number is also going to be assigned to it. This number will be " "shared by all content's versions." msgstr "" -"Un numéro unique lui sera également attribué ; ce numéro sera conservé " -"pendant toute la vie du contenu, quelle que soit la version." +"Un numéro unique va lui être attribué ; il sera permanent, quelle que soit " +"la version." #: src/pyams_content/shared/common/zmi/templates/wf-operator-warning.pt:1 msgid "" @@ -1416,17 +1454,15 @@ #: src/pyams_content/shared/common/zmi/templates/wf-clone-message.pt:2 msgid "You considerate that the currently published must evolve." -msgstr "" -"Vous considérez que la version actuellement en ligne de ce contenu doit " -"évoluer." +msgstr "Vous considérez que la version actuelle de ce contenu doit évoluer." #: src/pyams_content/shared/common/zmi/templates/wf-clone-message.pt:3 msgid "" "By creating a new version, you can update it's content without impacting the " "currently published one." msgstr "" -"En créant une nouvelle version, vous allez pouvoir apporter des " -"modifications sans impacter la version actuellement publiée." +"En créant une nouvelle version, vous pourrez apporter des modifications sans " +"impacter la version actuelle." #: src/pyams_content/shared/common/zmi/templates/wf-clone-message.pt:5 msgid "" @@ -1434,8 +1470,8 @@ "publication request to replace the currently published version (which will " "be archived automatically)." msgstr "" -"Lorsque la nouvelle version sera prête, vous pourrez demander sa publication " -"(et la version actuellement en ligne sera automatiquement archivée)." +"Lorsque la nouvelle version sera prête, vous demanderez sa publication (et " +"la version actuelle sera automatiquement archivée)." #: src/pyams_content/shared/common/zmi/templates/wf-propose-message.pt:1 msgid "" @@ -1524,7 +1560,7 @@ "published again, or archived." msgstr "" "Après ce retrait, il ne sera plus visible des internautes. Il pourra par " -"contre être modifié, pour être publié à nouveau, ou archivé." +"contre être modifié, pour être publié à nouveau ; ou être archivé." #: src/pyams_content/shared/common/zmi/templates/review-add-comment.pt:11 msgid "just now" @@ -1535,13 +1571,21 @@ "After canceling the request, you will be able to update the content again." msgstr "En annulant cette demande, ce contenu pourra à nouveau être modifié." -#: src/pyams_content/shared/common/zmi/templates/wf-delete-message.pt:1 +#: src/pyams_content/shared/common/zmi/templates/wf-delete-message.pt:2 +msgid "" +"This content was never published. If you confirm deletion, it won't be " +"possible to restore it." +msgstr "" +"Ce contenu n'a jamais été publié. Une fois supprimé, il ne pourra pas être " +"récupéré." + +#: src/pyams_content/shared/common/zmi/templates/wf-delete-message.pt:6 msgid "" "The content version is going to be definitely deleted. Will only remain the " "currently published version." msgstr "" -"Cette version de ce contenu va être définitivement supprimée. Seule la " -"version actuellement publiée sera conservée." +"Cette version va être définitivement supprimée. Seule la version " +"actuellement publiée sera conservée." #: src/pyams_content/shared/common/zmi/templates/review-notification.pt:4 msgid "[${service_name}] You are requested for a content review" @@ -1633,12 +1677,12 @@ "d'accès des contributeurs" #: src/pyams_content/shared/common/interfaces/__init__.py:77 -#: src/pyams_content/shared/common/interfaces/__init__.py:138 +#: src/pyams_content/shared/common/interfaces/__init__.py:144 msgid "Managers" msgstr "Responsables" #: src/pyams_content/shared/common/interfaces/__init__.py:78 -#: src/pyams_content/shared/common/interfaces/__init__.py:139 +#: src/pyams_content/shared/common/interfaces/__init__.py:145 msgid "" "Managers can handle main operations in tool's workflow, like publish or " "retire contents" @@ -1648,7 +1692,7 @@ "restrictions qui leur sont imposées" #: src/pyams_content/shared/common/interfaces/__init__.py:83 -#: src/pyams_content/shared/common/interfaces/__init__.py:144 +#: src/pyams_content/shared/common/interfaces/__init__.py:150 msgid "Contributors" msgstr "Contributeurs" @@ -1677,22 +1721,30 @@ msgstr "Nom de l'utilisateur ayant créé la première version" #: src/pyams_content/shared/common/interfaces/__init__.py:105 +msgid "Version creation" +msgstr "Création de cette version" + +#: src/pyams_content/shared/common/interfaces/__init__.py:108 msgid "Version modifiers" -msgstr "Intervenants" - -#: src/pyams_content/shared/common/interfaces/__init__.py:106 -msgid "List of principals who modified this content" -msgstr "Liste des utilisateurs qui sont intervenus sur ce contenu" +msgstr "Intervenants sur cette version" #: src/pyams_content/shared/common/interfaces/__init__.py:109 +msgid "List of principals who modified this content" +msgstr "Liste des utilisateurs qui sont intervenus sur ce contenu" + +#: src/pyams_content/shared/common/interfaces/__init__.py:112 msgid "Last modifier" msgstr "Dernier intervenant" -#: src/pyams_content/shared/common/interfaces/__init__.py:110 +#: src/pyams_content/shared/common/interfaces/__init__.py:113 msgid "Last principal who modified this content" msgstr "Dernier utilisateur étant intervenu sur ce contenu" -#: src/pyams_content/shared/common/interfaces/__init__.py:114 +#: src/pyams_content/shared/common/interfaces/__init__.py:116 +msgid "Last update" +msgstr "Dernière modification" + +#: src/pyams_content/shared/common/interfaces/__init__.py:120 msgid "" "The content's description is 'hidden' into HTML's page headers; but it can " "be seen, for example, in some search engines results as content's description" @@ -1701,29 +1753,29 @@ "mais on peut la retrouver, par exemple, dans les listes de résultats des " "moteurs de recherche comme Google" -#: src/pyams_content/shared/common/interfaces/__init__.py:119 +#: src/pyams_content/shared/common/interfaces/__init__.py:125 msgid "Keywords" msgstr "Mots-clés" -#: src/pyams_content/shared/common/interfaces/__init__.py:120 +#: src/pyams_content/shared/common/interfaces/__init__.py:126 msgid "They will be included into HTML pages metadata" msgstr "Ces mots-clés seront intégrés dans les métadonnées des pages HTML" -#: src/pyams_content/shared/common/interfaces/__init__.py:123 +#: src/pyams_content/shared/common/interfaces/__init__.py:129 msgid "Notepad" -msgstr "Bloc-notes" - -#: src/pyams_content/shared/common/interfaces/__init__.py:124 +msgstr "Commentaire" + +#: src/pyams_content/shared/common/interfaces/__init__.py:130 msgid "Internal information to be known about this content" msgstr "" "Pour prendre note d'informations internes utiles ou importantes à propos de " "ce contenu" -#: src/pyams_content/shared/common/interfaces/__init__.py:131 +#: src/pyams_content/shared/common/interfaces/__init__.py:137 msgid "Content owner" msgstr "Propriétaire" -#: src/pyams_content/shared/common/interfaces/__init__.py:132 +#: src/pyams_content/shared/common/interfaces/__init__.py:138 msgid "" "The owner is the creator of content's first version, except if it was " "transferred afterwards to another owner" @@ -1732,7 +1784,7 @@ "lorsque cette propriété a été transférée à un autre utilisateur après coup. " "Les contenus archivés ne sont plus transférables." -#: src/pyams_content/shared/common/interfaces/__init__.py:145 +#: src/pyams_content/shared/common/interfaces/__init__.py:151 msgid "" "Contributors are users which are allowed to update this content in addition " "to it's owner" @@ -1740,11 +1792,11 @@ "Les contributeurs sont autorisés, en plus du propriétaire, à modifier ce " "contenu" -#: src/pyams_content/shared/common/interfaces/__init__.py:150 +#: src/pyams_content/shared/common/interfaces/__init__.py:156 msgid "Readers" msgstr "Relecteurs" -#: src/pyams_content/shared/common/interfaces/__init__.py:151 +#: src/pyams_content/shared/common/interfaces/__init__.py:157 msgid "" "Readers are users which are asked to verify and comment contents before they " "are published" @@ -1752,26 +1804,26 @@ "Les relecteurs sont des utilisateurs qui sont sollicités pour vérifier et " "commenter un contenu avant sa publication" -#: src/pyams_content/shared/common/interfaces/__init__.py:156 +#: src/pyams_content/shared/common/interfaces/__init__.py:162 msgid "Guests" msgstr "Invités" -#: src/pyams_content/shared/common/interfaces/__init__.py:157 +#: src/pyams_content/shared/common/interfaces/__init__.py:163 msgid "" "Guests are users which are allowed to view contents with restricted access" msgstr "" "Les invités sont autorisés à consulter des contenus dont l'accès a été " "restreint" -#: src/pyams_content/shared/common/interfaces/__init__.py:176 +#: src/pyams_content/shared/common/interfaces/__init__.py:182 msgid "Principal ID" msgstr "ID utilisateur" -#: src/pyams_content/shared/common/interfaces/__init__.py:181 +#: src/pyams_content/shared/common/interfaces/__init__.py:187 msgid "Restricted contents" msgstr "Accès restreints" -#: src/pyams_content/shared/common/interfaces/__init__.py:182 +#: src/pyams_content/shared/common/interfaces/__init__.py:188 msgid "" "If 'yes', this manager will get restricted access to manage contents based " "on selected settings" @@ -1779,11 +1831,11 @@ "Si 'oui', ce responsable n'aura qu'un accès restreint à certains contenus en " "fonction de paramètres spécifiques" -#: src/pyams_content/shared/common/interfaces/__init__.py:187 +#: src/pyams_content/shared/common/interfaces/__init__.py:193 msgid "Selected owners" msgstr "Propriétaires" -#: src/pyams_content/shared/common/interfaces/__init__.py:188 +#: src/pyams_content/shared/common/interfaces/__init__.py:194 msgid "Manager will have access to contents owned by these principals" msgstr "" "Le responsable n'aura accès qu'aux contenus dont ces utilisateurs sont " @@ -1809,10 +1861,6 @@ msgid "Form" msgstr "Formulaire" -#: src/pyams_content/shared/news/zmi/properties.py:38 -msgid "Publication settings" -msgstr "Paramètres de publication" - #: src/pyams_content/shared/news/zmi/__init__.py:44 msgid "This news topic" msgstr "Cette brève" @@ -1827,43 +1875,12 @@ msgid "News topic « {title} »" msgstr "Brève « {title} »" -#: src/pyams_content/shared/news/interfaces/__init__.py:30 +#: src/pyams_content/shared/news/interfaces/__init__.py:27 msgid "News topic" msgstr "Brève" -#: src/pyams_content/shared/news/interfaces/__init__.py:36 -msgid "Display first version date" -msgstr "Date de publication de la première version" - -#: src/pyams_content/shared/news/interfaces/__init__.py:37 -msgid "Display current version date" -msgstr "Date de publication de cette version" - -#: src/pyams_content/shared/news/interfaces/__init__.py:50 -msgid "Displayed publication date" -msgstr "Date de publication affichée" - -#: src/pyams_content/shared/news/interfaces/__init__.py:51 -msgid "The matching date will be displayed in front-office" -msgstr "La date correspondante sera affichée en front-office" - -#: src/pyams_content/shared/news/interfaces/__init__.py:58 -msgid "Push end date" -msgstr "Pousser jusqu'au" - -#: src/pyams_content/shared/news/interfaces/__init__.py:59 -msgid "" -"Some contents can be pushed by components to front-office pages; if you set " -"a date here, this content will not be pushed anymore passed this date, but " -"will still be available via the search engine" -msgstr "" -"Certains composants peuvent 'pousser' des informations vers les pages du " -"front-office ; si vous indiquez une date ici, ce contenu ne sera plus poussé " -"au-delà de cette date, mais restera accessible via le moteur de recherche (à " -"la différence des contenus retirés ou archivés)" - #: src/pyams_content/shared/view/zmi/properties.py:38 -msgid "Contents search settings" +msgid "Main view settings" msgstr "Paramètres de la vue" #: src/pyams_content/shared/view/zmi/__init__.py:44 @@ -1880,75 +1897,123 @@ msgid "View « {title} »" msgstr "Vu « {title} »" +#: src/pyams_content/shared/view/zmi/theme.py:59 +msgid "View themes settings" +msgstr "Paramétrage des thèmes de la vue" + #: src/pyams_content/shared/view/zmi/reference.py:54 msgid "References..." msgstr "Références..." -#: src/pyams_content/shared/view/zmi/reference.py:71 +#: src/pyams_content/shared/view/zmi/reference.py:64 msgid "View internal references settings" msgstr "Références internes de la vue" -#: src/pyams_content/shared/view/zmi/reference.py:62 -msgid "Reset" -msgstr "Annuler" - -#: src/pyams_content/shared/view/zmi/reference.py:63 -msgid "Submit" -msgstr "Enregistrer" - -#: src/pyams_content/shared/view/interfaces/__init__.py:31 +#: src/pyams_content/shared/view/zmi/templates/summary.pt:2 +msgid "View result items" +msgstr "Contenus extraits par la vue" + +#: src/pyams_content/shared/view/portlet/__init__.py:60 +msgid "View items" +msgstr "Contenu d'une vue" + +#: src/pyams_content/shared/view/portlet/__init__.py:73 +msgid "Simple list view" +msgstr "Vue simple d'une liste d'éléments" + +#: src/pyams_content/shared/view/portlet/interfaces.py:30 +msgid "Selected view" +msgstr "Vue sélectionnée" + +#: src/pyams_content/shared/view/portlet/interfaces.py:31 +msgid "Reference to the view from which items are extracted" +msgstr "Référence de la vue depuis laquelle est extraite la liste de contenus" + +#: src/pyams_content/shared/view/interfaces/__init__.py:32 msgid "View" msgstr "Vue" -#: src/pyams_content/shared/view/interfaces/__init__.py:39 -#: src/pyams_content/interfaces/__init__.py:66 +#: src/pyams_content/shared/view/interfaces/__init__.py:40 +#: src/pyams_content/interfaces/__init__.py:82 #: src/pyams_content/interfaces/review.py:67 msgid "Creation date" msgstr "Date de création" -#: src/pyams_content/shared/view/interfaces/__init__.py:40 +#: src/pyams_content/shared/view/interfaces/__init__.py:41 msgid "Last update date" msgstr "Date de dernière modification" -#: src/pyams_content/shared/view/interfaces/__init__.py:41 -msgid "Current publication date" -msgstr "Date de publication de la version actuelle" - #: src/pyams_content/shared/view/interfaces/__init__.py:42 +msgid "Current publication date" +msgstr "Date de publication de la version actuelle" + +#: src/pyams_content/shared/view/interfaces/__init__.py:43 msgid "First publication date" msgstr "Date de première publication" -#: src/pyams_content/shared/view/interfaces/__init__.py:55 +#: src/pyams_content/shared/view/interfaces/__init__.py:124 +msgid "Always include selected internal references" +msgstr "Toujours inclure toutes les références internes" + +#: src/pyams_content/shared/view/interfaces/__init__.py:125 +msgid "Include selected internal references only if empty" +msgstr "Inclure les références internes seulement lorsque la vue est vide" + +#: src/pyams_content/shared/view/interfaces/__init__.py:56 msgid "Content types" msgstr "Types de contenus" -#: src/pyams_content/shared/view/interfaces/__init__.py:56 +#: src/pyams_content/shared/view/interfaces/__init__.py:57 msgid "Selected content types; leave empty for all" msgstr "Types de contenus sélectionnés ; laisser vide pour tous" -#: src/pyams_content/shared/view/interfaces/__init__.py:60 +#: src/pyams_content/shared/view/interfaces/__init__.py:61 msgid "Order by" msgstr "Ordre de tri" -#: src/pyams_content/shared/view/interfaces/__init__.py:61 +#: src/pyams_content/shared/view/interfaces/__init__.py:62 msgid "Property to use to sort results" msgstr "Propriété utilisée pour trier les résultats" -#: src/pyams_content/shared/view/interfaces/__init__.py:66 +#: src/pyams_content/shared/view/interfaces/__init__.py:67 msgid "Reversed order?" msgstr "Ordre inverse ?" -#: src/pyams_content/shared/view/interfaces/__init__.py:67 +#: src/pyams_content/shared/view/interfaces/__init__.py:68 msgid "If 'yes', items order will be reversed" msgstr "Si 'oui', le tri se fera en ordre descendant" -#: src/pyams_content/shared/view/interfaces/__init__.py:97 -msgid "Internal references" -msgstr "Référence internes" - -#: src/pyams_content/shared/view/interfaces/__init__.py:98 -msgid "List of internal references" -msgstr "Liste de références internes imposées dans la vue" +#: src/pyams_content/shared/view/interfaces/__init__.py:72 +msgid "Results count limit" +msgstr "Limite de résultats" + +#: src/pyams_content/shared/view/interfaces/__init__.py:73 +msgid "Maximum number of results that the view may retrieve" +msgstr "Nombre maximal de résultats que la vue doit renvoyer" + +#: src/pyams_content/shared/view/interfaces/__init__.py:134 +msgid "Internal references usage" +msgstr "Utilisation des références internes" + +#: src/pyams_content/shared/view/interfaces/__init__.py:135 +msgid "Specify how selected references are included into view results" +msgstr "" +"Indique comment les références internes indiquées seront intégrées à la " +"liste des résultats" + +#: src/pyams_content/shared/view/interfaces/__init__.py:147 +msgid "Select context themes?" +msgstr "Thèmes du contexte ?" + +#: src/pyams_content/shared/view/interfaces/__init__.py:148 +msgid "If 'yes', themes will be extracted from context" +msgstr "" +"Si 'oui', les thèmes associés au contexte d'application de la vue seront " +"automatiquement sélectionnés" + +#: src/pyams_content/shared/view/interfaces/__init__.py:152 +msgid "Other terms" +msgstr "Autres thèmes" #: src/pyams_content/shared/imagemap/zmi/properties.py:38 msgid "Background image" @@ -1996,15 +2061,15 @@ msgid "Bad query object_name parameter value!" msgstr "Valeur incorrecte du paramètre object_name !" -#: src/pyams_content/shared/imagemap/zmi/area.py:46 +#: src/pyams_content/shared/imagemap/zmi/area.py:47 msgid "Add image area" msgstr "Ajouter une zone" -#: src/pyams_content/shared/imagemap/zmi/area.py:64 +#: src/pyams_content/shared/imagemap/zmi/area.py:65 msgid "Add new image area" msgstr "Ajout d'une zone cliquable" -#: src/pyams_content/shared/imagemap/zmi/area.py:94 +#: src/pyams_content/shared/imagemap/zmi/area.py:108 msgid "Edit image map properties" msgstr "Modifier les propriétés d'une image" @@ -2430,29 +2495,29 @@ msgid "Published version {0}" msgstr "Version {0} publiée" -#: src/pyams_content/interfaces/__init__.py:50 +#: src/pyams_content/interfaces/__init__.py:66 msgid "Unique key" msgstr "Clé unique" -#: src/pyams_content/interfaces/__init__.py:51 +#: src/pyams_content/interfaces/__init__.py:67 msgid "WARNING: this key can't be modified after creation!!!" msgstr "ATTENTION : cette clé ne pourra plus être modifiée !!!" -#: src/pyams_content/interfaces/__init__.py:55 +#: src/pyams_content/interfaces/__init__.py:71 msgid "Visible label used to display content" msgstr "Le titre affiché en front-office" -#: src/pyams_content/interfaces/__init__.py:58 +#: src/pyams_content/interfaces/__init__.py:74 msgid "Short name" msgstr "Titre court" -#: src/pyams_content/interfaces/__init__.py:59 +#: src/pyams_content/interfaces/__init__.py:75 msgid "Short name used in breadcrumbs" msgstr "" "Affiché lorsque le contenu est consulté depuis son site d'origine (s'il a " "été identifié)" -#: src/pyams_content/interfaces/__init__.py:70 +#: src/pyams_content/interfaces/__init__.py:86 msgid "Modification date" msgstr "Dernière modification apportée" @@ -2484,15 +2549,55 @@ msgid "List of principals which reviewed the comment" msgstr "Liste des utilisateurs qui ont apporté des commentaires sur ce contenu" +#~ msgid "Workflow" +#~ msgstr "Workflow" + +#~ msgid "Workflow details" +#~ msgstr "Détails du workflow" + +#~ msgid "About this version" +#~ msgstr "À propos de cette version" + +#~ msgid "Display first version date" +#~ msgstr "Date de publication de la première version" + +#~ msgid "Display current version date" +#~ msgstr "Date de publication de cette version" + +#~ msgid "Displayed publication date" +#~ msgstr "Date de publication affichée" + +#~ msgid "The matching date will be displayed in front-office" +#~ msgstr "La date correspondante sera affichée en front-office" + +#~ msgid "Push end date" +#~ msgstr "Pousser jusqu'au" + +#~ msgid "" +#~ "Some contents can be pushed by components to front-office pages; if you " +#~ "set a date here, this content will not be pushed anymore passed this " +#~ "date, but will still be available via the search engine" +#~ msgstr "" +#~ "Certains composants peuvent 'pousser' des informations vers les pages du " +#~ "front-office ; si vous indiquez une date ici, ce contenu ne sera plus " +#~ "poussé au-delà de cette date, mais restera accessible via le moteur de " +#~ "recherche (à la différence des contenus retirés ou archivés)" + +#~ msgid "Contents search settings" +#~ msgstr "Paramètres de la vue" + +#~ msgid "Reset" +#~ msgstr "Annuler" + +#~ msgid "Submit" +#~ msgstr "Enregistrer" + #~ msgid "Paragraphs" #~ msgstr "Paragraphes" #~ msgid "Illustration properties" #~ msgstr "Propriétés d'une illustration" -#~ msgid "{date} by {principal}" -#~ msgstr "{date} par {principal}" - #~ msgid "Publisher" #~ msgstr "Publié" diff -r 2cbfaf8aa759 -r f30ee9996da9 src/pyams_content/locales/pyams_content.pot --- a/src/pyams_content/locales/pyams_content.pot Wed Jul 12 11:59:03 2017 +0200 +++ b/src/pyams_content/locales/pyams_content.pot Wed Jul 12 14:25:07 2017 +0200 @@ -1,4 +1,4 @@ -# +# # SOME DESCRIPTIVE TITLE # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , 2017. @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2017-05-16 11:49+0200\n" +"POT-Creation-Date: 2017-07-06 15:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -114,7 +114,7 @@ #: ./src/pyams_content/shared/common/zmi/dashboard.py:106 #: ./src/pyams_content/shared/common/zmi/templates/advanced-search.pt:188 #: ./src/pyams_content/shared/imagemap/zmi/container.py:121 -#: ./src/pyams_content/interfaces/__init__.py:54 +#: ./src/pyams_content/interfaces/__init__.py:70 msgid "Title" msgstr "" @@ -194,7 +194,7 @@ #: ./src/pyams_content/component/gallery/interfaces/__init__.py:90 #: ./src/pyams_content/component/extfile/interfaces/__init__.py:45 #: ./src/pyams_content/component/links/interfaces/__init__.py:47 -#: ./src/pyams_content/shared/common/interfaces/__init__.py:113 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:119 msgid "Description" msgstr "" @@ -372,6 +372,7 @@ msgstr "" #: ./src/pyams_content/component/paragraph/zmi/summary.py:46 +#: ./src/pyams_content/shared/view/zmi/summary.py:44 #: ./src/pyams_content/shared/imagemap/zmi/summary.py:44 msgid "Quick preview" msgstr "" @@ -491,6 +492,7 @@ #: ./src/pyams_content/component/theme/zmi/__init__.py:52 #: ./src/pyams_content/component/theme/zmi/manager.py:45 +#: ./src/pyams_content/shared/view/zmi/theme.py:49 msgid "Themes..." msgstr "" @@ -637,12 +639,26 @@ msgid "List of internal or external links linked to this object" msgstr "" -#: ./src/pyams_content/shared/common/review.py:204 +#: ./src/pyams_content/component/links/interfaces/__init__.py:122 +msgid "Internal references" +msgstr "" + +#: ./src/pyams_content/component/links/interfaces/__init__.py:123 +msgid "List of internal references" +msgstr "" + +#: ./src/pyams_content/shared/common/__init__.py:126 +#: ./src/pyams_content/shared/common/__init__.py:134 +#, python-format +msgid "{date} by {principal}" +msgstr "" + +#: ./src/pyams_content/shared/common/review.py:209 #, python-format msgid "A new comment was added on content « {0} »" msgstr "" -#: ./src/pyams_content/shared/common/review.py:161 +#: ./src/pyams_content/shared/common/review.py:166 #, python-format msgid "[{service_name}] A content review is requested" msgstr "" @@ -685,88 +701,84 @@ msgid "Modified before..." msgstr "" -#: ./src/pyams_content/shared/common/zmi/properties.py:54 +#: ./src/pyams_content/shared/common/zmi/properties.py:57 msgid "Composition" msgstr "" -#: ./src/pyams_content/shared/common/zmi/properties.py:64 +#: ./src/pyams_content/shared/common/zmi/properties.py:67 #: ./src/pyams_content/shared/common/zmi/manager.py:90 msgid "Properties" msgstr "" -#: ./src/pyams_content/shared/common/zmi/properties.py:75 +#: ./src/pyams_content/shared/common/zmi/properties.py:78 msgid "Content properties" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:68 -msgid "Workflow" -msgstr "" - -#: ./src/pyams_content/shared/common/zmi/workflow.py:79 -msgid "Workflow details" -msgstr "" - -#: ./src/pyams_content/shared/common/zmi/workflow.py:172 -#: ./src/pyams_content/shared/common/zmi/workflow.py:244 -#: ./src/pyams_content/shared/common/zmi/workflow.py:289 -#: ./src/pyams_content/shared/common/zmi/workflow.py:347 -#: ./src/pyams_content/shared/common/zmi/workflow.py:421 -#: ./src/pyams_content/shared/common/zmi/workflow.py:481 -#: ./src/pyams_content/shared/common/zmi/workflow.py:526 -#: ./src/pyams_content/shared/common/zmi/workflow.py:572 -#: ./src/pyams_content/shared/common/zmi/workflow.py:632 -#: ./src/pyams_content/shared/common/zmi/workflow.py:677 -#: ./src/pyams_content/shared/common/zmi/workflow.py:723 -#: ./src/pyams_content/shared/common/zmi/workflow.py:776 +#: ./src/pyams_content/shared/common/zmi/properties.py:110 +msgid "Publication settings" +msgstr "" + +#: ./src/pyams_content/shared/common/zmi/workflow.py:116 +#: ./src/pyams_content/shared/common/zmi/workflow.py:201 +#: ./src/pyams_content/shared/common/zmi/workflow.py:246 +#: ./src/pyams_content/shared/common/zmi/workflow.py:304 +#: ./src/pyams_content/shared/common/zmi/workflow.py:384 +#: ./src/pyams_content/shared/common/zmi/workflow.py:444 +#: ./src/pyams_content/shared/common/zmi/workflow.py:489 +#: ./src/pyams_content/shared/common/zmi/workflow.py:535 +#: ./src/pyams_content/shared/common/zmi/workflow.py:583 +#: ./src/pyams_content/shared/common/zmi/workflow.py:628 +#: ./src/pyams_content/shared/common/zmi/workflow.py:674 +#: ./src/pyams_content/shared/common/zmi/workflow.py:727 #: ./src/pyams_content/shared/common/zmi/__init__.py:249 #: ./src/pyams_content/shared/common/zmi/owner.py:74 #: ./src/pyams_content/shared/common/zmi/review.py:90 msgid "Cancel" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:173 +#: ./src/pyams_content/shared/common/zmi/workflow.py:117 msgid "Request publication" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:245 +#: ./src/pyams_content/shared/common/zmi/workflow.py:202 #: ./src/pyams_content/workflow/__init__.py:259 msgid "Cancel publication request" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:290 +#: ./src/pyams_content/shared/common/zmi/workflow.py:247 msgid "Refuse publication request" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:348 +#: ./src/pyams_content/shared/common/zmi/workflow.py:305 msgid "Publish" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:422 +#: ./src/pyams_content/shared/common/zmi/workflow.py:385 msgid "Request retire" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:482 +#: ./src/pyams_content/shared/common/zmi/workflow.py:445 msgid "Cancel retire request" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:527 +#: ./src/pyams_content/shared/common/zmi/workflow.py:490 msgid "Retire" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:573 +#: ./src/pyams_content/shared/common/zmi/workflow.py:536 #: ./src/pyams_content/workflow/__init__.py:371 msgid "Request archive" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:633 +#: ./src/pyams_content/shared/common/zmi/workflow.py:584 msgid "Cancel archive request" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:678 +#: ./src/pyams_content/shared/common/zmi/workflow.py:629 msgid "Archive" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:724 +#: ./src/pyams_content/shared/common/zmi/workflow.py:675 #: ./src/pyams_content/workflow/__init__.py:436 #: ./src/pyams_content/workflow/__init__.py:448 #: ./src/pyams_content/workflow/__init__.py:460 @@ -775,33 +787,36 @@ msgid "Create new version" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:777 +#: ./src/pyams_content/shared/common/zmi/workflow.py:728 #: ./src/pyams_content/workflow/__init__.py:496 msgid "Delete version" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:212 -#: ./src/pyams_content/shared/common/zmi/workflow.py:391 +#: ./src/pyams_content/shared/common/zmi/workflow.py:167 +#: ./src/pyams_content/shared/common/zmi/workflow.py:352 msgid "Publication start date is required" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:215 -#: ./src/pyams_content/shared/common/zmi/workflow.py:317 -#: ./src/pyams_content/shared/common/zmi/workflow.py:452 -#: ./src/pyams_content/shared/common/zmi/workflow.py:603 +#: ./src/pyams_content/shared/common/zmi/workflow.py:170 +#: ./src/pyams_content/shared/common/zmi/workflow.py:274 +#: ./src/pyams_content/shared/common/zmi/workflow.py:415 msgid "A comment is required" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:793 +#: ./src/pyams_content/shared/common/zmi/workflow.py:751 +msgid "Delete content" +msgstr "" + +#: ./src/pyams_content/shared/common/zmi/workflow.py:760 msgid "Delete definitively" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:137 +#: ./src/pyams_content/shared/common/zmi/workflow.py:81 #, python-format msgid "{state} | by {principal}" msgstr "" -#: ./src/pyams_content/shared/common/zmi/workflow.py:133 +#: ./src/pyams_content/shared/common/zmi/workflow.py:77 #: ./src/pyams_content/workflow/__init__.py:551 #: ./src/pyams_content/workflow/__init__.py:574 #, python-format @@ -833,27 +848,49 @@ msgid "Created or modified in this version" msgstr "" -#: ./src/pyams_content/shared/common/zmi/summary.py:50 +#: ./src/pyams_content/shared/common/zmi/summary.py:49 msgid "Display content summary" msgstr "" -#: ./src/pyams_content/shared/common/zmi/summary.py:74 +#: ./src/pyams_content/shared/common/zmi/summary.py:73 msgid "Identity card" msgstr "" -#: ./src/pyams_content/shared/common/zmi/summary.py:86 -msgid "About this version" -msgstr "" - -#: ./src/pyams_content/shared/common/zmi/summary.py:124 +#: ./src/pyams_content/shared/common/zmi/summary.py:85 +msgid "Requested action" +msgstr "" + +#: ./src/pyams_content/shared/common/zmi/summary.py:125 +msgid "Publication and retire dates" +msgstr "" + +#: ./src/pyams_content/shared/common/zmi/summary.py:138 +msgid "Current version" +msgstr "" + +#: ./src/pyams_content/shared/common/zmi/summary.py:168 msgid "Content history" msgstr "" -#: ./src/pyams_content/shared/common/zmi/summary.py:109 +#: ./src/pyams_content/shared/common/zmi/summary.py:115 +msgid "Associated comment" +msgstr "" + +#: ./src/pyams_content/shared/common/zmi/summary.py:150 #: ./src/pyams_content/shared/common/zmi/dashboard.py:144 msgid "Version" msgstr "" +#: ./src/pyams_content/shared/common/zmi/summary.py:106 +#, python-format +msgid "{state} {date} by {principal}" +msgstr "" + +#: ./src/pyams_content/shared/common/zmi/summary.py:156 +#, python-format +msgid "{state} since {date}, by {principal}" +msgstr "" + #: ./src/pyams_content/shared/common/zmi/manager.py:76 msgid "Tool management" msgstr "" @@ -1282,11 +1319,11 @@ msgid "since {date}" msgstr "" -#: ./src/pyams_content/shared/common/zmi/header.py:117 +#: ./src/pyams_content/shared/common/zmi/header.py:118 msgid "access new version" msgstr "" -#: ./src/pyams_content/shared/common/zmi/header.py:126 +#: ./src/pyams_content/shared/common/zmi/header.py:129 msgid "access published version" msgstr "" @@ -1471,7 +1508,13 @@ "After canceling the request, you will be able to update the content again." msgstr "" -#: ./src/pyams_content/shared/common/zmi/templates/wf-delete-message.pt:1 +#: ./src/pyams_content/shared/common/zmi/templates/wf-delete-message.pt:2 +msgid "" +"This content was never published. If you confirm deletion, it won't be " +"possible to restore it." +msgstr "" + +#: ./src/pyams_content/shared/common/zmi/templates/wf-delete-message.pt:6 msgid "" "The content version is going to be definitely deleted. Will only remain the " "currently published version." @@ -1555,19 +1598,19 @@ msgstr "" #: ./src/pyams_content/shared/common/interfaces/__init__.py:77 -#: ./src/pyams_content/shared/common/interfaces/__init__.py:138 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:144 msgid "Managers" msgstr "" #: ./src/pyams_content/shared/common/interfaces/__init__.py:78 -#: ./src/pyams_content/shared/common/interfaces/__init__.py:139 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:145 msgid "" "Managers can handle main operations in tool's workflow, like publish or " "retire contents" msgstr "" #: ./src/pyams_content/shared/common/interfaces/__init__.py:83 -#: ./src/pyams_content/shared/common/interfaces/__init__.py:144 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:150 msgid "Contributors" msgstr "" @@ -1594,97 +1637,105 @@ msgstr "" #: ./src/pyams_content/shared/common/interfaces/__init__.py:105 +msgid "Version creation" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:108 msgid "Version modifiers" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:106 -msgid "List of principals who modified this content" -msgstr "" - #: ./src/pyams_content/shared/common/interfaces/__init__.py:109 +msgid "List of principals who modified this content" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:112 msgid "Last modifier" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:110 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:113 msgid "Last principal who modified this content" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:114 -msgid "" -"The content's description is 'hidden' into HTML's page headers; but it can be" -" seen, for example, in some search engines results as content's description" -msgstr "" - -#: ./src/pyams_content/shared/common/interfaces/__init__.py:119 -msgid "Keywords" +#: ./src/pyams_content/shared/common/interfaces/__init__.py:116 +msgid "Last update" msgstr "" #: ./src/pyams_content/shared/common/interfaces/__init__.py:120 +msgid "" +"The content's description is 'hidden' into HTML's page headers; but it can be" +" seen, for example, in some search engines results as content's description" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:125 +msgid "Keywords" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:126 msgid "They will be included into HTML pages metadata" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:123 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:129 msgid "Notepad" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:124 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:130 msgid "Internal information to be known about this content" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:131 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:137 msgid "Content owner" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:132 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:138 msgid "" "The owner is the creator of content's first version, except if it was " "transferred afterwards to another owner" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:145 -msgid "" -"Contributors are users which are allowed to update this content in addition " -"to it's owner" -msgstr "" - -#: ./src/pyams_content/shared/common/interfaces/__init__.py:150 -msgid "Readers" -msgstr "" - #: ./src/pyams_content/shared/common/interfaces/__init__.py:151 msgid "" -"Readers are users which are asked to verify and comment contents before they " -"are published" +"Contributors are users which are allowed to update this content in addition " +"to it's owner" msgstr "" #: ./src/pyams_content/shared/common/interfaces/__init__.py:156 -msgid "Guests" +msgid "Readers" msgstr "" #: ./src/pyams_content/shared/common/interfaces/__init__.py:157 msgid "" +"Readers are users which are asked to verify and comment contents before they " +"are published" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:162 +msgid "Guests" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:163 +msgid "" "Guests are users which are allowed to view contents with restricted access" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:176 -msgid "Principal ID" -msgstr "" - -#: ./src/pyams_content/shared/common/interfaces/__init__.py:181 -msgid "Restricted contents" -msgstr "" - #: ./src/pyams_content/shared/common/interfaces/__init__.py:182 +msgid "Principal ID" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:187 +msgid "Restricted contents" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:188 msgid "" "If 'yes', this manager will get restricted access to manage contents based on" " selected settings" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:187 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:193 msgid "Selected owners" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:188 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:194 msgid "Manager will have access to contents owned by these principals" msgstr "" @@ -1708,10 +1759,6 @@ msgid "Form" msgstr "" -#: ./src/pyams_content/shared/news/zmi/properties.py:38 -msgid "Publication settings" -msgstr "" - #: ./src/pyams_content/shared/news/zmi/__init__.py:44 msgid "This news topic" msgstr "" @@ -1726,39 +1773,12 @@ msgid "News topic « {title} »" msgstr "" -#: ./src/pyams_content/shared/news/interfaces/__init__.py:30 +#: ./src/pyams_content/shared/news/interfaces/__init__.py:27 msgid "News topic" msgstr "" -#: ./src/pyams_content/shared/news/interfaces/__init__.py:36 -msgid "Display first version date" -msgstr "" - -#: ./src/pyams_content/shared/news/interfaces/__init__.py:37 -msgid "Display current version date" -msgstr "" - -#: ./src/pyams_content/shared/news/interfaces/__init__.py:50 -msgid "Displayed publication date" -msgstr "" - -#: ./src/pyams_content/shared/news/interfaces/__init__.py:51 -msgid "The matching date will be displayed in front-office" -msgstr "" - -#: ./src/pyams_content/shared/news/interfaces/__init__.py:58 -msgid "Push end date" -msgstr "" - -#: ./src/pyams_content/shared/news/interfaces/__init__.py:59 -msgid "" -"Some contents can be pushed by components to front-office pages; if you set a" -" date here, this content will not be pushed anymore passed this date, but " -"will still be available via the search engine" -msgstr "" - #: ./src/pyams_content/shared/view/zmi/properties.py:38 -msgid "Contents search settings" +msgid "Main view settings" msgstr "" #: ./src/pyams_content/shared/view/zmi/__init__.py:44 @@ -1775,74 +1795,118 @@ msgid "View « {title} »" msgstr "" +#: ./src/pyams_content/shared/view/zmi/theme.py:59 +msgid "View themes settings" +msgstr "" + #: ./src/pyams_content/shared/view/zmi/reference.py:54 msgid "References..." msgstr "" -#: ./src/pyams_content/shared/view/zmi/reference.py:71 +#: ./src/pyams_content/shared/view/zmi/reference.py:64 msgid "View internal references settings" msgstr "" -#: ./src/pyams_content/shared/view/zmi/reference.py:62 -msgid "Reset" -msgstr "" - -#: ./src/pyams_content/shared/view/zmi/reference.py:63 -msgid "Submit" -msgstr "" - -#: ./src/pyams_content/shared/view/interfaces/__init__.py:31 +#: ./src/pyams_content/shared/view/zmi/templates/summary.pt:2 +msgid "View result items" +msgstr "" + +#: ./src/pyams_content/shared/view/portlet/__init__.py:60 +msgid "View items" +msgstr "" + +#: ./src/pyams_content/shared/view/portlet/__init__.py:73 +msgid "Simple list view" +msgstr "" + +#: ./src/pyams_content/shared/view/portlet/interfaces.py:30 +msgid "Selected view" +msgstr "" + +#: ./src/pyams_content/shared/view/portlet/interfaces.py:31 +msgid "Reference to the view from which items are extracted" +msgstr "" + +#: ./src/pyams_content/shared/view/interfaces/__init__.py:32 msgid "View" msgstr "" -#: ./src/pyams_content/shared/view/interfaces/__init__.py:39 -#: ./src/pyams_content/interfaces/__init__.py:66 -#: ./src/pyams_content/interfaces/review.py:67 -msgid "Creation date" -msgstr "" - #: ./src/pyams_content/shared/view/interfaces/__init__.py:40 -msgid "Last update date" +#: ./src/pyams_content/interfaces/__init__.py:82 +#: ./src/pyams_content/interfaces/review.py:67 +msgid "Creation date" msgstr "" #: ./src/pyams_content/shared/view/interfaces/__init__.py:41 -msgid "Current publication date" +msgid "Last update date" msgstr "" #: ./src/pyams_content/shared/view/interfaces/__init__.py:42 +msgid "Current publication date" +msgstr "" + +#: ./src/pyams_content/shared/view/interfaces/__init__.py:43 msgid "First publication date" msgstr "" -#: ./src/pyams_content/shared/view/interfaces/__init__.py:55 -msgid "Content types" +#: ./src/pyams_content/shared/view/interfaces/__init__.py:124 +msgid "Always include selected internal references" +msgstr "" + +#: ./src/pyams_content/shared/view/interfaces/__init__.py:125 +msgid "Include selected internal references only if empty" msgstr "" #: ./src/pyams_content/shared/view/interfaces/__init__.py:56 +msgid "Content types" +msgstr "" + +#: ./src/pyams_content/shared/view/interfaces/__init__.py:57 msgid "Selected content types; leave empty for all" msgstr "" -#: ./src/pyams_content/shared/view/interfaces/__init__.py:60 -msgid "Order by" -msgstr "" - #: ./src/pyams_content/shared/view/interfaces/__init__.py:61 +msgid "Order by" +msgstr "" + +#: ./src/pyams_content/shared/view/interfaces/__init__.py:62 msgid "Property to use to sort results" msgstr "" -#: ./src/pyams_content/shared/view/interfaces/__init__.py:66 -msgid "Reversed order?" -msgstr "" - #: ./src/pyams_content/shared/view/interfaces/__init__.py:67 +msgid "Reversed order?" +msgstr "" + +#: ./src/pyams_content/shared/view/interfaces/__init__.py:68 msgid "If 'yes', items order will be reversed" msgstr "" -#: ./src/pyams_content/shared/view/interfaces/__init__.py:97 -msgid "Internal references" -msgstr "" - -#: ./src/pyams_content/shared/view/interfaces/__init__.py:98 -msgid "List of internal references" +#: ./src/pyams_content/shared/view/interfaces/__init__.py:72 +msgid "Results count limit" +msgstr "" + +#: ./src/pyams_content/shared/view/interfaces/__init__.py:73 +msgid "Maximum number of results that the view may retrieve" +msgstr "" + +#: ./src/pyams_content/shared/view/interfaces/__init__.py:134 +msgid "Internal references usage" +msgstr "" + +#: ./src/pyams_content/shared/view/interfaces/__init__.py:135 +msgid "Specify how selected references are included into view results" +msgstr "" + +#: ./src/pyams_content/shared/view/interfaces/__init__.py:147 +msgid "Select context themes?" +msgstr "" + +#: ./src/pyams_content/shared/view/interfaces/__init__.py:148 +msgid "If 'yes', themes will be extracted from context" +msgstr "" + +#: ./src/pyams_content/shared/view/interfaces/__init__.py:152 +msgid "Other terms" msgstr "" #: ./src/pyams_content/shared/imagemap/zmi/properties.py:38 @@ -1891,15 +1955,15 @@ msgid "Bad query object_name parameter value!" msgstr "" -#: ./src/pyams_content/shared/imagemap/zmi/area.py:46 +#: ./src/pyams_content/shared/imagemap/zmi/area.py:47 msgid "Add image area" msgstr "" -#: ./src/pyams_content/shared/imagemap/zmi/area.py:64 +#: ./src/pyams_content/shared/imagemap/zmi/area.py:65 msgid "Add new image area" msgstr "" -#: ./src/pyams_content/shared/imagemap/zmi/area.py:94 +#: ./src/pyams_content/shared/imagemap/zmi/area.py:108 msgid "Edit image map properties" msgstr "" @@ -2320,27 +2384,27 @@ msgid "Published version {0}" msgstr "" -#: ./src/pyams_content/interfaces/__init__.py:50 +#: ./src/pyams_content/interfaces/__init__.py:66 msgid "Unique key" msgstr "" -#: ./src/pyams_content/interfaces/__init__.py:51 +#: ./src/pyams_content/interfaces/__init__.py:67 msgid "WARNING: this key can't be modified after creation!!!" msgstr "" -#: ./src/pyams_content/interfaces/__init__.py:55 +#: ./src/pyams_content/interfaces/__init__.py:71 msgid "Visible label used to display content" msgstr "" -#: ./src/pyams_content/interfaces/__init__.py:58 +#: ./src/pyams_content/interfaces/__init__.py:74 msgid "Short name" msgstr "" -#: ./src/pyams_content/interfaces/__init__.py:59 +#: ./src/pyams_content/interfaces/__init__.py:75 msgid "Short name used in breadcrumbs" msgstr "" -#: ./src/pyams_content/interfaces/__init__.py:70 +#: ./src/pyams_content/interfaces/__init__.py:86 msgid "Modification date" msgstr ""